Rename the files.

SCsub

@@ -25,55 +25,55 @@ sources = [
 
     "register_types.cpp",
 
-    "library/terrain_library.cpp",
+    "library/terrain_2d_library.cpp",
-    "library/terrain_library_simple.cpp",
+    "library/terrain_2d_library_simple.cpp",
-    "library/terrain_material_cache.cpp",
+    "library/terrain_2d_material_cache.cpp",
     
-    "nodes/terrain_light_node.cpp",
+    "nodes/terrain_2d_light_node.cpp",
 
-    "library/terrain_surface.cpp",
+    "library/terrain_2d_surface.cpp",
-    "library/terrain_surface_simple.cpp",
+    "library/terrain_2d_surface_simple.cpp",
 
-    "data/terrain_light.cpp",
+    "data/terrain_2d_light.cpp",
 
-    "meshers/terrain_mesher.cpp",
+    "meshers/terrain_2d_mesher.cpp",
 
-    "meshers/blocky/terrain_mesher_blocky.cpp",
+    "meshers/blocky/terrain_2d_mesher_blocky.cpp",
-    "meshers/default/terrain_mesher_default.cpp",
+    "meshers/default/terrain_2d_mesher_default.cpp",
 
-    "world/terrain_world.cpp",
+    "world/terrain_2d_world.cpp",
-    "world/terrain_chunk.cpp",
+    "world/terrain_2d_chunk.cpp",
-    "world/terrain_structure.cpp",
+    "world/terrain_2d_structure.cpp",
-    "world/block_terrain_structure.cpp",
+    "world/block_terrain_2d_structure.cpp",
-    "world/terrain_environment_data.cpp",
+    "world/terrain_2d_environment_data.cpp",
 
-    "world/blocky/terrain_chunk_blocky.cpp",
+    "world/blocky/terrain_2d_chunk_blocky.cpp",
-    "world/blocky/terrain_world_blocky.cpp",
+    "world/blocky/terrain_2d_world_blocky.cpp",
 
-    "world/default/terrain_world_default.cpp",
+    "world/default/terrain_2d_world_default.cpp",
-    "world/default/terrain_chunk_default.cpp",
+    "world/default/terrain_2d_chunk_default.cpp",
 
-    "level_generator/terrain_level_generator.cpp",
+    "level_generator/terrain_2d_level_generator.cpp",
-    "level_generator/terrain_level_generator_flat.cpp",
+    "level_generator/terrain_2d_level_generator_flat.cpp",
 
-    "areas/terrain_world_area.cpp",
+    "areas/terrain_2d_world_area.cpp",
 
-    "world/terrain_world_editor.cpp",
+    "world/terrain_2d_world_editor.cpp",
     
     "thirdparty/lz4/lz4.c",
 
-    "world/jobs/terrain_job.cpp",
+    "world/jobs/terrain_2d_job.cpp",
-    "world/jobs/terrain_terrain_job.cpp",
+    "world/jobs/terrain_2d_terrain_job.cpp",
-    "world/jobs/terrain_mesher_job_step.cpp",
+    "world/jobs/terrain_2d_mesher_job_step.cpp",
-    "world/jobs/terrain_light_job.cpp",
+    "world/jobs/terrain_2d_light_job.cpp",
-    "world/jobs/terrain_prop_job.cpp",
+    "world/jobs/terrain_2d_prop_job.cpp",
 ]
 
 if has_texture_packer:
-    sources.append("library/terrain_library_merger.cpp")
+    sources.append("library/terrain_2d_library_merger.cpp")
-    sources.append("library/terrain_library_merger_pcm.cpp")
+    sources.append("library/terrain_2d_library_merger_pcm.cpp")
-    sources.append("library/terrain_surface_merger.cpp")
+    sources.append("library/terrain_2d_surface_merger.cpp")
-    sources.append("library/terrain_material_cache_pcm.cpp")
+    sources.append("library/terrain_2d_material_cache_pcm.cpp")
 
 if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
     # Shared lib compilation

areas/terrain_2d_world_area.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_area.h"
+#include "terrain_2d_world_area.h"
 
 AABB TerrainWorldArea::get_aabb() const {
 	return _aabb;

data/terrain_2d_light.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_light.h"
+#include "terrain_2d_light.h"
 
 _FORCE_INLINE_ int TerrainLight::get_world_position_x() const {
 	return _world_position_x;

level_generator/terrain_2d_level_generator.cpp

@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_level_generator.h"
+#include "terrain_2d_level_generator.h"
 
-#include "../world/terrain_chunk.h"
+#include "../world/terrain_2d_chunk.h"
 
 void TerrainLevelGenerator::generate_chunk(Ref<TerrainChunk> chunk) {
 	if (has_method("_generate_chunk")) {

level_generator/terrain_2d_level_generator_flat.cpp

@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_level_generator_flat.h"
+#include "terrain_2d_level_generator_flat.h"
 
-#include "../world/terrain_chunk.h"
+#include "../world/terrain_2d_chunk.h"
 
 int TerrainLevelGeneratorFlat::get_floor_position() const {
 	return _floor_position;

level_generator/terrain_2d_level_generator_flat.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_LEVEL_GENERATOR_FLAT_H
 #define TERRAIN_LEVEL_GENERATOR_FLAT_H
 
-#include "terrain_level_generator.h"
+#include "terrain_2d_level_generator.h"
 
 class TerrainChunk;
 

library/terrain_2d_library.cpp

@@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
-#include "../world/terrain_chunk.h"
+#include "../world/terrain_2d_chunk.h"
 
-#include "terrain_material_cache.h"
+#include "terrain_2d_material_cache.h"
 
 #ifdef PROPS_PRESENT
 #include "../../props/props/prop_data.h"

library/terrain_2d_library.h

@@ -53,8 +53,8 @@ SOFTWARE.
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
+#include "../data/terrain_2d_light.h"
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
 
 #include "../defines.h"
 

library/terrain_2d_library_merger.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library_merger.h"
+#include "terrain_2d_library_merger.h"
 
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/texture.h"

library/terrain_2d_library_merger.h

@@ -33,12 +33,12 @@ SOFTWARE.
 #include "core/map.h"
 #endif
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
+#include "../data/terrain_2d_light.h"
-#include "terrain_surface_merger.h"
+#include "terrain_2d_surface_merger.h"
 
 class TerrainSurfaceSimple;
 class TerrainMesher;

library/terrain_2d_library_merger_pcm.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library_merger_pcm.h"
+#include "terrain_2d_library_merger_pcm.h"
 
 #include "../../texture_packer/texture_packer.h"
 #include "scene/resources/packed_scene.h"
@@ -37,10 +37,10 @@ SOFTWARE.
 #endif
 
 #include "../defines.h"
-#include "../world/default/terrain_chunk_default.h"
+#include "../world/default/terrain_2d_chunk_default.h"
 #include "core/hashfuncs.h"
 #include "core/message_queue.h"
-#include "terrain_material_cache_pcm.h"
+#include "terrain_2d_material_cache_pcm.h"
 
 bool TerrainLibraryMergerPCM::_supports_caching() {
 	return true;

library/terrain_2d_library_merger_pcm.h

@@ -33,12 +33,12 @@ SOFTWARE.
 #include "core/map.h"
 #endif
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
+#include "../data/terrain_2d_light.h"
-#include "terrain_surface_merger.h"
+#include "terrain_2d_surface_merger.h"
 
 #include "core/os/mutex.h"
 

library/terrain_2d_library_simple.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library_simple.h"
+#include "terrain_2d_library_simple.h"
 
 #include "../defines.h"
 

library/terrain_2d_library_simple.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #include "core/resource.h"
 #endif
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
+#include "../data/terrain_2d_light.h"
-#include "terrain_surface_simple.h"
+#include "terrain_2d_surface_simple.h"
 
 class TerrainSurfaceSimple;
 class TerrainMesher;

library/terrain_2d_material_cache.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_material_cache.h"
+#include "terrain_2d_material_cache.h"
 
 #include "../defines.h"
 

library/terrain_2d_material_cache.h

@@ -38,7 +38,7 @@ SOFTWARE.
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "../defines.h"
 

library/terrain_2d_material_cache_pcm.cpp

@@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_material_cache_pcm.h"
+#include "terrain_2d_material_cache_pcm.h"
 
 #include "../../texture_packer/texture_packer.h"
 #include "scene/resources/texture.h"
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
-#include "terrain_surface_merger.h"
+#include "terrain_2d_surface_merger.h"
 
 int TerrainMaterialCachePCM::get_texture_flags() const {
 	return _packer->get_texture_flags();

library/terrain_2d_material_cache_pcm.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_MATERIAL_CACHE_PCM_H
 #define TERRAIN_MATERIAL_CACHE_PCM_H
 
-#include "terrain_material_cache.h"
+#include "terrain_2d_material_cache.h"
 
 #include "core/version.h"
 

library/terrain_2d_surface.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
 
 int TerrainSurface::get_id() const {
 	return _id;

library/terrain_2d_surface.h

@@ -39,7 +39,7 @@ SOFTWARE.
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 class TerrainLibrary;
 

library/terrain_2d_surface_merger.cpp

@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_surface_merger.h"
+#include "terrain_2d_surface_merger.h"
 
-#include "terrain_library_merger.h"
+#include "terrain_2d_library_merger.h"
 
 #include "../defines.h"
 

library/terrain_2d_surface_merger.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_SURFACE_MERGER_H
 #define TERRAIN_SURFACE_MERGER_H
 
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
 
 #include "scene/resources/texture.h"
 

library/terrain_2d_surface_simple.cpp

@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_surface_simple.h"
+#include "terrain_2d_surface_simple.h"
 
-#include "terrain_library_simple.h"
+#include "terrain_2d_library_simple.h"
 
 int TerrainSurfaceSimple::get_atlas_x(const TerrainSurfaceSides side) const {
 	int indx = (side * 2);

library/terrain_2d_surface_simple.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_SURFACE_SIMPLE_H
 #define TERRAIN_SURFACE_SIMPLE_H
 
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
 
 class TerrainSurfaceSimple : public TerrainSurface {
 	GDCLASS(TerrainSurfaceSimple, TerrainSurface)

meshers/blocky/terrain_2d_mesher_blocky.cpp

@@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher_blocky.h"
+#include "terrain_2d_mesher_blocky.h"
 
 #include "core/math/math_funcs.h"
 
-#include "../../library/terrain_material_cache.h"
+#include "../../library/terrain_2d_material_cache.h"
 
 bool TerrainMesherBlocky::get_always_add_colors() const {
 	return _always_add_colors;

meshers/blocky/terrain_2d_mesher_blocky.h

@@ -34,8 +34,8 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 
-#include "../default/terrain_mesher_default.h"
+#include "../default/terrain_2d_mesher_default.h"
-#include "../../world/default/terrain_chunk_default.h"
+#include "../../world/default/terrain_2d_chunk_default.h"
 
 class TerrainMesherBlocky : public TerrainMesherDefault {
 	GDCLASS(TerrainMesherBlocky, TerrainMesherDefault);

meshers/default/terrain_2d_mesher_default.cpp

@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher_default.h"
+#include "terrain_2d_mesher_default.h"
 
-#include "../../world/default/terrain_chunk_default.h"
+#include "../../world/default/terrain_2d_chunk_default.h"
 
 #include "../../defines.h"
 

meshers/default/terrain_2d_mesher_default.h

@@ -34,7 +34,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 
-#include "../terrain_mesher.h"
+#include "../terrain_2d_mesher.h"
 
 class TerrainMesherDefault : public TerrainMesher {
 	GDCLASS(TerrainMesherDefault, TerrainMesher);

meshers/terrain_2d_mesher.cpp

@@ -20,14 +20,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher.h"
+#include "terrain_2d_mesher.h"
 
 #include "../defines.h"
 
 #include mesh_instance_h
 
-#include "../world/default/terrain_chunk_default.h"
+#include "../world/default/terrain_2d_chunk_default.h"
-#include "../world/terrain_chunk.h"
+#include "../world/terrain_2d_chunk.h"
 
 bool TerrainMesher::Vertex::operator==(const Vertex &p_vertex) const {
 	if (vertex != p_vertex.vertex)

meshers/terrain_2d_mesher.h

@@ -56,7 +56,7 @@ include_pool_vector
 #include "../../mesh_data_resource/mesh_data_resource.h"
 #endif
 
-#include "../library/terrain_library.h"
+#include "../library/terrain_2d_library.h"
 
 		class TerrainLibrary;
 class TerrainChunk;

nodes/terrain_2d_light_node.cpp

@@ -1,4 +1,4 @@
-#include "terrain_light_node.h"
+#include "terrain_2d_light_node.h"
 
 TerrainLightNode::TerrainLightNode() {
 }

register_types.cpp

@@ -22,51 +22,51 @@ SOFTWARE.
 
 #include "register_types.h"
 
-#include "library/terrain_surface.h"
+#include "library/terrain_2d_surface.h"
-#include "library/terrain_surface_simple.h"
+#include "library/terrain_2d_surface_simple.h"
 
-#include "library/terrain_material_cache.h"
+#include "library/terrain_2d_material_cache.h"
-#include "library/terrain_library.h"
+#include "library/terrain_2d_library.h"
-#include "library/terrain_library_simple.h"
+#include "library/terrain_2d_library_simple.h"
 
 #ifdef TEXTURE_PACKER_PRESENT
-#include "library/terrain_surface_merger.h"
+#include "library/terrain_2d_surface_merger.h"
-#include "library/terrain_library_merger.h"
+#include "library/terrain_2d_library_merger.h"
-#include "library/terrain_library_merger_pcm.h"
+#include "library/terrain_2d_library_merger_pcm.h"
-#include "library/terrain_material_cache_pcm.h"
+#include "library/terrain_2d_material_cache_pcm.h"
 #endif
 
-#include "data/terrain_light.h"
+#include "data/terrain_2d_light.h"
-#include "meshers/terrain_mesher.h"
+#include "meshers/terrain_2d_mesher.h"
 
-#include "world/block_terrain_structure.h"
+#include "world/block_terrain_2d_structure.h"
-#include "world/terrain_chunk.h"
+#include "world/terrain_2d_chunk.h"
-#include "world/terrain_environment_data.h"
+#include "world/terrain_2d_environment_data.h"
-#include "world/terrain_structure.h"
+#include "world/terrain_2d_structure.h"
-#include "world/terrain_world.h"
+#include "world/terrain_2d_world.h"
 
-#include "world/default/terrain_chunk_default.h"
+#include "world/default/terrain_2d_chunk_default.h"
-#include "world/default/terrain_world_default.h"
+#include "world/default/terrain_2d_world_default.h"
 
-#include "level_generator/terrain_level_generator.h"
+#include "level_generator/terrain_2d_level_generator.h"
-#include "level_generator/terrain_level_generator_flat.h"
+#include "level_generator/terrain_2d_level_generator_flat.h"
 
-#include "areas/terrain_world_area.h"
+#include "areas/terrain_2d_world_area.h"
 
-#include "world/terrain_world_editor.h"
+#include "world/terrain_2d_world_editor.h"
 
-#include "meshers/blocky/terrain_mesher_blocky.h"
+#include "meshers/blocky/terrain_2d_mesher_blocky.h"
 
-#include "world/blocky/terrain_chunk_blocky.h"
+#include "world/blocky/terrain_2d_chunk_blocky.h"
-#include "world/blocky/terrain_world_blocky.h"
+#include "world/blocky/terrain_2d_world_blocky.h"
 
-#include "nodes/terrain_light_node.h"
+#include "nodes/terrain_2d_light_node.h"
 
-#include "world/jobs/terrain_job.h"
+#include "world/jobs/terrain_2d_job.h"
-#include "world/jobs/terrain_light_job.h"
+#include "world/jobs/terrain_2d_light_job.h"
-#include "world/jobs/terrain_mesher_job_step.h"
+#include "world/jobs/terrain_2d_mesher_job_step.h"
-#include "world/jobs/terrain_prop_job.h"
+#include "world/jobs/terrain_2d_prop_job.h"
-#include "world/jobs/terrain_terrain_job.h"
+#include "world/jobs/terrain_2d_terrain_job.h"
 
 void register_terraman_2d_types() {
 	ClassDB::register_class<TerrainMesher>();

world/block_terrain_2d_structure.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "block_terrain_structure.h"
+#include "block_terrain_2d_structure.h"
 
 int BlockTerrainStructure::get_channel_type() const {
 	return _channel_type;

world/block_terrain_2d_structure.h

@@ -31,14 +31,14 @@ SOFTWARE.
 #include "core/vector.h"
 #endif
 
-#include "terrain_structure.h"
+#include "terrain_2d_structure.h"
 
 #include "../defines.h"
 
 #include pool_vector_h
 include_pool_vector
 
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 		;
 
 class BlockTerrainStructure : public TerrainStructure {

world/blocky/terrain_2d_chunk_blocky.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_chunk_blocky.h"
+#include "terrain_2d_chunk_blocky.h"
 
 #include "../../defines.h"
 

world/blocky/terrain_2d_chunk_blocky.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_CHUNK_BLOCKY_H
 #define TERRAIN_CHUNK_BLOCKY_H
 
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 class TerrainChunkBlocky : public TerrainChunkDefault {
 	GDCLASS(TerrainChunkBlocky, TerrainChunkDefault);

world/blocky/terrain_2d_world_blocky.cpp

@@ -20,14 +20,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_blocky.h"
+#include "terrain_2d_world_blocky.h"
 
-#include "terrain_chunk_blocky.h"
+#include "terrain_2d_chunk_blocky.h"
 
-#include "../../meshers/blocky/terrain_mesher_blocky.h"
+#include "../../meshers/blocky/terrain_2d_mesher_blocky.h"
-#include "../jobs/terrain_light_job.h"
+#include "../jobs/terrain_2d_light_job.h"
-#include "../jobs/terrain_prop_job.h"
+#include "../jobs/terrain_2d_prop_job.h"
-#include "../jobs/terrain_terrain_job.h"
+#include "../jobs/terrain_2d_terrain_job.h"
 
 Ref<TerrainChunk> TerrainWorldBlocky::_create_chunk(int x, int z, Ref<TerrainChunk> chunk) {
 	if (!chunk.is_valid()) {

world/blocky/terrain_2d_world_blocky.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_WORLD_BLOCKY_H
 #define TERRAIN_WORLD_BLOCKY_H
 
-#include "../default/terrain_world_default.h"
+#include "../default/terrain_2d_world_default.h"
 
 class TerrainWorldBlocky : public TerrainWorldDefault {
 	GDCLASS(TerrainWorldBlocky, TerrainWorldDefault);

world/default/terrain_2d_chunk_default.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_chunk_default.h"
+#include "terrain_2d_chunk_default.h"
 
 #include "../../defines.h"
 
@@ -28,16 +28,16 @@ SOFTWARE.
 #include physics_server_h
 
 #include "../../../opensimplex/open_simplex_noise.h"
-#include "../../meshers/default/terrain_mesher_default.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
-#include "../terrain_world.h"
+#include "../terrain_2d_world.h"
 
-#include "../jobs/terrain_job.h"
+#include "../jobs/terrain_2d_job.h"
 
-#include "terrain_world_default.h"
+#include "terrain_2d_world_default.h"
 
-#include "../jobs/terrain_light_job.h"
+#include "../jobs/terrain_2d_light_job.h"
-#include "../jobs/terrain_prop_job.h"
+#include "../jobs/terrain_2d_prop_job.h"
-#include "../jobs/terrain_terrain_job.h"
+#include "../jobs/terrain_2d_terrain_job.h"
 
 const String TerrainChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
 

world/default/terrain_2d_chunk_default.h

@@ -36,7 +36,7 @@ SOFTWARE.
 #endif
 
 
-#include "../terrain_chunk.h"
+#include "../terrain_2d_chunk.h"
 
 #include "../../defines.h"
 
@@ -45,11 +45,11 @@ SOFTWARE.
 #include "core/os/thread_safe.h"
 
 #include "scene/resources/packed_scene.h"
-#include "../terrain_world.h"
+#include "../terrain_2d_world.h"
-#include "../../data/terrain_light.h"
+#include "../../data/terrain_2d_light.h"
-#include "../../meshers/terrain_mesher.h"
+#include "../../meshers/terrain_2d_mesher.h"
-#include "../../library/terrain_surface.h"
+#include "../../library/terrain_2d_surface.h"
-#include "../../library/terrain_library.h"
+#include "../../library/terrain_2d_library.h"
 
 class TerrainWorld;
 class TerrainJob;

world/default/terrain_2d_world_default.cpp

@@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_default.h"
+#include "terrain_2d_world_default.h"
 
-#include "terrain_chunk_default.h"
+#include "terrain_2d_chunk_default.h"
 
 #include "../../defines.h"
 
-#include "../../meshers/default/terrain_mesher_default.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
-#include "../jobs/terrain_light_job.h"
+#include "../jobs/terrain_2d_light_job.h"
-#include "../jobs/terrain_prop_job.h"
+#include "../jobs/terrain_2d_prop_job.h"
-#include "../jobs/terrain_terrain_job.h"
+#include "../jobs/terrain_2d_terrain_job.h"
 
 _FORCE_INLINE_ int TerrainWorldDefault::get_build_flags() const {
 	return _build_flags;

world/default/terrain_2d_world_default.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_WORLD_DEFAULT_H
 #define TERRAIN_WORLD_DEFAULT_H
 
-#include "../terrain_world.h"
+#include "../terrain_2d_world.h"
 
 class TerrainWorldDefault : public TerrainWorld {
 	GDCLASS(TerrainWorldDefault, TerrainWorld);

world/jobs/terrain_2d_job.cpp

@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 #include "../../../opensimplex/open_simplex_noise.h"
 

world/jobs/terrain_2d_light_job.cpp

@@ -20,15 +20,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_light_job.h"
+#include "terrain_2d_light_job.h"
 
 #include "../../defines.h"
 
-#include "../../library/terrain_surface.h"
+#include "../../library/terrain_2d_surface.h"
-#include "../../library/terrain_library.h"
+#include "../../library/terrain_2d_library.h"
 
-#include "../../meshers/terrain_mesher.h"
+#include "../../meshers/terrain_2d_mesher.h"
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 void TerrainLightJob::phase_light() {
 	Ref<TerrainChunkDefault> chunk = _chunk;

world/jobs/terrain_2d_light_job.h

@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_LIGHT_JOB_H
 #define TERRAIN_LIGHT_JOB_H
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
 class TerrainMesher;
 

world/jobs/terrain_2d_mesher_job_step.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher_job_step.h"
+#include "terrain_2d_mesher_job_step.h"
 
 const String TerrainMesherJobStep::BINDING_STRING_TERRAIN_TERRAIN_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh";
 

world/jobs/terrain_2d_prop_job.cpp

@@ -20,23 +20,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_prop_job.h"
+#include "terrain_2d_prop_job.h"
 
 #include "../../defines.h"
 
-#include "../../library/terrain_material_cache.h"
+#include "../../library/terrain_2d_material_cache.h"
-#include "../../library/terrain_surface.h"
+#include "../../library/terrain_2d_surface.h"
-#include "../../library/terrain_library.h"
+#include "../../library/terrain_2d_library.h"
 
-#include "../../meshers/default/terrain_mesher_default.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
-#include "../../meshers/terrain_mesher.h"
+#include "../../meshers/terrain_2d_mesher.h"
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
 #include "../../../mesh_data_resource/mesh_data_resource.h"
 #endif
 
-#include "../../world/default/terrain_world_default.h"
+#include "../../world/default/terrain_2d_world_default.h"
 
 #ifdef MESH_UTILS_PRESENT
 #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"

world/jobs/terrain_2d_prop_job.h

@@ -23,9 +23,9 @@ SOFTWARE.
 #ifndef TERRAIN_PROP_JOB_H
 #define TERRAIN_PROP_JOB_H
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
-#include "terrain_mesher_job_step.h"
+#include "terrain_2d_mesher_job_step.h"
 
 class TerrainMesher;
 

world/jobs/terrain_2d_terrain_job.cpp

@@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_terrain_job.h"
+#include "terrain_2d_terrain_job.h"
 
-#include "../../library/terrain_material_cache.h"
+#include "../../library/terrain_2d_material_cache.h"
-#include "../../library/terrain_surface.h"
+#include "../../library/terrain_2d_surface.h"
-#include "../../library/terrain_library.h"
+#include "../../library/terrain_2d_library.h"
 
-#include "../../meshers/default/terrain_mesher_default.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
-#include "../../meshers/terrain_mesher.h"
+#include "../../meshers/terrain_2d_mesher.h"
 
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 #ifdef MESH_UTILS_PRESENT
 #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"

world/jobs/terrain_2d_terrain_job.h

@@ -23,9 +23,9 @@ SOFTWARE.
 #ifndef TERRAIN_TERRAIN_JOB_H
 #define TERRAIN_TERRAIN_JOB_H
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
-#include "terrain_mesher_job_step.h"
+#include "terrain_2d_mesher_job_step.h"
 
 #include "../../defines.h"
 

world/terrain_2d_chunk.cpp

@@ -20,17 +20,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
 #include "../thirdparty/lz4/lz4.h"
 
 #include "../defines.h"
 
 #include "core/message_queue.h"
-#include "jobs/terrain_job.h"
+#include "jobs/terrain_2d_job.h"
-#include "terrain_structure.h"
+#include "terrain_2d_structure.h"
 
 #if THREAD_POOL_PRESENT
 #include "../../thread_pool/thread_pool.h"

world/terrain_2d_chunk.h

@@ -48,11 +48,11 @@ include_pool_vector
 
 #include "scene/resources/packed_scene.h"
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
-#include "../data/terrain_light.h"
+#include "../data/terrain_2d_light.h"
 
-#include "../meshers/terrain_mesher.h"
+#include "../meshers/terrain_2d_mesher.h"
 
 #if PROPS_PRESENT
 #include "../../props/props/prop_data.h"
@@ -64,8 +64,8 @@ include_pool_vector
 #define Texture Texture2D
 #endif
 
-#include "../library/terrain_surface.h"
+#include "../library/terrain_2d_surface.h"
-#include "../library/terrain_library.h"
+#include "../library/terrain_2d_library.h"
 		; //hackfix for a clang format issue
 
 class TerrainJob;

world/terrain_2d_environment_data.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_environment_data.h"
+#include "terrain_2d_environment_data.h"
 
 Ref<Environment> TerrainEnvironmentData::get_environment() {
 	return _environment;

world/terrain_2d_structure.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_structure.h"
+#include "terrain_2d_structure.h"
 
 bool TerrainStructure::get_use_aabb() const {
 	return _use_aabb;

world/terrain_2d_structure.h

@@ -38,7 +38,7 @@ SOFTWARE.
 #include pool_vector_h
 include_pool_vector
 #include "core/math/aabb.h"
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 
 		class TerrainStructure : public Resource {
 	GDCLASS(TerrainStructure, Resource);

world/terrain_2d_world.cpp

@@ -20,13 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
 #include "core/version.h"
 
 #include "core/message_queue.h"
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
-#include "terrain_structure.h"
+#include "terrain_2d_structure.h"
 
 #include "../defines.h"
 

world/terrain_2d_world.h

@@ -37,9 +37,9 @@ SOFTWARE.
 
 #include navigation_h
 
-#include "../areas/terrain_world_area.h"
+#include "../areas/terrain_2d_world_area.h"
-#include "../level_generator/terrain_level_generator.h"
+#include "../level_generator/terrain_2d_level_generator.h"
-#include "../library/terrain_library.h"
+#include "../library/terrain_2d_library.h"
 
 #include "core/os/os.h"
 

world/terrain_2d_world_editor.cpp

@@ -20,21 +20,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_editor.h"
+#include "terrain_2d_world_editor.h"
 
 #include "core/version.h"
 
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
 #include "core/os/keyboard.h"
 
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 
-#include "../library/terrain_surface.h"
+#include "../library/terrain_2d_surface.h"
-#include "../library/terrain_library.h"
+#include "../library/terrain_2d_library.h"
 
 #include "../defines.h"