From 7a3ec1789576d9db281c208f4870e9b6c45b3411 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 8 Feb 2022 22:33:02 +0100 Subject: [PATCH] Fix enum value name after mass replace. --- doc_classes/TerrainLibrary.xml | 2 +- library/terrain_library.cpp | 2 +- library/terrain_library.h | 2 +- library/terrain_library_merger.cpp | 8 ++++---- library/terrain_library_merger_pcm.cpp | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc_classes/TerrainLibrary.xml b/doc_classes/TerrainLibrary.xml index e90a55b..7c760d8 100644 --- a/doc_classes/TerrainLibrary.xml +++ b/doc_classes/TerrainLibrary.xml @@ -390,7 +390,7 @@ - + diff --git a/library/terrain_library.cpp b/library/terrain_library.cpp index d917ab1..fcb9324 100644 --- a/library/terrain_library.cpp +++ b/library/terrain_library.cpp @@ -621,7 +621,7 @@ void TerrainLibrary::_bind_methods() { ClassDB::bind_method(D_METHOD("setup_material_albedo", "material_index", "texture"), &TerrainLibrary::setup_material_albedo); - BIND_CONSTANT(MATERIAL_INDEX_TERRAS); + BIND_CONSTANT(MATERIAL_INDEX_TERRAIN); BIND_CONSTANT(MATERIAL_INDEX_LIQUID); BIND_CONSTANT(MATERIAL_INDEX_PROP); } diff --git a/library/terrain_library.h b/library/terrain_library.h index 5480ef2..36714fc 100644 --- a/library/terrain_library.h +++ b/library/terrain_library.h @@ -76,7 +76,7 @@ class TerrainLibrary : public Resource { public: enum { - MATERIAL_INDEX_TERRAS = 0, + MATERIAL_INDEX_TERRAIN = 0, MATERIAL_INDEX_LIQUID = 1, MATERIAL_INDEX_PROP = 2, }; diff --git a/library/terrain_library_merger.cpp b/library/terrain_library_merger.cpp index 4647ea2..8c85402 100644 --- a/library/terrain_library_merger.cpp +++ b/library/terrain_library_merger.cpp @@ -256,7 +256,7 @@ void TerrainLibraryMerger::refresh_rects() { Ref tex = _packer->get_generated_texture(0); - setup_material_albedo(MATERIAL_INDEX_TERRAS, tex); + setup_material_albedo(MATERIAL_INDEX_TERRAIN, tex); setup_material_albedo(MATERIAL_INDEX_LIQUID, tex); } @@ -301,7 +301,7 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons int count = 0; switch (material_index) { - case MATERIAL_INDEX_TERRAS: + case MATERIAL_INDEX_TERRAIN: count = material_get_num(); break; case MATERIAL_INDEX_LIQUID: @@ -314,7 +314,7 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons for (int i = 0; i < count; ++i) { switch (material_index) { - case MATERIAL_INDEX_TERRAS: + case MATERIAL_INDEX_TERRAIN: mat = material_get(i); break; case MATERIAL_INDEX_LIQUID: @@ -335,7 +335,7 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons Ref shmat; switch (material_index) { - case MATERIAL_INDEX_TERRAS: + case MATERIAL_INDEX_TERRAIN: shmat = material_get(i); break; case MATERIAL_INDEX_LIQUID: diff --git a/library/terrain_library_merger_pcm.cpp b/library/terrain_library_merger_pcm.cpp index de29129..56afb1a 100644 --- a/library/terrain_library_merger_pcm.cpp +++ b/library/terrain_library_merger_pcm.cpp @@ -599,7 +599,7 @@ void TerrainLibraryMergerPCM::refresh_rects() { Ref tex = _packer->get_generated_texture(0); - setup_material_albedo(MATERIAL_INDEX_TERRAS, tex); + setup_material_albedo(MATERIAL_INDEX_TERRAIN, tex); setup_material_albedo(MATERIAL_INDEX_LIQUID, tex); } @@ -644,7 +644,7 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c int count = 0; switch (material_index) { - case MATERIAL_INDEX_TERRAS: + case MATERIAL_INDEX_TERRAIN: count = material_get_num(); break; case MATERIAL_INDEX_LIQUID: @@ -657,7 +657,7 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c for (int i = 0; i < count; ++i) { switch (material_index) { - case MATERIAL_INDEX_TERRAS: + case MATERIAL_INDEX_TERRAIN: mat = material_get(i); break; case MATERIAL_INDEX_LIQUID: @@ -678,7 +678,7 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c Ref shmat; switch (material_index) { - case MATERIAL_INDEX_TERRAS: + case MATERIAL_INDEX_TERRAIN: shmat = material_get(i); break; case MATERIAL_INDEX_LIQUID: