From f722a9ea6ba6a5be3ad6c64000f7da8c957f40e2 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 24 Feb 2022 17:04:35 +0100 Subject: [PATCH] Remove unused values from the build flags enum. --- meshers/default/terrain_2d_mesher_default.cpp | 2 +- world/default/terrain_2d_chunk_default.cpp | 6 ++---- world/default/terrain_2d_chunk_default.h | 16 +++++++--------- world/default/terrain_2d_world_default.cpp | 5 +---- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/meshers/default/terrain_2d_mesher_default.cpp b/meshers/default/terrain_2d_mesher_default.cpp index 66206a9..bc60242 100644 --- a/meshers/default/terrain_2d_mesher_default.cpp +++ b/meshers/default/terrain_2d_mesher_default.cpp @@ -170,7 +170,7 @@ void Terrain2DMesherDefault::_bake_liquid_colors(Ref chunk) { } Terrain2DMesherDefault::Terrain2DMesherDefault() { - _build_flags = Terrain2DChunkDefault::BUILD_FLAG_CREATE_COLLIDER | Terrain2DChunkDefault::BUILD_FLAG_CREATE_LODS; + _build_flags = Terrain2DChunkDefault::BUILD_FLAG_CREATE_COLLIDER; _format = VisualServer::ARRAY_FORMAT_NORMAL | VisualServer::ARRAY_FORMAT_TEX_UV; } diff --git a/world/default/terrain_2d_chunk_default.cpp b/world/default/terrain_2d_chunk_default.cpp index 8a58306..58a695c 100644 --- a/world/default/terrain_2d_chunk_default.cpp +++ b/world/default/terrain_2d_chunk_default.cpp @@ -39,7 +39,7 @@ SOFTWARE. #include "../jobs/terrain_2d_prop_job.h" #include "../jobs/terrain_2d_terrain_job.h" -const String Terrain2DChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods"; +const String Terrain2DChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider"; _FORCE_INLINE_ int Terrain2DChunkDefault::get_build_flags() const { return _build_flags; @@ -828,7 +828,7 @@ Terrain2DChunkDefault::Terrain2DChunkDefault() { _enabled = true; - _build_flags = BUILD_FLAG_CREATE_COLLIDER | BUILD_FLAG_CREATE_LODS; + _build_flags = BUILD_FLAG_CREATE_COLLIDER; } Terrain2DChunkDefault::~Terrain2DChunkDefault() { @@ -942,7 +942,6 @@ void Terrain2DChunkDefault::_bind_methods() { BIND_CONSTANT(MESH_TYPE_INDEX_AREA); BIND_CONSTANT(MESH_TYPE_INDEX_TEXTURE_RID); - BIND_ENUM_CONSTANT(BUILD_FLAG_USE_ISOLEVEL); BIND_ENUM_CONSTANT(BUILD_FLAG_USE_LIGHTING); BIND_ENUM_CONSTANT(BUILD_FLAG_USE_AO); BIND_ENUM_CONSTANT(BUILD_FLAG_USE_RAO); @@ -950,5 +949,4 @@ void Terrain2DChunkDefault::_bind_methods() { BIND_ENUM_CONSTANT(BUILD_FLAG_AUTO_GENERATE_RAO); BIND_ENUM_CONSTANT(BUILD_FLAG_BAKE_LIGHTS); BIND_ENUM_CONSTANT(BUILD_FLAG_CREATE_COLLIDER); - BIND_ENUM_CONSTANT(BUILD_FLAG_CREATE_LODS); } diff --git a/world/default/terrain_2d_chunk_default.h b/world/default/terrain_2d_chunk_default.h index 3f6c4bf..898e5ed 100644 --- a/world/default/terrain_2d_chunk_default.h +++ b/world/default/terrain_2d_chunk_default.h @@ -88,15 +88,13 @@ public: }; enum BuildFlags { - BUILD_FLAG_USE_ISOLEVEL = 1 << 0, - BUILD_FLAG_USE_LIGHTING = 1 << 1, - BUILD_FLAG_USE_AO = 1 << 2, - BUILD_FLAG_USE_RAO = 1 << 3, - BUILD_FLAG_GENERATE_AO = 1 << 4, - BUILD_FLAG_AUTO_GENERATE_RAO = 1 << 5, - BUILD_FLAG_BAKE_LIGHTS = 1 << 6, - BUILD_FLAG_CREATE_COLLIDER = 1 << 7, - BUILD_FLAG_CREATE_LODS = 1 << 8, + BUILD_FLAG_USE_LIGHTING = 1 << 0, + BUILD_FLAG_USE_AO = 1 << 1, + BUILD_FLAG_USE_RAO = 1 << 2, + BUILD_FLAG_GENERATE_AO = 1 << 3, + BUILD_FLAG_AUTO_GENERATE_RAO = 1 << 4, + BUILD_FLAG_BAKE_LIGHTS = 1 << 5, + BUILD_FLAG_CREATE_COLLIDER = 1 << 6, }; public: diff --git a/world/default/terrain_2d_world_default.cpp b/world/default/terrain_2d_world_default.cpp index 1c05249..bb2d0a2 100644 --- a/world/default/terrain_2d_world_default.cpp +++ b/world/default/terrain_2d_world_default.cpp @@ -159,7 +159,7 @@ int Terrain2DWorldDefault::_get_channel_index_info(const Terrain2DWorld::Channel } Terrain2DWorldDefault::Terrain2DWorldDefault() { - _build_flags = Terrain2DChunkDefault::BUILD_FLAG_CREATE_COLLIDER | Terrain2DChunkDefault::BUILD_FLAG_CREATE_LODS; + _build_flags = Terrain2DChunkDefault::BUILD_FLAG_CREATE_COLLIDER; set_data_margin_start(1); set_data_margin_end(1); @@ -198,9 +198,6 @@ void Terrain2DWorldDefault::_notification(int p_what) { switch (p_what) { case NOTIFICATION_INTERNAL_PROCESS: { - if ((get_build_flags() & Terrain2DChunkDefault::BUILD_FLAG_CREATE_LODS) == 0) - return; - if (!get_player()) { return; }