mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2025-03-12 16:08:51 +01:00
Removed set_voxel_with_tool from TerrainWorld.
This commit is contained in:
parent
4201113680
commit
c199161646
@ -516,26 +516,6 @@ int TerrainWorld::_get_channel_index_info(const TerrainWorld::ChannelTypeInfo ch
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TerrainWorld::_set_voxel_with_tool(const bool mode_add, const Vector3 hit_position, const Vector3 hit_normal, const int selected_voxel, const int isolevel) {
|
|
||||||
Vector3 pos;
|
|
||||||
|
|
||||||
if (mode_add) {
|
|
||||||
pos = (hit_position + (Vector3(0.1, 0.1, 0.1) * hit_normal * get_voxel_scale()));
|
|
||||||
} else {
|
|
||||||
pos = (hit_position + (Vector3(0.1, 0.1, 0.1) * -hit_normal * get_voxel_scale()));
|
|
||||||
}
|
|
||||||
|
|
||||||
int channel_type = get_channel_index_info(TerrainWorld::CHANNEL_TYPE_INFO_TYPE);
|
|
||||||
int channel_isolevel = get_channel_index_info(TerrainWorld::CHANNEL_TYPE_INFO_ISOLEVEL);
|
|
||||||
|
|
||||||
if (channel_isolevel == -1) {
|
|
||||||
set_voxel_at_world_position(pos, selected_voxel, channel_type);
|
|
||||||
} else {
|
|
||||||
set_voxel_at_world_position(pos, selected_voxel, channel_type, false);
|
|
||||||
set_voxel_at_world_position(pos, isolevel, channel_isolevel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TerrainWorld::can_chunk_do_build_step() {
|
bool TerrainWorld::can_chunk_do_build_step() {
|
||||||
if (_max_frame_chunk_build_steps == 0) {
|
if (_max_frame_chunk_build_steps == 0) {
|
||||||
return true;
|
return true;
|
||||||
@ -885,10 +865,6 @@ Ref<TerrainChunk> TerrainWorld::get_or_create_chunk_at_world_position(const Vect
|
|||||||
return chunk_get_or_create(x, z);
|
return chunk_get_or_create(x, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TerrainWorld::set_voxel_with_tool(const bool mode_add, const Vector3 hit_position, const Vector3 hit_normal, const int selected_voxel, const int isolevel) {
|
|
||||||
call("_set_voxel_with_tool", mode_add, hit_position, hit_normal, selected_voxel, isolevel);
|
|
||||||
}
|
|
||||||
|
|
||||||
int TerrainWorld::get_channel_index_info(const TerrainWorld::ChannelTypeInfo channel_type) {
|
int TerrainWorld::get_channel_index_info(const TerrainWorld::ChannelTypeInfo channel_type) {
|
||||||
return call("_get_channel_index_info", channel_type);
|
return call("_get_channel_index_info", channel_type);
|
||||||
}
|
}
|
||||||
@ -1267,16 +1243,6 @@ void TerrainWorld::_bind_methods() {
|
|||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("get_editor_camera"), &TerrainWorld::get_editor_camera);
|
ClassDB::bind_method(D_METHOD("get_editor_camera"), &TerrainWorld::get_editor_camera);
|
||||||
|
|
||||||
BIND_VMETHOD(MethodInfo("_set_voxel_with_tool",
|
|
||||||
PropertyInfo(Variant::BOOL, "mode_add"),
|
|
||||||
PropertyInfo(Variant::VECTOR3, "hit_position"),
|
|
||||||
PropertyInfo(Variant::VECTOR3, "hit_normal"),
|
|
||||||
PropertyInfo(Variant::INT, "selected_voxel"),
|
|
||||||
PropertyInfo(Variant::INT, "isolevel")));
|
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("set_voxel_with_tool", "mode_add", "hit_position", "hit_normal", "selected_voxel", "isolevel"), &TerrainWorld::set_voxel_with_tool);
|
|
||||||
ClassDB::bind_method(D_METHOD("_set_voxel_with_tool", "mode_add", "hit_position", "hit_normal", "selected_voxel", "isolevel"), &TerrainWorld::_set_voxel_with_tool);
|
|
||||||
|
|
||||||
BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_TYPE);
|
BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_TYPE);
|
||||||
BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_ISOLEVEL);
|
BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_ISOLEVEL);
|
||||||
BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_LIQUID_FLOW);
|
BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_LIQUID_FLOW);
|
||||||
|
@ -192,7 +192,6 @@ public:
|
|||||||
void set_voxel_at_world_position(const Vector3 &world_position, const uint8_t data, const int channel_index, const bool rebuild = true);
|
void set_voxel_at_world_position(const Vector3 &world_position, const uint8_t data, const int channel_index, const bool rebuild = true);
|
||||||
Ref<TerrainChunk> get_chunk_at_world_position(const Vector3 &world_position);
|
Ref<TerrainChunk> get_chunk_at_world_position(const Vector3 &world_position);
|
||||||
Ref<TerrainChunk> get_or_create_chunk_at_world_position(const Vector3 &world_position);
|
Ref<TerrainChunk> get_or_create_chunk_at_world_position(const Vector3 &world_position);
|
||||||
void set_voxel_with_tool(const bool mode_add, const Vector3 hit_position, const Vector3 hit_normal, const int selected_voxel, const int isolevel);
|
|
||||||
|
|
||||||
int get_channel_index_info(const ChannelTypeInfo channel_type);
|
int get_channel_index_info(const ChannelTypeInfo channel_type);
|
||||||
|
|
||||||
@ -205,7 +204,6 @@ protected:
|
|||||||
virtual void _generate_chunk(Ref<TerrainChunk> chunk);
|
virtual void _generate_chunk(Ref<TerrainChunk> chunk);
|
||||||
virtual Ref<TerrainChunk> _create_chunk(int x, int z, Ref<TerrainChunk> p_chunk);
|
virtual Ref<TerrainChunk> _create_chunk(int x, int z, Ref<TerrainChunk> p_chunk);
|
||||||
virtual int _get_channel_index_info(const ChannelTypeInfo channel_type);
|
virtual int _get_channel_index_info(const ChannelTypeInfo channel_type);
|
||||||
virtual void _set_voxel_with_tool(const bool mode_add, const Vector3 hit_position, const Vector3 hit_normal, const int selected_voxel, const int isolevel);
|
|
||||||
|
|
||||||
virtual void _notification(int p_what);
|
virtual void _notification(int p_what);
|
||||||
static void _bind_methods();
|
static void _bind_methods();
|
||||||
|
Loading…
Reference in New Issue
Block a user