From 6272c56664684cb7c34a75ad2a2ed2402aafdd10 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 22 Feb 2022 12:02:42 +0100 Subject: [PATCH] Replace TERRAIN_ to TERRAIN_2D_. (Include guards, and enums.) --- areas/terrain_2d_world_area.h | 4 +- data/terrain_2d_light.h | 4 +- defines.h | 4 +- doc_classes/TerrainSurface.xml | 8 +-- level_generator/terrain_2d_level_generator.h | 4 +- .../terrain_2d_level_generator_flat.h | 4 +- library/terrain_2d_library.h | 6 +- library/terrain_2d_library_merger.cpp | 2 +- library/terrain_2d_library_merger.h | 4 +- library/terrain_2d_library_merger_pcm.cpp | 2 +- library/terrain_2d_library_merger_pcm.h | 4 +- library/terrain_2d_library_simple.h | 6 +- library/terrain_2d_material_cache.h | 4 +- library/terrain_2d_material_cache_pcm.cpp | 2 +- library/terrain_2d_material_cache_pcm.h | 4 +- library/terrain_2d_surface.cpp | 8 +-- library/terrain_2d_surface.h | 16 +++--- library/terrain_2d_surface_merger.cpp | 16 +++--- library/terrain_2d_surface_merger.h | 8 +-- library/terrain_2d_surface_simple.cpp | 16 +++--- library/terrain_2d_surface_simple.h | 6 +- meshers/blocky/terrain_2d_mesher_blocky.cpp | 56 +++++++++---------- meshers/blocky/terrain_2d_mesher_blocky.h | 4 +- meshers/default/terrain_2d_mesher_default.h | 4 +- meshers/terrain_2d_mesher.h | 4 +- nodes/terrain_2d_light_node.h | 4 +- register_types.h | 4 +- world/block_terrain_2d_structure.h | 4 +- world/blocky/terrain_2d_chunk_blocky.h | 4 +- world/blocky/terrain_2d_world_blocky.h | 4 +- world/default/terrain_2d_chunk_default.h | 4 +- world/default/terrain_2d_world_default.h | 4 +- world/jobs/terrain_2d_job.h | 4 +- world/jobs/terrain_2d_light_job.h | 4 +- world/jobs/terrain_2d_mesher_job_step.cpp | 4 +- world/jobs/terrain_2d_mesher_job_step.h | 6 +- world/jobs/terrain_2d_prop_job.h | 4 +- world/jobs/terrain_2d_terrain_job.h | 4 +- world/terrain_2d_chunk.cpp | 2 +- world/terrain_2d_chunk.h | 6 +- world/terrain_2d_environment_data.h | 4 +- world/terrain_2d_structure.h | 4 +- world/terrain_2d_world.h | 4 +- world/terrain_2d_world_editor.h | 4 +- 44 files changed, 139 insertions(+), 139 deletions(-) diff --git a/areas/terrain_2d_world_area.h b/areas/terrain_2d_world_area.h index 477e893..d86d0d1 100644 --- a/areas/terrain_2d_world_area.h +++ b/areas/terrain_2d_world_area.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_WORLD_AREA_H -#define TERRAIN_WORLD_AREA_H +#ifndef TERRAIN_2D_WORLD_AREA_H +#define TERRAIN_2D_WORLD_AREA_H #include "core/version.h" diff --git a/data/terrain_2d_light.h b/data/terrain_2d_light.h index 62bfc27..1dd799d 100644 --- a/data/terrain_2d_light.h +++ b/data/terrain_2d_light.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LIGHT_H -#define TERRAIN_LIGHT_H +#ifndef TERRAIN_2D_LIGHT_H +#define TERRAIN_2D_LIGHT_H #include "core/version.h" diff --git a/defines.h b/defines.h index 05fa691..bdcf7db 100644 --- a/defines.h +++ b/defines.h @@ -1,6 +1,6 @@ -#ifndef TERRAIN_DEFINES_H -#define TERRAIN_DEFINES_H +#ifndef TERRAIN_2D_DEFINES_H +#define TERRAIN_2D_DEFINES_H #include "core/version.h" diff --git a/doc_classes/TerrainSurface.xml b/doc_classes/TerrainSurface.xml index 09c218e..71e0ff2 100644 --- a/doc_classes/TerrainSurface.xml +++ b/doc_classes/TerrainSurface.xml @@ -56,13 +56,13 @@ - + - + - + - + diff --git a/level_generator/terrain_2d_level_generator.h b/level_generator/terrain_2d_level_generator.h index c393cda..52004a4 100644 --- a/level_generator/terrain_2d_level_generator.h +++ b/level_generator/terrain_2d_level_generator.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LEVEL_GENERATOR_H -#define TERRAIN_LEVEL_GENERATOR_H +#ifndef TERRAIN_2D_LEVEL_GENERATOR_H +#define TERRAIN_2D_LEVEL_GENERATOR_H #include "core/version.h" diff --git a/level_generator/terrain_2d_level_generator_flat.h b/level_generator/terrain_2d_level_generator_flat.h index eb58629..e5ebd53 100644 --- a/level_generator/terrain_2d_level_generator_flat.h +++ b/level_generator/terrain_2d_level_generator_flat.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LEVEL_GENERATOR_FLAT_H -#define TERRAIN_LEVEL_GENERATOR_FLAT_H +#ifndef TERRAIN_2D_LEVEL_GENERATOR_FLAT_H +#define TERRAIN_2D_LEVEL_GENERATOR_FLAT_H #include "terrain_2d_level_generator.h" diff --git a/library/terrain_2d_library.h b/library/terrain_2d_library.h index 4bd41d9..c52a17e 100644 --- a/library/terrain_2d_library.h +++ b/library/terrain_2d_library.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LIBRARY_H -#define TERRAIN_LIBRARY_H +#ifndef TERRAIN_2D_LIBRARY_H +#define TERRAIN_2D_LIBRARY_H #include "core/version.h" @@ -205,4 +205,4 @@ protected: Vector> _prop_materials; }; -#endif // TERRAIN_LIBRARY_H +#endif // TERRAIN_2D_LIBRARY_H diff --git a/library/terrain_2d_library_merger.cpp b/library/terrain_2d_library_merger.cpp index df79351..2ae2b01 100644 --- a/library/terrain_2d_library_merger.cpp +++ b/library/terrain_2d_library_merger.cpp @@ -233,7 +233,7 @@ void Terrain2DLibraryMerger::refresh_rects() { Ref surface = Ref(_terra_surfaces[i]); if (surface.is_valid()) { - for (int j = 0; j < Terrain2DSurface::TERRAIN_SIDES_COUNT; ++j) { + for (int j = 0; j < Terrain2DSurface::TERRAIN_2D_SIDES_COUNT; ++j) { Ref tex = surface->get_texture(static_cast(j)); if (!tex.is_valid()) diff --git a/library/terrain_2d_library_merger.h b/library/terrain_2d_library_merger.h index 0169167..8d14fb4 100644 --- a/library/terrain_2d_library_merger.h +++ b/library/terrain_2d_library_merger.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LIBRARY_MERGER_H -#define TERRAIN_LIBRARY_MERGER_H +#ifndef TERRAIN_2D_LIBRARY_MERGER_H +#define TERRAIN_2D_LIBRARY_MERGER_H #include "core/version.h" diff --git a/library/terrain_2d_library_merger_pcm.cpp b/library/terrain_2d_library_merger_pcm.cpp index 02f8aed..ac83c7c 100644 --- a/library/terrain_2d_library_merger_pcm.cpp +++ b/library/terrain_2d_library_merger_pcm.cpp @@ -621,7 +621,7 @@ void Terrain2DLibraryMergerPCM::refresh_rects() { Ref surface = Ref(_terra_surfaces[i]); if (surface.is_valid()) { - for (int j = 0; j < Terrain2DSurface::TERRAIN_SIDES_COUNT; ++j) { + for (int j = 0; j < Terrain2DSurface::TERRAIN_2D_SIDES_COUNT; ++j) { Ref tex = surface->get_texture(static_cast(j)); if (!tex.is_valid()) diff --git a/library/terrain_2d_library_merger_pcm.h b/library/terrain_2d_library_merger_pcm.h index 1aef787..d5ae8e4 100644 --- a/library/terrain_2d_library_merger_pcm.h +++ b/library/terrain_2d_library_merger_pcm.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LIBRARY_MERGER_PCM_H -#define TERRAIN_LIBRARY_MERGER_PCM_H +#ifndef TERRAIN_2D_LIBRARY_MERGER_PCM_H +#define TERRAIN_2D_LIBRARY_MERGER_PCM_H #include "core/version.h" diff --git a/library/terrain_2d_library_simple.h b/library/terrain_2d_library_simple.h index f4445a8..cffb356 100644 --- a/library/terrain_2d_library_simple.h +++ b/library/terrain_2d_library_simple.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LIBRARY_SIMPLE_H -#define TERRAIN_LIBRARY_SIMPLE_H +#ifndef TERRAIN_2D_LIBRARY_SIMPLE_H +#define TERRAIN_2D_LIBRARY_SIMPLE_H #include "core/version.h" @@ -77,4 +77,4 @@ private: int _atlas_rows; }; -#endif // TERRAIN_LIBRARY_H +#endif // TERRAIN_2D_LIBRARY_H diff --git a/library/terrain_2d_material_cache.h b/library/terrain_2d_material_cache.h index 3b18d34..a60b7ab 100644 --- a/library/terrain_2d_material_cache.h +++ b/library/terrain_2d_material_cache.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_MATERIAL_CACHE_H -#define TERRAIN_MATERIAL_CACHE_H +#ifndef TERRAIN_2D_MATERIAL_CACHE_H +#define TERRAIN_2D_MATERIAL_CACHE_H #include "core/version.h" diff --git a/library/terrain_2d_material_cache_pcm.cpp b/library/terrain_2d_material_cache_pcm.cpp index 0512209..adc2cdb 100644 --- a/library/terrain_2d_material_cache_pcm.cpp +++ b/library/terrain_2d_material_cache_pcm.cpp @@ -109,7 +109,7 @@ void Terrain2DMaterialCachePCM::refresh_rects() { Ref surface = Ref(_surfaces[i]); if (surface.is_valid()) { - for (int j = 0; j < Terrain2DSurface::TERRAIN_SIDES_COUNT; ++j) { + for (int j = 0; j < Terrain2DSurface::TERRAIN_2D_SIDES_COUNT; ++j) { Ref tex = surface->get_texture(static_cast(j)); if (!tex.is_valid()) diff --git a/library/terrain_2d_material_cache_pcm.h b/library/terrain_2d_material_cache_pcm.h index b8e902d..a17b528 100644 --- a/library/terrain_2d_material_cache_pcm.h +++ b/library/terrain_2d_material_cache_pcm.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_MATERIAL_CACHE_PCM_H -#define TERRAIN_MATERIAL_CACHE_PCM_H +#ifndef TERRAIN_2D_MATERIAL_CACHE_PCM_H +#define TERRAIN_2D_MATERIAL_CACHE_PCM_H #include "terrain_2d_material_cache.h" diff --git a/library/terrain_2d_surface.cpp b/library/terrain_2d_surface.cpp index 76e499c..6692f8d 100644 --- a/library/terrain_2d_surface.cpp +++ b/library/terrain_2d_surface.cpp @@ -104,9 +104,9 @@ void Terrain2DSurface::_bind_methods() { ClassDB::bind_method(D_METHOD("refresh_rects"), &Terrain2DSurface::refresh_rects); - BIND_ENUM_CONSTANT(TERRAIN_SIDE_TOP); - BIND_ENUM_CONSTANT(TERRAIN_SIDE_BOTTOM); - BIND_ENUM_CONSTANT(TERRAIN_SIDE_SIDE); + BIND_ENUM_CONSTANT(TERRAIN_2D_SIDE_TOP); + BIND_ENUM_CONSTANT(TERRAIN_2D_SIDE_BOTTOM); + BIND_ENUM_CONSTANT(TERRAIN_2D_SIDE_SIDE); - BIND_CONSTANT(TERRAIN_SIDES_COUNT); + BIND_CONSTANT(TERRAIN_2D_SIDES_COUNT); } diff --git a/library/terrain_2d_surface.h b/library/terrain_2d_surface.h index 1e758b7..09e416d 100644 --- a/library/terrain_2d_surface.h +++ b/library/terrain_2d_surface.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_SURFACE_H -#define TERRAIN_SURFACE_H +#ifndef TERRAIN_2D_SURFACE_H +#define TERRAIN_2D_SURFACE_H #include "core/version.h" @@ -63,14 +63,14 @@ public: */ enum Terrain2DSurfaceSides { - TERRAIN_SIDE_TOP = 0, - TERRAIN_SIDE_BOTTOM = 1, - TERRAIN_SIDE_SIDE = 2, + TERRAIN_2D_SIDE_TOP = 0, + TERRAIN_2D_SIDE_BOTTOM = 1, + TERRAIN_2D_SIDE_SIDE = 2, }; enum { - TERRAIN_SIDES_COUNT = 3, - TERRAIN_SIDES_ARRAY_SIZE = TERRAIN_SIDES_COUNT * 2, + TERRAIN_2D_SIDES_COUNT = 3, + TERRAIN_2D_SIDES_ARRAY_SIZE = TERRAIN_2D_SIDES_COUNT * 2, }; int get_id() const; @@ -99,7 +99,7 @@ protected: int _mesher_index; bool _transparent; bool _liquid; - Rect2 _rects[TERRAIN_SIDES_COUNT]; + Rect2 _rects[TERRAIN_2D_SIDES_COUNT]; }; VARIANT_ENUM_CAST(Terrain2DSurface::Terrain2DSurfaceSides); diff --git a/library/terrain_2d_surface_merger.cpp b/library/terrain_2d_surface_merger.cpp index d93aac7..d2f1d2f 100644 --- a/library/terrain_2d_surface_merger.cpp +++ b/library/terrain_2d_surface_merger.cpp @@ -45,7 +45,7 @@ void Terrain2DSurfaceMerger::set_texture(const Terrain2DSurfaceSides side, const } void Terrain2DSurfaceMerger::refresh_rects() { - for (int i = 0; i < TERRAIN_SIDES_COUNT; ++i) { + for (int i = 0; i < TERRAIN_2D_SIDES_COUNT; ++i) { if (!_regions[i].is_valid()) { _rects[i] = Rect2(); continue; @@ -75,7 +75,7 @@ void Terrain2DSurfaceMerger::refresh_rects() { } Terrain2DSurfaceMerger::Terrain2DSurfaceMerger() { - for (int i = 0; i < TERRAIN_SIDES_COUNT; ++i) { + for (int i = 0; i < TERRAIN_2D_SIDES_COUNT; ++i) { _regions[i].unref(); _textures[i].unref(); } @@ -87,13 +87,13 @@ Terrain2DSurfaceMerger::~Terrain2DSurfaceMerger() { void Terrain2DSurfaceMerger::_bind_methods() { ClassDB::bind_method(D_METHOD("get_region", "side"), &Terrain2DSurfaceMerger::get_region); ClassDB::bind_method(D_METHOD("set_region", "side", "texture"), &Terrain2DSurfaceMerger::set_region); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "region_top", PROPERTY_HINT_RESOURCE_TYPE, "AtlasTexture", 0), "set_region", "get_region", TERRAIN_SIDE_TOP); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "region_bottom", PROPERTY_HINT_RESOURCE_TYPE, "AtlasTexture", 0), "set_region", "get_region", TERRAIN_SIDE_BOTTOM); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "region_side", PROPERTY_HINT_RESOURCE_TYPE, "AtlasTexture", 0), "set_region", "get_region", TERRAIN_SIDE_SIDE); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "region_top", PROPERTY_HINT_RESOURCE_TYPE, "AtlasTexture", 0), "set_region", "get_region", TERRAIN_2D_SIDE_TOP); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "region_bottom", PROPERTY_HINT_RESOURCE_TYPE, "AtlasTexture", 0), "set_region", "get_region", TERRAIN_2D_SIDE_BOTTOM); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "region_side", PROPERTY_HINT_RESOURCE_TYPE, "AtlasTexture", 0), "set_region", "get_region", TERRAIN_2D_SIDE_SIDE); ClassDB::bind_method(D_METHOD("get_texture", "side"), &Terrain2DSurfaceMerger::get_texture); ClassDB::bind_method(D_METHOD("set_texture", "side", "texture"), &Terrain2DSurfaceMerger::set_texture); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "texture_top", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TERRAIN_SIDE_TOP); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "texture_bottom", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TERRAIN_SIDE_BOTTOM); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "texture_side", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TERRAIN_SIDE_SIDE); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "texture_top", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TERRAIN_2D_SIDE_TOP); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "texture_bottom", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TERRAIN_2D_SIDE_BOTTOM); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "texture_side", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TERRAIN_2D_SIDE_SIDE); } diff --git a/library/terrain_2d_surface_merger.h b/library/terrain_2d_surface_merger.h index 8e6a949..53c67aa 100644 --- a/library/terrain_2d_surface_merger.h +++ b/library/terrain_2d_surface_merger.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_SURFACE_MERGER_H -#define TERRAIN_SURFACE_MERGER_H +#ifndef TERRAIN_2D_SURFACE_MERGER_H +#define TERRAIN_2D_SURFACE_MERGER_H #include "terrain_2d_surface.h" @@ -54,8 +54,8 @@ protected: static void _bind_methods(); private: - Ref _regions[TERRAIN_SIDES_COUNT]; - Ref _textures[TERRAIN_SIDES_COUNT]; + Ref _regions[TERRAIN_2D_SIDES_COUNT]; + Ref _textures[TERRAIN_2D_SIDES_COUNT]; }; #endif diff --git a/library/terrain_2d_surface_simple.cpp b/library/terrain_2d_surface_simple.cpp index 2840f25..db58a03 100644 --- a/library/terrain_2d_surface_simple.cpp +++ b/library/terrain_2d_surface_simple.cpp @@ -51,7 +51,7 @@ void Terrain2DSurfaceSimple::refresh_rects() { ERR_FAIL_COND(lib == NULL); - for (int i = 0; i < TERRAIN_SIDES_COUNT; ++i) { + for (int i = 0; i < TERRAIN_2D_SIDES_COUNT; ++i) { float culomn = 1.0 / static_cast(lib->get_atlas_columns()); float row = 1.0 / static_cast(lib->get_atlas_rows()); @@ -68,7 +68,7 @@ void Terrain2DSurfaceSimple::refresh_rects() { } Terrain2DSurfaceSimple::Terrain2DSurfaceSimple() { - for (int i = 0; i < TERRAIN_SIDES_ARRAY_SIZE; ++i) { + for (int i = 0; i < TERRAIN_2D_SIDES_ARRAY_SIZE; ++i) { _atlas_positions[i] = 0; } } @@ -83,12 +83,12 @@ void Terrain2DSurfaceSimple::_bind_methods() { ClassDB::bind_method(D_METHOD("get_atlas_y", "side"), &Terrain2DSurfaceSimple::get_atlas_y); ClassDB::bind_method(D_METHOD("set_atlas_y", "side", "value"), &Terrain2DSurfaceSimple::set_atlas_y); - ADD_PROPERTYI(PropertyInfo(Variant::INT, "top_atlas_x"), "set_atlas_x", "get_atlas_x", TERRAIN_SIDE_TOP); - ADD_PROPERTYI(PropertyInfo(Variant::INT, "top_atlas_y"), "set_atlas_y", "get_atlas_y", TERRAIN_SIDE_TOP); + ADD_PROPERTYI(PropertyInfo(Variant::INT, "top_atlas_x"), "set_atlas_x", "get_atlas_x", TERRAIN_2D_SIDE_TOP); + ADD_PROPERTYI(PropertyInfo(Variant::INT, "top_atlas_y"), "set_atlas_y", "get_atlas_y", TERRAIN_2D_SIDE_TOP); - ADD_PROPERTYI(PropertyInfo(Variant::INT, "bottom_atlas_x"), "set_atlas_x", "get_atlas_x", TERRAIN_SIDE_BOTTOM); - ADD_PROPERTYI(PropertyInfo(Variant::INT, "bottom_atlas_y"), "set_atlas_y", "get_atlas_y", TERRAIN_SIDE_BOTTOM); + ADD_PROPERTYI(PropertyInfo(Variant::INT, "bottom_atlas_x"), "set_atlas_x", "get_atlas_x", TERRAIN_2D_SIDE_BOTTOM); + ADD_PROPERTYI(PropertyInfo(Variant::INT, "bottom_atlas_y"), "set_atlas_y", "get_atlas_y", TERRAIN_2D_SIDE_BOTTOM); - ADD_PROPERTYI(PropertyInfo(Variant::INT, "side_atlas_x"), "set_atlas_x", "get_atlas_x", TERRAIN_SIDE_SIDE); - ADD_PROPERTYI(PropertyInfo(Variant::INT, "side_atlas_y"), "set_atlas_y", "get_atlas_y", TERRAIN_SIDE_SIDE); + ADD_PROPERTYI(PropertyInfo(Variant::INT, "side_atlas_x"), "set_atlas_x", "get_atlas_x", TERRAIN_2D_SIDE_SIDE); + ADD_PROPERTYI(PropertyInfo(Variant::INT, "side_atlas_y"), "set_atlas_y", "get_atlas_y", TERRAIN_2D_SIDE_SIDE); } diff --git a/library/terrain_2d_surface_simple.h b/library/terrain_2d_surface_simple.h index f1bb26d..bc32dab 100644 --- a/library/terrain_2d_surface_simple.h +++ b/library/terrain_2d_surface_simple.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_SURFACE_SIMPLE_H -#define TERRAIN_SURFACE_SIMPLE_H +#ifndef TERRAIN_2D_SURFACE_SIMPLE_H +#define TERRAIN_2D_SURFACE_SIMPLE_H #include "terrain_2d_surface.h" @@ -44,7 +44,7 @@ protected: static void _bind_methods(); private: - int _atlas_positions[TERRAIN_SIDES_ARRAY_SIZE]; + int _atlas_positions[TERRAIN_2D_SIDES_ARRAY_SIZE]; }; #endif diff --git a/meshers/blocky/terrain_2d_mesher_blocky.cpp b/meshers/blocky/terrain_2d_mesher_blocky.cpp index a8b6ec5..8b24381 100644 --- a/meshers/blocky/terrain_2d_mesher_blocky.cpp +++ b/meshers/blocky/terrain_2d_mesher_blocky.cpp @@ -173,10 +173,10 @@ void Terrain2DMesherBlocky::add_chunk_normal(Ref chunk) { add_indices(vc + 0); Vector2 uvs[] = { - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) }; Vector3 verts[] = { @@ -340,10 +340,10 @@ void Terrain2DMesherBlocky::add_chunk_lod(Ref chunk) { add_indices(vc + 0); Vector2 uvs[] = { - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) }; Vector3 verts[] = { @@ -512,10 +512,10 @@ void Terrain2DMesherBlocky::create_margin_zmin(Ref chunk) add_indices(vc + 0); Vector2 uvs[] = { - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) }; float vi0 = Math::lerp(isolevels[2], isolevels[3], x_interp); @@ -684,10 +684,10 @@ void Terrain2DMesherBlocky::create_margin_zmax(Ref chunk) add_indices(vc + 0); Vector2 uvs[] = { - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) }; float vi0 = Math::lerp(isolevels[1], isolevels[0], x_interp); @@ -856,10 +856,10 @@ void Terrain2DMesherBlocky::create_margin_xmin(Ref chunk) add_indices(vc + 0); Vector2 uvs[] = { - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) }; float vi0 = Math::lerp(isolevels[0], isolevels[3], z_interp); @@ -1026,10 +1026,10 @@ void Terrain2DMesherBlocky::create_margin_xmax(Ref chunk) add_indices(vc + 0); Vector2 uvs[] = { - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 0), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 1), x % get_texture_scale(), z % get_texture_scale(), get_texture_scale()) }; float vi0 = Math::lerp(isolevels[1], isolevels[2], z_interp); @@ -1186,10 +1186,10 @@ void Terrain2DMesherBlocky::create_face(Ref chunk, int da add_indices(vc + 0); Vector2 uvs[] = { - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 0), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 0), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(0, 1), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()), - surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_SIDE_TOP, Vector2(1, 1), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()) + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 0), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 0), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(0, 1), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()), + surface->transform_uv_scaled(Terrain2DSurface::TERRAIN_2D_SIDE_TOP, Vector2(1, 1), dataxmin % get_texture_scale(), datazmin % get_texture_scale(), get_texture_scale()) }; Vector3 verts[] = { diff --git a/meshers/blocky/terrain_2d_mesher_blocky.h b/meshers/blocky/terrain_2d_mesher_blocky.h index a95322a..2bc95d8 100644 --- a/meshers/blocky/terrain_2d_mesher_blocky.h +++ b/meshers/blocky/terrain_2d_mesher_blocky.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_MESHER_BLOCKY_H -#define TERRAIN_MESHER_BLOCKY_H +#ifndef TERRAIN_2D_MESHER_BLOCKY_H +#define TERRAIN_2D_MESHER_BLOCKY_H #include "core/version.h" diff --git a/meshers/default/terrain_2d_mesher_default.h b/meshers/default/terrain_2d_mesher_default.h index 30e099d..940b600 100644 --- a/meshers/default/terrain_2d_mesher_default.h +++ b/meshers/default/terrain_2d_mesher_default.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_MESHER_DEFAULT_H -#define TERRAIN_MESHER_DEFAULT_H +#ifndef TERRAIN_2D_MESHER_DEFAULT_H +#define TERRAIN_2D_MESHER_DEFAULT_H #include "core/version.h" diff --git a/meshers/terrain_2d_mesher.h b/meshers/terrain_2d_mesher.h index d873dea..1e71f83 100644 --- a/meshers/terrain_2d_mesher.h +++ b/meshers/terrain_2d_mesher.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_TOOLS_H -#define TERRAIN_TOOLS_H +#ifndef TERRAIN_2D_TOOLS_H +#define TERRAIN_2D_TOOLS_H #include "core/version.h" diff --git a/nodes/terrain_2d_light_node.h b/nodes/terrain_2d_light_node.h index 62bf5e2..8088d27 100644 --- a/nodes/terrain_2d_light_node.h +++ b/nodes/terrain_2d_light_node.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LIGHT_NODE_H -#define TERRAIN_LIGHT_NODE_H +#ifndef TERRAIN_2D_LIGHT_NODE_H +#define TERRAIN_2D_LIGHT_NODE_H #include "core/version.h" diff --git a/register_types.h b/register_types.h index e23bf20..0223607 100644 --- a/register_types.h +++ b/register_types.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_REGISTER_TYPES_H -#define TERRAIN_REGISTER_TYPES_H +#ifndef TERRAIN_2D_REGISTER_TYPES_H +#define TERRAIN_2D_REGISTER_TYPES_H void register_terraman_2d_types(); void unregister_terraman_2d_types(); diff --git a/world/block_terrain_2d_structure.h b/world/block_terrain_2d_structure.h index c20e543..d014761 100644 --- a/world/block_terrain_2d_structure.h +++ b/world/block_terrain_2d_structure.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef BLOCK_TERRAIN_STRUCTURE_H -#define BLOCK_TERRAIN_STRUCTURE_H +#ifndef BLOCK_TERRAIN_2D_STRUCTURE_H +#define BLOCK_TERRAIN_2D_STRUCTURE_H #include "core/version.h" diff --git a/world/blocky/terrain_2d_chunk_blocky.h b/world/blocky/terrain_2d_chunk_blocky.h index 5792e9d..21a06b6 100644 --- a/world/blocky/terrain_2d_chunk_blocky.h +++ b/world/blocky/terrain_2d_chunk_blocky.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_CHUNK_BLOCKY_H -#define TERRAIN_CHUNK_BLOCKY_H +#ifndef TERRAIN_2D_CHUNK_BLOCKY_H +#define TERRAIN_2D_CHUNK_BLOCKY_H #include "../default/terrain_2d_chunk_default.h" diff --git a/world/blocky/terrain_2d_world_blocky.h b/world/blocky/terrain_2d_world_blocky.h index 8f947af..2db518a 100644 --- a/world/blocky/terrain_2d_world_blocky.h +++ b/world/blocky/terrain_2d_world_blocky.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_WORLD_BLOCKY_H -#define TERRAIN_WORLD_BLOCKY_H +#ifndef TERRAIN_2D_WORLD_BLOCKY_H +#define TERRAIN_2D_WORLD_BLOCKY_H #include "../default/terrain_2d_world_default.h" diff --git a/world/default/terrain_2d_chunk_default.h b/world/default/terrain_2d_chunk_default.h index c3328dc..77eb314 100644 --- a/world/default/terrain_2d_chunk_default.h +++ b/world/default/terrain_2d_chunk_default.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_CHUNK_DEFAULT_H -#define TERRAIN_CHUNK_DEFAULT_H +#ifndef TERRAIN_2D_CHUNK_DEFAULT_H +#define TERRAIN_2D_CHUNK_DEFAULT_H #include "core/version.h" diff --git a/world/default/terrain_2d_world_default.h b/world/default/terrain_2d_world_default.h index fa6627f..479eb51 100644 --- a/world/default/terrain_2d_world_default.h +++ b/world/default/terrain_2d_world_default.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_WORLD_DEFAULT_H -#define TERRAIN_WORLD_DEFAULT_H +#ifndef TERRAIN_2D_WORLD_DEFAULT_H +#define TERRAIN_2D_WORLD_DEFAULT_H #include "../terrain_2d_world.h" diff --git a/world/jobs/terrain_2d_job.h b/world/jobs/terrain_2d_job.h index ce5cc08..7ca942a 100644 --- a/world/jobs/terrain_2d_job.h +++ b/world/jobs/terrain_2d_job.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_JOB_H -#define TERRAIN_JOB_H +#ifndef TERRAIN_2D_JOB_H +#define TERRAIN_2D_JOB_H #include "scene/resources/texture.h" diff --git a/world/jobs/terrain_2d_light_job.h b/world/jobs/terrain_2d_light_job.h index b8ee243..3963292 100644 --- a/world/jobs/terrain_2d_light_job.h +++ b/world/jobs/terrain_2d_light_job.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_LIGHT_JOB_H -#define TERRAIN_LIGHT_JOB_H +#ifndef TERRAIN_2D_LIGHT_JOB_H +#define TERRAIN_2D_LIGHT_JOB_H #include "terrain_2d_job.h" diff --git a/world/jobs/terrain_2d_mesher_job_step.cpp b/world/jobs/terrain_2d_mesher_job_step.cpp index f67dd9f..83d2cca 100644 --- a/world/jobs/terrain_2d_mesher_job_step.cpp +++ b/world/jobs/terrain_2d_mesher_job_step.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "terrain_2d_mesher_job_step.h" -const String Terrain2DMesherJobStep::BINDING_STRING_TERRAIN_TERRAIN_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh"; +const String Terrain2DMesherJobStep::BINDING_STRING_TERRAIN_2D_TERRAIN_2D_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh"; Terrain2DMesherJobStep::Terrain2DMesherJobStepType Terrain2DMesherJobStep::get_job_type() const { return _job_type; @@ -89,7 +89,7 @@ Terrain2DMesherJobStep::~Terrain2DMesherJobStep() { void Terrain2DMesherJobStep::_bind_methods() { ClassDB::bind_method(D_METHOD("get_job_type"), &Terrain2DMesherJobStep::get_job_type); ClassDB::bind_method(D_METHOD("set_job_type", "value"), &Terrain2DMesherJobStep::set_job_type); - ADD_PROPERTY(PropertyInfo(Variant::INT, "job_type", PROPERTY_HINT_ENUM, Terrain2DMesherJobStep::BINDING_STRING_TERRAIN_TERRAIN_JOB_STEP_TYPE), "set_job_type", "get_job_type"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "job_type", PROPERTY_HINT_ENUM, Terrain2DMesherJobStep::BINDING_STRING_TERRAIN_2D_TERRAIN_2D_JOB_STEP_TYPE), "set_job_type", "get_job_type"); ClassDB::bind_method(D_METHOD("get_lod_index"), &Terrain2DMesherJobStep::get_lod_index); ClassDB::bind_method(D_METHOD("set_lod_index", "value"), &Terrain2DMesherJobStep::set_lod_index); diff --git a/world/jobs/terrain_2d_mesher_job_step.h b/world/jobs/terrain_2d_mesher_job_step.h index 36dcfaa..6c2f815 100644 --- a/world/jobs/terrain_2d_mesher_job_step.h +++ b/world/jobs/terrain_2d_mesher_job_step.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_TERRAIN_JOB_STEP_H -#define TERRAIN_TERRAIN_JOB_STEP_H +#ifndef TERRAIN_2D_TERRAIN_2D_JOB_STEP_H +#define TERRAIN_2D_TERRAIN_2D_JOB_STEP_H #include "core/version.h" @@ -56,7 +56,7 @@ public: TYPE_OTHER, }; - static const String BINDING_STRING_TERRAIN_TERRAIN_JOB_STEP_TYPE; + static const String BINDING_STRING_TERRAIN_2D_TERRAIN_2D_JOB_STEP_TYPE; Terrain2DMesherJobStepType get_job_type() const; void set_job_type(const Terrain2DMesherJobStepType value); diff --git a/world/jobs/terrain_2d_prop_job.h b/world/jobs/terrain_2d_prop_job.h index 9b997ae..e053953 100644 --- a/world/jobs/terrain_2d_prop_job.h +++ b/world/jobs/terrain_2d_prop_job.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_PROP_JOB_H -#define TERRAIN_PROP_JOB_H +#ifndef TERRAIN_2D_PROP_JOB_H +#define TERRAIN_2D_PROP_JOB_H #include "terrain_2d_job.h" diff --git a/world/jobs/terrain_2d_terrain_job.h b/world/jobs/terrain_2d_terrain_job.h index a54fc5f..081cd61 100644 --- a/world/jobs/terrain_2d_terrain_job.h +++ b/world/jobs/terrain_2d_terrain_job.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_TERRAIN_JOB_H -#define TERRAIN_TERRAIN_JOB_H +#ifndef TERRAIN_2D_TERRAIN_2D_JOB_H +#define TERRAIN_2D_TERRAIN_2D_JOB_H #include "terrain_2d_job.h" diff --git a/world/terrain_2d_chunk.cpp b/world/terrain_2d_chunk.cpp index f88d438..261db99 100644 --- a/world/terrain_2d_chunk.cpp +++ b/world/terrain_2d_chunk.cpp @@ -1074,7 +1074,7 @@ Terrain2DChunk::Terrain2DChunk() { _is_generating = false; _dirty = false; - _state = TERRAIN_CHUNK_STATE_OK; + _state = TERRAIN_2D_CHUNK_STATE_OK; _voxel_scale = 1; diff --git a/world/terrain_2d_chunk.h b/world/terrain_2d_chunk.h index ae70c08..9ab25be 100644 --- a/world/terrain_2d_chunk.h +++ b/world/terrain_2d_chunk.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_CHUNK_H -#define TERRAIN_CHUNK_H +#ifndef TERRAIN_2D_CHUNK_H +#define TERRAIN_2D_CHUNK_H #include "core/version.h" @@ -79,7 +79,7 @@ class Terrain2DChunk : public Resource { public: enum { - TERRAIN_CHUNK_STATE_OK = 0, + TERRAIN_2D_CHUNK_STATE_OK = 0, }; public: diff --git a/world/terrain_2d_environment_data.h b/world/terrain_2d_environment_data.h index c02c3e4..9902f5e 100644 --- a/world/terrain_2d_environment_data.h +++ b/world/terrain_2d_environment_data.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_ENVIRONMENT_DATA_H -#define TERRAIN_ENVIRONMENT_DATA_H +#ifndef TERRAIN_2D_ENVIRONMENT_DATA_H +#define TERRAIN_2D_ENVIRONMENT_DATA_H #include "core/version.h" diff --git a/world/terrain_2d_structure.h b/world/terrain_2d_structure.h index c2ca018..0fb6969 100644 --- a/world/terrain_2d_structure.h +++ b/world/terrain_2d_structure.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_STRUCTURE_H -#define TERRAIN_STRUCTURE_H +#ifndef TERRAIN_2D_STRUCTURE_H +#define TERRAIN_2D_STRUCTURE_H #include "core/version.h" diff --git a/world/terrain_2d_world.h b/world/terrain_2d_world.h index 7b25622..16693fd 100644 --- a/world/terrain_2d_world.h +++ b/world/terrain_2d_world.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_WORLD_H -#define TERRAIN_WORLD_H +#ifndef TERRAIN_2D_WORLD_H +#define TERRAIN_2D_WORLD_H #include "core/version.h" diff --git a/world/terrain_2d_world_editor.h b/world/terrain_2d_world_editor.h index 60d7c5a..7c0622a 100644 --- a/world/terrain_2d_world_editor.h +++ b/world/terrain_2d_world_editor.h @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TERRAIN_WORLD_EDITOR_PLUGIN_H -#define TERRAIN_WORLD_EDITOR_PLUGIN_H +#ifndef TERRAIN_2D_WORLD_EDITOR_PLUGIN_H +#define TERRAIN_2D_WORLD_EDITOR_PLUGIN_H #include "editor/editor_node.h" #include "editor/editor_plugin.h"