diff --git a/SCsub b/SCsub index cf0488a..57ea570 100644 --- a/SCsub +++ b/SCsub @@ -25,52 +25,52 @@ sources = [ "register_types.cpp", - "library/voxelman_library.cpp", - "library/voxelman_library_simple.cpp", + "library/terraman_library.cpp", + "library/terraman_library_simple.cpp", - "nodes/voxelman_light.cpp", + "nodes/terraman_light.cpp", - "library/voxel_surface.cpp", - "library/voxel_surface_simple.cpp", + "library/terra_surface.cpp", + "library/terra_surface_simple.cpp", - "data/voxel_light.cpp", + "data/terra_light.cpp", - "meshers/voxel_mesher.cpp", + "meshers/terra_mesher.cpp", - "meshers/blocky/voxel_mesher_blocky.cpp", - "meshers/blocky/voxel_mesher_liquid_blocky.cpp", - "meshers/default/voxel_mesher_default.cpp", + "meshers/blocky/terra_mesher_blocky.cpp", + "meshers/blocky/terra_mesher_liquid_blocky.cpp", + "meshers/default/terra_mesher_default.cpp", - "world/voxel_world.cpp", - "world/voxel_chunk.cpp", - "world/voxel_structure.cpp", - "world/block_voxel_structure.cpp", - "world/environment_data.cpp", + "world/terra_world.cpp", + "world/terra_chunk.cpp", + "world/terra_structure.cpp", + "world/block_terra_structure.cpp", + "world/terra_environment_data.cpp", - "world/blocky/voxel_chunk_blocky.cpp", - "world/blocky/voxel_world_blocky.cpp", + "world/blocky/terra_chunk_blocky.cpp", + "world/blocky/terra_world_blocky.cpp", - "world/default/voxel_world_default.cpp", - "world/default/voxel_chunk_default.cpp", + "world/default/terra_world_default.cpp", + "world/default/terra_chunk_default.cpp", - "level_generator/voxelman_level_generator.cpp", - "level_generator/voxelman_level_generator_flat.cpp", + "level_generator/terraman_level_generator.cpp", + "level_generator/terraman_level_generator_flat.cpp", - "areas/world_area.cpp", + "areas/terra_world_area.cpp", - "world/voxel_world_editor.cpp", + "world/terra_world_editor.cpp", "thirdparty/lz4/lz4.c", - "world/jobs/voxel_job.cpp", - "world/jobs/voxel_terrarin_job.cpp", - "world/jobs/voxel_light_job.cpp", - "world/jobs/voxel_prop_job.cpp", + "world/jobs/terra_job.cpp", + "world/jobs/terra_terrarin_job.cpp", + "world/jobs/terra_light_job.cpp", + "world/jobs/terra_prop_job.cpp", ] if has_texture_packer: - sources.append("library/voxelman_library_merger.cpp") - sources.append("library/voxel_surface_merger.cpp") + sources.append("library/terraman_library_merger.cpp") + sources.append("library/terra_surface_merger.cpp") if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes': # Shared lib compilation diff --git a/areas/world_area.cpp b/areas/terra_world_area.cpp similarity index 99% rename from areas/world_area.cpp rename to areas/terra_world_area.cpp index f22141d..753f774 100644 --- a/areas/world_area.cpp +++ b/areas/terra_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 "world_area.h" +#include "terra_world_area.h" AABB TerraWorldArea::get_aabb() const { return _aabb; diff --git a/areas/world_area.h b/areas/terra_world_area.h similarity index 100% rename from areas/world_area.h rename to areas/terra_world_area.h diff --git a/data/voxel_light.cpp b/data/terra_light.cpp similarity index 99% rename from data/voxel_light.cpp rename to data/terra_light.cpp index 5979515..4a92c21 100644 --- a/data/voxel_light.cpp +++ b/data/terra_light.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_light.h" +#include "terra_light.h" _FORCE_INLINE_ int TerraLight::get_world_position_x() const { return _world_position_x; diff --git a/data/voxel_light.h b/data/terra_light.h similarity index 100% rename from data/voxel_light.h rename to data/terra_light.h diff --git a/level_generator/voxelman_level_generator.cpp b/level_generator/terraman_level_generator.cpp similarity index 95% rename from level_generator/voxelman_level_generator.cpp rename to level_generator/terraman_level_generator.cpp index a8bb759..2b3c6a8 100644 --- a/level_generator/voxelman_level_generator.cpp +++ b/level_generator/terraman_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 "voxelman_level_generator.h" +#include "terraman_level_generator.h" -#include "../world/voxel_chunk.h" +#include "../world/terra_chunk.h" void TerramanLevelGenerator::generate_chunk(Ref chunk) { if (has_method("_generate_chunk")) { diff --git a/level_generator/voxelman_level_generator.h b/level_generator/terraman_level_generator.h similarity index 100% rename from level_generator/voxelman_level_generator.h rename to level_generator/terraman_level_generator.h diff --git a/level_generator/voxelman_level_generator_flat.cpp b/level_generator/terraman_level_generator_flat.cpp similarity index 97% rename from level_generator/voxelman_level_generator_flat.cpp rename to level_generator/terraman_level_generator_flat.cpp index 7ec519c..814897f 100644 --- a/level_generator/voxelman_level_generator_flat.cpp +++ b/level_generator/terraman_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 "voxelman_level_generator_flat.h" +#include "terraman_level_generator_flat.h" -#include "../world/voxel_chunk.h" +#include "../world/terra_chunk.h" int TerramanLevelGeneratorFlat::get_floor_position() const { return _floor_position; diff --git a/level_generator/voxelman_level_generator_flat.h b/level_generator/terraman_level_generator_flat.h similarity index 97% rename from level_generator/voxelman_level_generator_flat.h rename to level_generator/terraman_level_generator_flat.h index 74b0509..0fc30b8 100644 --- a/level_generator/voxelman_level_generator_flat.h +++ b/level_generator/terraman_level_generator_flat.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRAMAN_LEVEL_GENERATOR_FLAT_H #define TERRAMAN_LEVEL_GENERATOR_FLAT_H -#include "voxelman_level_generator.h" +#include "terraman_level_generator.h" class TerraChunk; diff --git a/library/voxel_surface.cpp b/library/terra_surface.cpp similarity index 99% rename from library/voxel_surface.cpp rename to library/terra_surface.cpp index 55cd8ef..9159da4 100644 --- a/library/voxel_surface.cpp +++ b/library/terra_surface.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_surface.h" +#include "terra_surface.h" int TerraSurface::get_id() const { return _id; diff --git a/library/voxel_surface.h b/library/terra_surface.h similarity index 98% rename from library/voxel_surface.h rename to library/terra_surface.h index 4db57d9..2b20df2 100644 --- a/library/voxel_surface.h +++ b/library/terra_surface.h @@ -39,7 +39,7 @@ SOFTWARE. #include "core/math/rect2.h" #include "scene/resources/material.h" -#include "voxelman_library.h" +#include "terraman_library.h" class TerramanLibrary; diff --git a/library/voxel_surface_merger.cpp b/library/terra_surface_merger.cpp similarity index 98% rename from library/voxel_surface_merger.cpp rename to library/terra_surface_merger.cpp index e96b258..3524ff7 100644 --- a/library/voxel_surface_merger.cpp +++ b/library/terra_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 "voxel_surface_merger.h" +#include "terra_surface_merger.h" -#include "voxelman_library_merger.h" +#include "terraman_library_merger.h" #include "../defines.h" diff --git a/library/voxel_surface_merger.h b/library/terra_surface_merger.h similarity index 98% rename from library/voxel_surface_merger.h rename to library/terra_surface_merger.h index 30f8d49..1d74261 100644 --- a/library/voxel_surface_merger.h +++ b/library/terra_surface_merger.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_SURFACE_MERGER_H #define TERRA_SURFACE_MERGER_H -#include "voxel_surface.h" +#include "terra_surface.h" #include "scene/resources/texture.h" diff --git a/library/voxel_surface_simple.cpp b/library/terra_surface_simple.cpp similarity index 97% rename from library/voxel_surface_simple.cpp rename to library/terra_surface_simple.cpp index 3026fb2..3dda887 100644 --- a/library/voxel_surface_simple.cpp +++ b/library/terra_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 "voxel_surface_simple.h" +#include "terra_surface_simple.h" -#include "voxelman_library_simple.h" +#include "terraman_library_simple.h" int TerraSurfaceSimple::get_atlas_x(const TerraSurfaceSides side) const { int indx = (side * 2); diff --git a/library/voxel_surface_simple.h b/library/terra_surface_simple.h similarity index 98% rename from library/voxel_surface_simple.h rename to library/terra_surface_simple.h index 1ed3ce8..40ce523 100644 --- a/library/voxel_surface_simple.h +++ b/library/terra_surface_simple.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_SURFACE_SIMPLE_H #define TERRA_SURFACE_SIMPLE_H -#include "voxel_surface.h" +#include "terra_surface.h" class TerraSurfaceSimple : public TerraSurface { GDCLASS(TerraSurfaceSimple, TerraSurface) diff --git a/library/voxelman_library.cpp b/library/terraman_library.cpp similarity index 99% rename from library/voxelman_library.cpp rename to library/terraman_library.cpp index 96602d2..40055e2 100644 --- a/library/voxelman_library.cpp +++ b/library/terraman_library.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxelman_library.h" +#include "terraman_library.h" #ifdef PROPS_PRESENT #include "../../props/props/prop_data.h" diff --git a/library/voxelman_library.h b/library/terraman_library.h similarity index 98% rename from library/voxelman_library.h rename to library/terraman_library.h index c44e00f..42eeba7 100644 --- a/library/voxelman_library.h +++ b/library/terraman_library.h @@ -34,8 +34,8 @@ SOFTWARE. #include "core/math/rect2.h" #include "scene/resources/material.h" -#include "../data/voxel_light.h" -#include "voxel_surface.h" +#include "../data/terra_light.h" +#include "terra_surface.h" #include "../defines.h" diff --git a/library/voxelman_library_merger.cpp b/library/terraman_library_merger.cpp similarity index 99% rename from library/voxelman_library_merger.cpp rename to library/terraman_library_merger.cpp index 2c57e41..b39c58f 100644 --- a/library/voxelman_library_merger.cpp +++ b/library/terraman_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 "voxelman_library_merger.h" +#include "terraman_library_merger.h" #include "scene/resources/packed_scene.h" #include "scene/resources/texture.h" diff --git a/library/voxelman_library_merger.h b/library/terraman_library_merger.h similarity index 97% rename from library/voxelman_library_merger.h rename to library/terraman_library_merger.h index ab8185f..85b4785 100644 --- a/library/voxelman_library_merger.h +++ b/library/terraman_library_merger.h @@ -33,12 +33,12 @@ SOFTWARE. #include "core/map.h" #endif -#include "voxelman_library.h" +#include "terraman_library.h" #include "scene/resources/material.h" -#include "../data/voxel_light.h" -#include "voxel_surface_merger.h" +#include "../data/terra_light.h" +#include "terra_surface_merger.h" class TerraSurfaceSimple; class TerraMesher; diff --git a/library/voxelman_library_simple.cpp b/library/terraman_library_simple.cpp similarity index 99% rename from library/voxelman_library_simple.cpp rename to library/terraman_library_simple.cpp index 3bbd9ec..2235d1f 100644 --- a/library/voxelman_library_simple.cpp +++ b/library/terraman_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 "voxelman_library_simple.h" +#include "terraman_library_simple.h" #include "../defines.h" diff --git a/library/voxelman_library_simple.h b/library/terraman_library_simple.h similarity index 95% rename from library/voxelman_library_simple.h rename to library/terraman_library_simple.h index 945b782..01ef5fa 100644 --- a/library/voxelman_library_simple.h +++ b/library/terraman_library_simple.h @@ -31,12 +31,12 @@ SOFTWARE. #include "core/resource.h" #endif -#include "voxelman_library.h" +#include "terraman_library.h" #include "scene/resources/material.h" -#include "../data/voxel_light.h" -#include "voxel_surface_simple.h" +#include "../data/terra_light.h" +#include "terra_surface_simple.h" class TerraSurfaceSimple; class TerraMesher; diff --git a/meshers/blocky/voxel_mesher_blocky.cpp b/meshers/blocky/terra_mesher_blocky.cpp similarity index 99% rename from meshers/blocky/voxel_mesher_blocky.cpp rename to meshers/blocky/terra_mesher_blocky.cpp index e181c60..5904ca8 100644 --- a/meshers/blocky/voxel_mesher_blocky.cpp +++ b/meshers/blocky/terra_mesher_blocky.cpp @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_mesher_blocky.h" +#include "terra_mesher_blocky.h" -#include "../../world/default/voxel_chunk_default.h" +#include "../../world/default/terra_chunk_default.h" bool TerraMesherBlocky::get_always_add_colors() const { return _always_add_colors; diff --git a/meshers/blocky/voxel_mesher_blocky.h b/meshers/blocky/terra_mesher_blocky.h similarity index 97% rename from meshers/blocky/voxel_mesher_blocky.h rename to meshers/blocky/terra_mesher_blocky.h index 4b394a6..54f5624 100644 --- a/meshers/blocky/voxel_mesher_blocky.h +++ b/meshers/blocky/terra_mesher_blocky.h @@ -34,7 +34,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "../default/voxel_mesher_default.h" +#include "../default/terra_mesher_default.h" class TerraMesherBlocky : public TerraMesherDefault { GDCLASS(TerraMesherBlocky, TerraMesherDefault); diff --git a/meshers/blocky/voxel_mesher_liquid_blocky.cpp b/meshers/blocky/terra_mesher_liquid_blocky.cpp similarity index 99% rename from meshers/blocky/voxel_mesher_liquid_blocky.cpp rename to meshers/blocky/terra_mesher_liquid_blocky.cpp index 36c6ee2..0ae1219 100644 --- a/meshers/blocky/voxel_mesher_liquid_blocky.cpp +++ b/meshers/blocky/terra_mesher_liquid_blocky.cpp @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_mesher_liquid_blocky.h" +#include "terra_mesher_liquid_blocky.h" -#include "../../world/default/voxel_chunk_default.h" +#include "../../world/default/terra_chunk_default.h" void TerraMesherLiquidBlocky::_add_chunk(Ref p_chunk) { Ref chunk = p_chunk; diff --git a/meshers/blocky/voxel_mesher_liquid_blocky.h b/meshers/blocky/terra_mesher_liquid_blocky.h similarity index 97% rename from meshers/blocky/voxel_mesher_liquid_blocky.h rename to meshers/blocky/terra_mesher_liquid_blocky.h index a06b0d9..7dc9221 100644 --- a/meshers/blocky/voxel_mesher_liquid_blocky.h +++ b/meshers/blocky/terra_mesher_liquid_blocky.h @@ -34,7 +34,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "../default/voxel_mesher_default.h" +#include "../default/terra_mesher_default.h" class TerraMesherLiquidBlocky : public TerraMesherDefault { GDCLASS(TerraMesherLiquidBlocky, TerraMesherDefault); diff --git a/meshers/default/voxel_mesher_default.cpp b/meshers/default/terra_mesher_default.cpp similarity index 98% rename from meshers/default/voxel_mesher_default.cpp rename to meshers/default/terra_mesher_default.cpp index a889a79..fff4d8b 100644 --- a/meshers/default/voxel_mesher_default.cpp +++ b/meshers/default/terra_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 "voxel_mesher_default.h" +#include "terra_mesher_default.h" -#include "../../world/default/voxel_chunk_default.h" +#include "../../world/default/terra_chunk_default.h" #include "../../defines.h" diff --git a/meshers/default/voxel_mesher_default.h b/meshers/default/terra_mesher_default.h similarity index 98% rename from meshers/default/voxel_mesher_default.h rename to meshers/default/terra_mesher_default.h index 6140747..515c618 100644 --- a/meshers/default/voxel_mesher_default.h +++ b/meshers/default/terra_mesher_default.h @@ -34,7 +34,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "../voxel_mesher.h" +#include "../terra_mesher.h" class TerraMesherDefault : public TerraMesher { GDCLASS(TerraMesherDefault, TerraMesher); diff --git a/meshers/voxel_mesher.cpp b/meshers/terra_mesher.cpp similarity index 99% rename from meshers/voxel_mesher.cpp rename to meshers/terra_mesher.cpp index 22aa3b1..48c22d1 100644 --- a/meshers/voxel_mesher.cpp +++ b/meshers/terra_mesher.cpp @@ -20,14 +20,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_mesher.h" +#include "terra_mesher.h" #include "../defines.h" #include mesh_instance_h -#include "../world/default/voxel_chunk_default.h" -#include "../world/voxel_chunk.h" +#include "../world/default/terra_chunk_default.h" +#include "../world/terra_chunk.h" bool TerraMesher::Vertex::operator==(const Vertex &p_vertex) const { diff --git a/meshers/voxel_mesher.h b/meshers/terra_mesher.h similarity index 99% rename from meshers/voxel_mesher.h rename to meshers/terra_mesher.h index 2f68646..45b301c 100644 --- a/meshers/voxel_mesher.h +++ b/meshers/terra_mesher.h @@ -53,7 +53,7 @@ include_pool_vector #include "../../mesh_data_resource/mesh_data_resource.h" #endif -#include "../library/voxelman_library.h" +#include "../library/terraman_library.h" class TerramanLibrary; class TerraChunk; diff --git a/nodes/voxelman_light.cpp b/nodes/terraman_light.cpp similarity index 80% rename from nodes/voxelman_light.cpp rename to nodes/terraman_light.cpp index bedca06..0250fa2 100644 --- a/nodes/voxelman_light.cpp +++ b/nodes/terraman_light.cpp @@ -1,4 +1,4 @@ -#include "voxelman_light.h" +#include "terraman_light.h" TerramanLight::TerramanLight() { } diff --git a/nodes/voxelman_light.h b/nodes/terraman_light.h similarity index 100% rename from nodes/voxelman_light.h rename to nodes/terraman_light.h diff --git a/register_types.cpp b/register_types.cpp index b204b6f..1626f75 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -23,63 +23,54 @@ SOFTWARE. #include "register_types.h" -#include "library/voxel_surface.h" -#include "library/voxel_surface_simple.h" +#include "library/terra_surface.h" +#include "library/terra_surface_simple.h" -#include "library/voxelman_library.h" -#include "library/voxelman_library_simple.h" +#include "library/terraman_library.h" +#include "library/terraman_library_simple.h" #ifdef TEXTURE_PACKER_PRESENT -#include "library/voxel_surface_merger.h" -#include "library/voxelman_library_merger.h" +#include "library/terra_surface_merger.h" +#include "library/terraman_library_merger.h" #endif -#include "data/voxel_light.h" -#include "meshers/voxel_mesher.h" +#include "data/terra_light.h" +#include "meshers/terra_mesher.h" -#include "meshers/marching_cubes/marching_cubes_cell_data.h" -#include "meshers/marching_cubes/voxel_mesher_marching_cubes.h" +#include "world/block_terra_structure.h" +#include "world/terra_environment_data.h" +#include "world/terra_chunk.h" +#include "world/terra_structure.h" +#include "world/terra_world.h" -#include "world/block_voxel_structure.h" -#include "world/environment_data.h" -#include "world/voxel_chunk.h" -#include "world/voxel_structure.h" -#include "world/voxel_world.h" +#include "world/default/terra_chunk_default.h" +#include "world/default/terra_world_default.h" -#include "world/default/voxel_chunk_default.h" -#include "world/default/voxel_world_default.h" +#include "level_generator/terraman_level_generator.h" +#include "level_generator/terraman_level_generator_flat.h" -#include "level_generator/voxelman_level_generator.h" -#include "level_generator/voxelman_level_generator_flat.h" +#include "areas/terra_world_area.h" -#include "areas/world_area.h" +#include "world/terra_world_editor.h" -#include "world/voxel_world_editor.h" +#include "meshers/blocky/terra_mesher_blocky.h" +#include "meshers/blocky/terra_mesher_liquid_blocky.h" -#include "meshers/blocky/voxel_mesher_blocky.h" -#include "meshers/blocky/voxel_mesher_liquid_blocky.h" +#include "world/blocky/terra_chunk_blocky.h" +#include "world/blocky/terra_world_blocky.h" -#include "world/blocky/voxel_chunk_blocky.h" -#include "world/blocky/voxel_world_blocky.h" +#include "nodes/terraman_light.h" -#include "world/marching_cubes/voxel_chunk_marching_cubes.h" -#include "world/marching_cubes/voxel_world_marching_cubes.h" - -#include "nodes/voxelman_light.h" - -#include "world/jobs/voxel_job.h" -#include "world/jobs/voxel_light_job.h" -#include "world/jobs/voxel_prop_job.h" -#include "world/jobs/voxel_terrarin_job.h" +#include "world/jobs/terra_job.h" +#include "world/jobs/terra_light_job.h" +#include "world/jobs/terra_prop_job.h" +#include "world/jobs/terra_terrarin_job.h" void register_terraman_types() { ClassDB::register_class(); ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); ClassDB::register_class(); @@ -108,9 +99,6 @@ void register_terraman_types() { ClassDB::register_class(); ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); ClassDB::register_class(); diff --git a/world/block_voxel_structure.cpp b/world/block_terra_structure.cpp similarity index 99% rename from world/block_voxel_structure.cpp rename to world/block_terra_structure.cpp index 9c0ba90..904b895 100644 --- a/world/block_voxel_structure.cpp +++ b/world/block_terra_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_voxel_structure.h" +#include "block_terra_structure.h" int BlockTerraStructure::get_channel_type() const { return _channel_type; diff --git a/world/block_voxel_structure.h b/world/block_terra_structure.h similarity index 97% rename from world/block_voxel_structure.h rename to world/block_terra_structure.h index 1d12c37..516a114 100644 --- a/world/block_voxel_structure.h +++ b/world/block_terra_structure.h @@ -31,14 +31,14 @@ SOFTWARE. #include "core/vector.h" #endif -#include "voxel_structure.h" +#include "terra_structure.h" #include "../defines.h" #include pool_vector_h include_pool_vector -#include "voxel_chunk.h" +#include "terra_chunk.h" ; class BlockTerraStructure : public TerraStructure { diff --git a/world/blocky/voxel_chunk_blocky.cpp b/world/blocky/terra_chunk_blocky.cpp similarity index 98% rename from world/blocky/voxel_chunk_blocky.cpp rename to world/blocky/terra_chunk_blocky.cpp index 3e2b880..4235661 100644 --- a/world/blocky/voxel_chunk_blocky.cpp +++ b/world/blocky/terra_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 "voxel_chunk_blocky.h" +#include "terra_chunk_blocky.h" #include "../../defines.h" diff --git a/world/blocky/voxel_chunk_blocky.h b/world/blocky/terra_chunk_blocky.h similarity index 96% rename from world/blocky/voxel_chunk_blocky.h rename to world/blocky/terra_chunk_blocky.h index c3052cb..7c0b6b5 100644 --- a/world/blocky/voxel_chunk_blocky.h +++ b/world/blocky/terra_chunk_blocky.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_CHUNK_BLOCKY_H #define TERRA_CHUNK_BLOCKY_H -#include "../default/voxel_chunk_default.h" +#include "../default/terra_chunk_default.h" class TerraChunkBlocky : public TerraChunkDefault { GDCLASS(TerraChunkBlocky, TerraChunkDefault); diff --git a/world/blocky/voxel_world_blocky.cpp b/world/blocky/terra_world_blocky.cpp similarity index 86% rename from world/blocky/voxel_world_blocky.cpp rename to world/blocky/terra_world_blocky.cpp index 3c3580e..8019e23 100644 --- a/world/blocky/voxel_world_blocky.cpp +++ b/world/blocky/terra_world_blocky.cpp @@ -20,15 +20,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_world_blocky.h" +#include "terra_world_blocky.h" -#include "voxel_chunk_blocky.h" +#include "terra_chunk_blocky.h" -#include "../../meshers/blocky/voxel_mesher_blocky.h" -#include "../../meshers/blocky/voxel_mesher_liquid_blocky.h" -#include "../jobs/voxel_light_job.h" -#include "../jobs/voxel_prop_job.h" -#include "../jobs/voxel_terrarin_job.h" +#include "../../meshers/blocky/terra_mesher_blocky.h" +#include "../../meshers/blocky/terra_mesher_liquid_blocky.h" +#include "../jobs/terra_light_job.h" +#include "../jobs/terra_prop_job.h" +#include "../jobs/terra_terrarin_job.h" Ref TerraWorldBlocky::_create_chunk(int x, int y, int z, Ref chunk) { diff --git a/world/blocky/voxel_world_blocky.h b/world/blocky/terra_world_blocky.h similarity index 96% rename from world/blocky/voxel_world_blocky.h rename to world/blocky/terra_world_blocky.h index 3d48b1d..e321741 100644 --- a/world/blocky/voxel_world_blocky.h +++ b/world/blocky/terra_world_blocky.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_WORLD_BLOCKY_H #define TERRA_WORLD_BLOCKY_H -#include "../default/voxel_world_default.h" +#include "../default/terra_world_default.h" class TerraWorldBlocky : public TerraWorldDefault { GDCLASS(TerraWorldBlocky, TerraWorldDefault); diff --git a/world/default/voxel_chunk_default.cpp b/world/default/terra_chunk_default.cpp similarity index 99% rename from world/default/voxel_chunk_default.cpp rename to world/default/terra_chunk_default.cpp index c190c7d..8d98584 100644 --- a/world/default/voxel_chunk_default.cpp +++ b/world/default/terra_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 "voxel_chunk_default.h" +#include "terra_chunk_default.h" #include "../../defines.h" @@ -28,16 +28,16 @@ SOFTWARE. #include physics_server_h #include "../../../opensimplex/open_simplex_noise.h" -#include "../../meshers/default/voxel_mesher_default.h" -#include "../voxel_world.h" +#include "../../meshers/default/terra_mesher_default.h" +#include "../terra_world.h" -#include "../jobs/voxel_job.h" +#include "../jobs/terra_job.h" -#include "voxel_world_default.h" +#include "terra_world_default.h" -#include "../jobs/voxel_light_job.h" -#include "../jobs/voxel_prop_job.h" -#include "../jobs/voxel_terrarin_job.h" +#include "../jobs/terra_light_job.h" +#include "../jobs/terra_prop_job.h" +#include "../jobs/terra_terrarin_job.h" const String TerraChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods"; diff --git a/world/default/voxel_chunk_default.h b/world/default/terra_chunk_default.h similarity index 96% rename from world/default/voxel_chunk_default.h rename to world/default/terra_chunk_default.h index bfa1457..64af19b 100644 --- a/world/default/voxel_chunk_default.h +++ b/world/default/terra_chunk_default.h @@ -36,7 +36,7 @@ SOFTWARE. #endif -#include "../voxel_chunk.h" +#include "../terra_chunk.h" #include "../../defines.h" @@ -45,11 +45,11 @@ SOFTWARE. #include "core/os/thread_safe.h" #include "scene/resources/packed_scene.h" -#include "../voxel_world.h" -#include "../../data/voxel_light.h" -#include "../../meshers/voxel_mesher.h" -#include "../../library/voxel_surface.h" -#include "../../library/voxelman_library.h" +#include "../terra_world.h" +#include "../../data/terra_light.h" +#include "../../meshers/terra_mesher.h" +#include "../../library/terra_surface.h" +#include "../../library/terraman_library.h" class TerraWorld; class TerraJob; diff --git a/world/default/voxel_world_default.cpp b/world/default/terra_world_default.cpp similarity index 97% rename from world/default/voxel_world_default.cpp rename to world/default/terra_world_default.cpp index 994a4a2..ee8e21f 100644 --- a/world/default/voxel_world_default.cpp +++ b/world/default/terra_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 "voxel_world_default.h" +#include "terra_world_default.h" -#include "voxel_chunk_default.h" +#include "terra_chunk_default.h" #include "../../defines.h" -#include "../../meshers/default/voxel_mesher_default.h" -#include "../jobs/voxel_light_job.h" -#include "../jobs/voxel_prop_job.h" -#include "../jobs/voxel_terrarin_job.h" +#include "../../meshers/default/terra_mesher_default.h" +#include "../jobs/terra_light_job.h" +#include "../jobs/terra_prop_job.h" +#include "../jobs/terra_terrarin_job.h" _FORCE_INLINE_ int TerraWorldDefault::get_build_flags() const { return _build_flags; diff --git a/world/default/voxel_world_default.h b/world/default/terra_world_default.h similarity index 98% rename from world/default/voxel_world_default.h rename to world/default/terra_world_default.h index cee47e7..526f646 100644 --- a/world/default/voxel_world_default.h +++ b/world/default/terra_world_default.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_WORLD_DEFAULT_H #define TERRA_WORLD_DEFAULT_H -#include "../voxel_world.h" +#include "../terra_world.h" class TerraWorldDefault : public TerraWorld { GDCLASS(TerraWorldDefault, TerraWorld); diff --git a/world/jobs/voxel_job.cpp b/world/jobs/terra_job.cpp similarity index 99% rename from world/jobs/voxel_job.cpp rename to world/jobs/terra_job.cpp index 57c4730..d679ff4 100644 --- a/world/jobs/voxel_job.cpp +++ b/world/jobs/terra_job.cpp @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_job.h" +#include "terra_job.h" -#include "../default/voxel_chunk_default.h" +#include "../default/terra_chunk_default.h" #include "../../../opensimplex/open_simplex_noise.h" diff --git a/world/jobs/voxel_job.h b/world/jobs/terra_job.h similarity index 100% rename from world/jobs/voxel_job.h rename to world/jobs/terra_job.h diff --git a/world/jobs/voxel_light_job.cpp b/world/jobs/terra_light_job.cpp similarity index 92% rename from world/jobs/voxel_light_job.cpp rename to world/jobs/terra_light_job.cpp index 6ffc0df..ea15d4f 100644 --- a/world/jobs/voxel_light_job.cpp +++ b/world/jobs/terra_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 "voxel_light_job.h" +#include "terra_light_job.h" #include "../../defines.h" -#include "../../library/voxel_surface.h" -#include "../../library/voxelman_library.h" +#include "../../library/terra_surface.h" +#include "../../library/terraman_library.h" -#include "../../meshers/voxel_mesher.h" -#include "../default/voxel_chunk_default.h" +#include "../../meshers/terra_mesher.h" +#include "../default/terra_chunk_default.h" void TerraLightJob::phase_light() { Ref chunk = _chunk; diff --git a/world/jobs/voxel_light_job.h b/world/jobs/terra_light_job.h similarity index 98% rename from world/jobs/voxel_light_job.h rename to world/jobs/terra_light_job.h index 455df17..d26c42d 100644 --- a/world/jobs/voxel_light_job.h +++ b/world/jobs/terra_light_job.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_LIGHT_JOB_H #define TERRA_LIGHT_JOB_H -#include "voxel_job.h" +#include "terra_job.h" class TerraMesher; diff --git a/world/jobs/voxel_prop_job.cpp b/world/jobs/terra_prop_job.cpp similarity index 97% rename from world/jobs/voxel_prop_job.cpp rename to world/jobs/terra_prop_job.cpp index 0c3e75b..6007d6f 100644 --- a/world/jobs/voxel_prop_job.cpp +++ b/world/jobs/terra_prop_job.cpp @@ -20,21 +20,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_prop_job.h" +#include "terra_prop_job.h" #include "../../defines.h" -#include "../../library/voxel_surface.h" -#include "../../library/voxelman_library.h" +#include "../../library/terra_surface.h" +#include "../../library/terraman_library.h" -#include "../../meshers/voxel_mesher.h" -#include "../default/voxel_chunk_default.h" +#include "../../meshers/terra_mesher.h" +#include "../default/terra_chunk_default.h" #ifdef MESH_DATA_RESOURCE_PRESENT #include "../../../mesh_data_resource/mesh_data_resource.h" #endif -#include "../../world/default/voxel_world_default.h" +#include "../../world/default/terra_world_default.h" #ifdef MESH_UTILS_PRESENT #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" diff --git a/world/jobs/voxel_prop_job.h b/world/jobs/terra_prop_job.h similarity index 98% rename from world/jobs/voxel_prop_job.h rename to world/jobs/terra_prop_job.h index 32995ff..fe8fa87 100644 --- a/world/jobs/voxel_prop_job.h +++ b/world/jobs/terra_prop_job.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_PROP_JOB_H #define TERRA_PROP_JOB_H -#include "voxel_job.h" +#include "terra_job.h" class TerraMesher; diff --git a/world/jobs/voxel_terrarin_job.cpp b/world/jobs/terra_terrarin_job.cpp similarity index 98% rename from world/jobs/voxel_terrarin_job.cpp rename to world/jobs/terra_terrarin_job.cpp index 0eeb553..84badde 100644 --- a/world/jobs/voxel_terrarin_job.cpp +++ b/world/jobs/terra_terrarin_job.cpp @@ -20,15 +20,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_terrarin_job.h" +#include "terra_terrarin_job.h" -#include "../../library/voxel_surface.h" -#include "../../library/voxelman_library.h" +#include "../../library/terra_surface.h" +#include "../../library/terraman_library.h" -#include "../../meshers/default/voxel_mesher_default.h" -#include "../../meshers/voxel_mesher.h" +#include "../../meshers/default/terra_mesher_default.h" +#include "../../meshers/terra_mesher.h" -#include "../default/voxel_chunk_default.h" +#include "../default/terra_chunk_default.h" #ifdef MESH_UTILS_PRESENT #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" diff --git a/world/jobs/voxel_terrarin_job.h b/world/jobs/terra_terrarin_job.h similarity index 99% rename from world/jobs/voxel_terrarin_job.h rename to world/jobs/terra_terrarin_job.h index 19f9ff6..d4ec893 100644 --- a/world/jobs/voxel_terrarin_job.h +++ b/world/jobs/terra_terrarin_job.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef TERRA_TERRARIN_JOB_H #define TERRA_TERRARIN_JOB_H -#include "voxel_job.h" +#include "terra_job.h" #include "../../defines.h" diff --git a/world/voxel_chunk.cpp b/world/terra_chunk.cpp similarity index 99% rename from world/voxel_chunk.cpp rename to world/terra_chunk.cpp index 27b3ad6..80b3b18 100644 --- a/world/voxel_chunk.cpp +++ b/world/terra_chunk.cpp @@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_chunk.h" +#include "terra_chunk.h" -#include "voxel_world.h" +#include "terra_world.h" #include "../thirdparty/lz4/lz4.h" #include "../defines.h" -#include "jobs/voxel_job.h" -#include "voxel_structure.h" +#include "jobs/terra_job.h" +#include "terra_structure.h" #if THREAD_POOL_PRESENT #include "../../thread_pool/thread_pool.h" diff --git a/world/voxel_chunk.h b/world/terra_chunk.h similarity index 98% rename from world/voxel_chunk.h rename to world/terra_chunk.h index 5403334..f58c448 100644 --- a/world/voxel_chunk.h +++ b/world/terra_chunk.h @@ -48,11 +48,11 @@ include_pool_vector #include "scene/resources/packed_scene.h" -#include "voxel_world.h" +#include "terra_world.h" -#include "../data/voxel_light.h" +#include "../data/terra_light.h" -#include "../meshers/voxel_mesher.h" +#include "../meshers/terra_mesher.h" #if PROPS_PRESENT #include "../../props/props/prop_data.h" @@ -64,8 +64,8 @@ include_pool_vector #define Texture Texture2D #endif -#include "../library/voxel_surface.h" -#include "../library/voxelman_library.h" +#include "../library/terra_surface.h" +#include "../library/terraman_library.h" ; //hackfix for a clang format issue class TerraJob; diff --git a/world/environment_data.cpp b/world/terra_environment_data.cpp similarity index 99% rename from world/environment_data.cpp rename to world/terra_environment_data.cpp index 43a81e3..5d112e1 100644 --- a/world/environment_data.cpp +++ b/world/terra_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 "environment_data.h" +#include "terra_environment_data.h" Ref EnvironmentData::get_environment() { return _environment; diff --git a/world/environment_data.h b/world/terra_environment_data.h similarity index 100% rename from world/environment_data.h rename to world/terra_environment_data.h diff --git a/world/voxel_structure.cpp b/world/terra_structure.cpp similarity index 99% rename from world/voxel_structure.cpp rename to world/terra_structure.cpp index 41b091e..302790d 100644 --- a/world/voxel_structure.cpp +++ b/world/terra_structure.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_structure.h" +#include "terra_structure.h" bool TerraStructure::get_use_aabb() const { return _use_aabb; diff --git a/world/voxel_structure.h b/world/terra_structure.h similarity index 98% rename from world/voxel_structure.h rename to world/terra_structure.h index 267321a..694f3cc 100644 --- a/world/voxel_structure.h +++ b/world/terra_structure.h @@ -39,7 +39,7 @@ SOFTWARE. include_pool_vector #include "core/math/aabb.h" -#include "voxel_chunk.h" +#include "terra_chunk.h" class TerraStructure : public Resource { GDCLASS(TerraStructure, Resource); diff --git a/world/voxel_world.cpp b/world/terra_world.cpp similarity index 99% rename from world/voxel_world.cpp rename to world/terra_world.cpp index 234c251..13aa073 100644 --- a/world/voxel_world.cpp +++ b/world/terra_world.cpp @@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "voxel_world.h" +#include "terra_world.h" #include "core/version.h" -#include "voxel_chunk.h" -#include "voxel_structure.h" +#include "terra_chunk.h" +#include "terra_structure.h" #include "../defines.h" diff --git a/world/voxel_world.h b/world/terra_world.h similarity index 98% rename from world/voxel_world.h rename to world/terra_world.h index a003fdc..fa280b2 100644 --- a/world/voxel_world.h +++ b/world/terra_world.h @@ -37,9 +37,9 @@ SOFTWARE. #include navigation_h -#include "../areas/world_area.h" -#include "../level_generator/voxelman_level_generator.h" -#include "../library/voxelman_library.h" +#include "../areas/terra_world_area.h" +#include "../level_generator/terraman_level_generator.h" +#include "../library/terraman_library.h" #include "core/os/os.h" diff --git a/world/voxel_world_editor.cpp b/world/terra_world_editor.cpp similarity index 98% rename from world/voxel_world_editor.cpp rename to world/terra_world_editor.cpp index bcf8b12..3891cf0 100644 --- a/world/voxel_world_editor.cpp +++ b/world/terra_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 "voxel_world_editor.h" +#include "terra_world_editor.h" #include "core/version.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "voxel_world.h" +#include "terra_world.h" #include "core/os/keyboard.h" -#include "voxel_chunk.h" +#include "terra_chunk.h" -#include "../library/voxel_surface.h" -#include "../library/voxelman_library.h" +#include "../library/terra_surface.h" +#include "../library/terraman_library.h" #include "../defines.h" diff --git a/world/voxel_world_editor.h b/world/terra_world_editor.h similarity index 100% rename from world/voxel_world_editor.h rename to world/terra_world_editor.h