From c199161646050666cf90a5dbc68ebd379266cbac Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 4 Feb 2025 13:10:28 +0100 Subject: [PATCH] Removed set_voxel_with_tool from TerrainWorld. --- modules/terraman/world/terrain_world.cpp | 34 ------------------------ modules/terraman/world/terrain_world.h | 2 -- 2 files changed, 36 deletions(-) diff --git a/modules/terraman/world/terrain_world.cpp b/modules/terraman/world/terrain_world.cpp index 2354eda71..a34f5f18f 100644 --- a/modules/terraman/world/terrain_world.cpp +++ b/modules/terraman/world/terrain_world.cpp @@ -516,26 +516,6 @@ int TerrainWorld::_get_channel_index_info(const TerrainWorld::ChannelTypeInfo ch 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() { if (_max_frame_chunk_build_steps == 0) { return true; @@ -885,10 +865,6 @@ Ref TerrainWorld::get_or_create_chunk_at_world_position(const Vect 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) { 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); - 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_ISOLEVEL); BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_LIQUID_FLOW); diff --git a/modules/terraman/world/terrain_world.h b/modules/terraman/world/terrain_world.h index 36cde63f7..16183a0d9 100644 --- a/modules/terraman/world/terrain_world.h +++ b/modules/terraman/world/terrain_world.h @@ -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); Ref get_chunk_at_world_position(const Vector3 &world_position); Ref 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); @@ -205,7 +204,6 @@ protected: virtual void _generate_chunk(Ref chunk); virtual Ref _create_chunk(int x, int z, Ref p_chunk); 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); static void _bind_methods();