Relintai/terraman
1
0
Fork 0
mirror of https://github.com/Relintai/terraman.git synced 2025-04-23 21:43:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed every file prefix from voxelman to terra.

Browse Source
This commit is contained in:
Relintai 2021-04-16 12:56:21 +02:00
parent 9bbb56d728
commit 603581f6e0
60 changed files with 176 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
SCsub
View File

@ -25,52 +25,52 @@ sources = [
"register_types.cpp", "register_types.cpp",
"library/voxelman_library.cpp", "library/terraman_library.cpp",
"library/voxelman_library_simple.cpp", "library/terraman_library_simple.cpp",
"nodes/voxelman_light.cpp", "nodes/terraman_light.cpp",
"library/voxel_surface.cpp", "library/terra_surface.cpp",
"library/voxel_surface_simple.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/terra_mesher_blocky.cpp",
"meshers/blocky/voxel_mesher_liquid_blocky.cpp", "meshers/blocky/terra_mesher_liquid_blocky.cpp",
"meshers/default/voxel_mesher_default.cpp", "meshers/default/terra_mesher_default.cpp",
"world/voxel_world.cpp", "world/terra_world.cpp",
"world/voxel_chunk.cpp", "world/terra_chunk.cpp",
"world/voxel_structure.cpp", "world/terra_structure.cpp",
"world/block_voxel_structure.cpp", "world/block_terra_structure.cpp",
"world/environment_data.cpp", "world/terra_environment_data.cpp",
"world/blocky/voxel_chunk_blocky.cpp", "world/blocky/terra_chunk_blocky.cpp",
"world/blocky/voxel_world_blocky.cpp", "world/blocky/terra_world_blocky.cpp",
"world/default/voxel_world_default.cpp", "world/default/terra_world_default.cpp",
"world/default/voxel_chunk_default.cpp", "world/default/terra_chunk_default.cpp",
"level_generator/voxelman_level_generator.cpp", "level_generator/terraman_level_generator.cpp",
"level_generator/voxelman_level_generator_flat.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", "thirdparty/lz4/lz4.c",
"world/jobs/voxel_job.cpp", "world/jobs/terra_job.cpp",
"world/jobs/voxel_terrarin_job.cpp", "world/jobs/terra_terrarin_job.cpp",
"world/jobs/voxel_light_job.cpp", "world/jobs/terra_light_job.cpp",
"world/jobs/voxel_prop_job.cpp", "world/jobs/terra_prop_job.cpp",
] ]
if has_texture_packer: if has_texture_packer:
sources.append("library/voxelman_library_merger.cpp") sources.append("library/terraman_library_merger.cpp")
sources.append("library/voxel_surface_merger.cpp") sources.append("library/terra_surface_merger.cpp")
if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes': if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
# Shared lib compilation # Shared lib compilation

2
areas/world_area.cpp → areas/terra_world_area.cpp
View File

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

0
areas/world_area.h → areas/terra_world_area.h
View File

2
data/voxel_light.cpp → data/terra_light.cpp
View File

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

0
data/voxel_light.h → data/terra_light.h
View File

4
level_generator/voxelman_level_generator.cpp → level_generator/terraman_level_generator.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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<TerraChunk> chunk) { void TerramanLevelGenerator::generate_chunk(Ref<TerraChunk> chunk) {
if (has_method("_generate_chunk")) { if (has_method("_generate_chunk")) {

0
level_generator/voxelman_level_generator.h → level_generator/terraman_level_generator.h
View File

4
level_generator/voxelman_level_generator_flat.cpp → level_generator/terraman_level_generator_flat.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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 { int TerramanLevelGeneratorFlat::get_floor_position() const {
return _floor_position; return _floor_position;

2
level_generator/voxelman_level_generator_flat.h → level_generator/terraman_level_generator_flat.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRAMAN_LEVEL_GENERATOR_FLAT_H #ifndef TERRAMAN_LEVEL_GENERATOR_FLAT_H
#define TERRAMAN_LEVEL_GENERATOR_FLAT_H #define TERRAMAN_LEVEL_GENERATOR_FLAT_H
#include "voxelman_level_generator.h" #include "terraman_level_generator.h"
class TerraChunk; class TerraChunk;

2
library/voxel_surface.cpp → library/terra_surface.cpp
View File

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

2
library/voxel_surface.h → library/terra_surface.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#include "core/math/rect2.h" #include "core/math/rect2.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "voxelman_library.h" #include "terraman_library.h"
class TerramanLibrary; class TerramanLibrary;

4
library/voxel_surface_merger.cpp → library/terra_surface_merger.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_surface_merger.h" #include "terra_surface_merger.h"
#include "voxelman_library_merger.h" #include "terraman_library_merger.h"
#include "../defines.h" #include "../defines.h"

2
library/voxel_surface_merger.h → library/terra_surface_merger.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_SURFACE_MERGER_H #ifndef TERRA_SURFACE_MERGER_H
#define TERRA_SURFACE_MERGER_H #define TERRA_SURFACE_MERGER_H
#include "voxel_surface.h" #include "terra_surface.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"

4
library/voxel_surface_simple.cpp → library/terra_surface_simple.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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 TerraSurfaceSimple::get_atlas_x(const TerraSurfaceSides side) const {
int indx = (side * 2); int indx = (side * 2);

2
library/voxel_surface_simple.h → library/terra_surface_simple.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_SURFACE_SIMPLE_H #ifndef TERRA_SURFACE_SIMPLE_H
#define TERRA_SURFACE_SIMPLE_H #define TERRA_SURFACE_SIMPLE_H
#include "voxel_surface.h" #include "terra_surface.h"
class TerraSurfaceSimple : public TerraSurface { class TerraSurfaceSimple : public TerraSurface {
GDCLASS(TerraSurfaceSimple, TerraSurface) GDCLASS(TerraSurfaceSimple, TerraSurface)

2
library/voxelman_library.cpp → library/terraman_library.cpp
View File

@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxelman_library.h" #include "terraman_library.h"
#ifdef PROPS_PRESENT #ifdef PROPS_PRESENT
#include "../../props/props/prop_data.h" #include "../../props/props/prop_data.h"

4
library/voxelman_library.h → library/terraman_library.h
View File

@ -34,8 +34,8 @@ SOFTWARE.
#include "core/math/rect2.h" #include "core/math/rect2.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "../data/voxel_light.h" #include "../data/terra_light.h"
#include "voxel_surface.h" #include "terra_surface.h"
#include "../defines.h" #include "../defines.h"

2
library/voxelman_library_merger.cpp → library/terraman_library_merger.cpp
View File

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

6
library/voxelman_library_merger.h → library/terraman_library_merger.h
View File

@ -33,12 +33,12 @@ SOFTWARE.
#include "core/map.h" #include "core/map.h"
#endif #endif
#include "voxelman_library.h" #include "terraman_library.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "../data/voxel_light.h" #include "../data/terra_light.h"
#include "voxel_surface_merger.h" #include "terra_surface_merger.h"
class TerraSurfaceSimple; class TerraSurfaceSimple;
class TerraMesher; class TerraMesher;

2
library/voxelman_library_simple.cpp → library/terraman_library_simple.cpp
View File

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

6
library/voxelman_library_simple.h → library/terraman_library_simple.h
View File

@ -31,12 +31,12 @@ SOFTWARE.
#include "core/resource.h" #include "core/resource.h"
#endif #endif
#include "voxelman_library.h" #include "terraman_library.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "../data/voxel_light.h" #include "../data/terra_light.h"
#include "voxel_surface_simple.h" #include "terra_surface_simple.h"
class TerraSurfaceSimple; class TerraSurfaceSimple;
class TerraMesher; class TerraMesher;

4
meshers/blocky/voxel_mesher_blocky.cpp → meshers/blocky/terra_mesher_blocky.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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 { bool TerraMesherBlocky::get_always_add_colors() const {
return _always_add_colors; return _always_add_colors;

2
meshers/blocky/voxel_mesher_blocky.h → meshers/blocky/terra_mesher_blocky.h
View File

@ -34,7 +34,7 @@ SOFTWARE.
#include "core/math/vector2.h" #include "core/math/vector2.h"
#include "core/math/vector3.h" #include "core/math/vector3.h"
#include "../default/voxel_mesher_default.h" #include "../default/terra_mesher_default.h"
class TerraMesherBlocky : public TerraMesherDefault { class TerraMesherBlocky : public TerraMesherDefault {
GDCLASS(TerraMesherBlocky, TerraMesherDefault); GDCLASS(TerraMesherBlocky, TerraMesherDefault);

4
meshers/blocky/voxel_mesher_liquid_blocky.cpp → meshers/blocky/terra_mesher_liquid_blocky.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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<TerraChunk> p_chunk) { void TerraMesherLiquidBlocky::_add_chunk(Ref<TerraChunk> p_chunk) {
Ref<TerraChunkDefault> chunk = p_chunk; Ref<TerraChunkDefault> chunk = p_chunk;

2
meshers/blocky/voxel_mesher_liquid_blocky.h → meshers/blocky/terra_mesher_liquid_blocky.h
View File

@ -34,7 +34,7 @@ SOFTWARE.
#include "core/math/vector2.h" #include "core/math/vector2.h"
#include "core/math/vector3.h" #include "core/math/vector3.h"
#include "../default/voxel_mesher_default.h" #include "../default/terra_mesher_default.h"
class TerraMesherLiquidBlocky : public TerraMesherDefault { class TerraMesherLiquidBlocky : public TerraMesherDefault {
GDCLASS(TerraMesherLiquidBlocky, TerraMesherDefault); GDCLASS(TerraMesherLiquidBlocky, TerraMesherDefault);

4
meshers/default/voxel_mesher_default.cpp → meshers/default/terra_mesher_default.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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" #include "../../defines.h"

2
meshers/default/voxel_mesher_default.h → meshers/default/terra_mesher_default.h
View File

@ -34,7 +34,7 @@ SOFTWARE.
#include "core/math/vector2.h" #include "core/math/vector2.h"
#include "core/math/vector3.h" #include "core/math/vector3.h"
#include "../voxel_mesher.h" #include "../terra_mesher.h"
class TerraMesherDefault : public TerraMesher { class TerraMesherDefault : public TerraMesher {
GDCLASS(TerraMesherDefault, TerraMesher); GDCLASS(TerraMesherDefault, TerraMesher);

6
meshers/voxel_mesher.cpp → meshers/terra_mesher.cpp
View File

@ -20,14 +20,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_mesher.h" #include "terra_mesher.h"
#include "../defines.h" #include "../defines.h"
#include mesh_instance_h #include mesh_instance_h
#include "../world/default/voxel_chunk_default.h" #include "../world/default/terra_chunk_default.h"
#include "../world/voxel_chunk.h" #include "../world/terra_chunk.h"
bool TerraMesher::Vertex::operator==(const Vertex &p_vertex) const { bool TerraMesher::Vertex::operator==(const Vertex &p_vertex) const {

2
meshers/voxel_mesher.h → meshers/terra_mesher.h
View File

@ -53,7 +53,7 @@ include_pool_vector
#include "../../mesh_data_resource/mesh_data_resource.h" #include "../../mesh_data_resource/mesh_data_resource.h"
#endif #endif
#include "../library/voxelman_library.h" #include "../library/terraman_library.h"
class TerramanLibrary; class TerramanLibrary;
class TerraChunk; class TerraChunk;

2
nodes/voxelman_light.cpp → nodes/terraman_light.cpp
View File

@ -1,4 +1,4 @@
#include "voxelman_light.h" #include "terraman_light.h"
TerramanLight::TerramanLight() { TerramanLight::TerramanLight() {
} }

0
nodes/voxelman_light.h → nodes/terraman_light.h
View File

68
register_types.cpp
View File

@ -23,63 +23,54 @@ SOFTWARE.
#include "register_types.h" #include "register_types.h"
#include "library/voxel_surface.h" #include "library/terra_surface.h"
#include "library/voxel_surface_simple.h" #include "library/terra_surface_simple.h"
#include "library/voxelman_library.h" #include "library/terraman_library.h"
#include "library/voxelman_library_simple.h" #include "library/terraman_library_simple.h"
#ifdef TEXTURE_PACKER_PRESENT #ifdef TEXTURE_PACKER_PRESENT
#include "library/voxel_surface_merger.h" #include "library/terra_surface_merger.h"
#include "library/voxelman_library_merger.h" #include "library/terraman_library_merger.h"
#endif #endif
#include "data/voxel_light.h" #include "data/terra_light.h"
#include "meshers/voxel_mesher.h" #include "meshers/terra_mesher.h"
#include "meshers/marching_cubes/marching_cubes_cell_data.h" #include "world/block_terra_structure.h"
#include "meshers/marching_cubes/voxel_mesher_marching_cubes.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/default/terra_chunk_default.h"
#include "world/environment_data.h" #include "world/default/terra_world_default.h"
#include "world/voxel_chunk.h"
#include "world/voxel_structure.h"
#include "world/voxel_world.h"
#include "world/default/voxel_chunk_default.h" #include "level_generator/terraman_level_generator.h"
#include "world/default/voxel_world_default.h" #include "level_generator/terraman_level_generator_flat.h"
#include "level_generator/voxelman_level_generator.h" #include "areas/terra_world_area.h"
#include "level_generator/voxelman_level_generator_flat.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 "world/blocky/terra_chunk_blocky.h"
#include "meshers/blocky/voxel_mesher_liquid_blocky.h" #include "world/blocky/terra_world_blocky.h"
#include "world/blocky/voxel_chunk_blocky.h" #include "nodes/terraman_light.h"
#include "world/blocky/voxel_world_blocky.h"
#include "world/marching_cubes/voxel_chunk_marching_cubes.h" #include "world/jobs/terra_job.h"
#include "world/marching_cubes/voxel_world_marching_cubes.h" #include "world/jobs/terra_light_job.h"
#include "world/jobs/terra_prop_job.h"
#include "nodes/voxelman_light.h" #include "world/jobs/terra_terrarin_job.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"
void register_terraman_types() { void register_terraman_types() {
ClassDB::register_class<TerraMesher>(); ClassDB::register_class<TerraMesher>();
ClassDB::register_class<TerraMesherDefault>(); ClassDB::register_class<TerraMesherDefault>();
ClassDB::register_class<TerraMesherMarchingCubes>();
ClassDB::register_class<MarchingCubesCellData>();
ClassDB::register_class<TerraSurface>(); ClassDB::register_class<TerraSurface>();
ClassDB::register_class<TerraSurfaceSimple>(); ClassDB::register_class<TerraSurfaceSimple>();
@ -108,9 +99,6 @@ void register_terraman_types() {
ClassDB::register_class<TerraChunkBlocky>(); ClassDB::register_class<TerraChunkBlocky>();
ClassDB::register_class<TerraMesherLiquidBlocky>(); ClassDB::register_class<TerraMesherLiquidBlocky>();
ClassDB::register_class<TerraWorldMarchingCubes>();
ClassDB::register_class<TerraChunkMarchingCubes>();
ClassDB::register_class<TerramanLevelGenerator>(); ClassDB::register_class<TerramanLevelGenerator>();
ClassDB::register_class<TerramanLevelGeneratorFlat>(); ClassDB::register_class<TerramanLevelGeneratorFlat>();

2
world/block_voxel_structure.cpp → world/block_terra_structure.cpp
View File

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

4
world/block_voxel_structure.h → world/block_terra_structure.h
View File

@ -31,14 +31,14 @@ SOFTWARE.
#include "core/vector.h" #include "core/vector.h"
#endif #endif
#include "voxel_structure.h" #include "terra_structure.h"
#include "../defines.h" #include "../defines.h"
#include pool_vector_h #include pool_vector_h
include_pool_vector include_pool_vector
#include "voxel_chunk.h" #include "terra_chunk.h"
; ;
class BlockTerraStructure : public TerraStructure { class BlockTerraStructure : public TerraStructure {

2
world/blocky/voxel_chunk_blocky.cpp → world/blocky/terra_chunk_blocky.cpp
View File

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

2
world/blocky/voxel_chunk_blocky.h → world/blocky/terra_chunk_blocky.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_CHUNK_BLOCKY_H #ifndef TERRA_CHUNK_BLOCKY_H
#define 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 { class TerraChunkBlocky : public TerraChunkDefault {
GDCLASS(TerraChunkBlocky, TerraChunkDefault); GDCLASS(TerraChunkBlocky, TerraChunkDefault);

14
world/blocky/voxel_world_blocky.cpp → world/blocky/terra_world_blocky.cpp
View File

@ -20,15 +20,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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/terra_mesher_blocky.h"
#include "../../meshers/blocky/voxel_mesher_liquid_blocky.h" #include "../../meshers/blocky/terra_mesher_liquid_blocky.h"
#include "../jobs/voxel_light_job.h" #include "../jobs/terra_light_job.h"
#include "../jobs/voxel_prop_job.h" #include "../jobs/terra_prop_job.h"
#include "../jobs/voxel_terrarin_job.h" #include "../jobs/terra_terrarin_job.h"
Ref<TerraChunk> TerraWorldBlocky::_create_chunk(int x, int y, int z, Ref<TerraChunk> chunk) { Ref<TerraChunk> TerraWorldBlocky::_create_chunk(int x, int y, int z, Ref<TerraChunk> chunk) {

2
world/blocky/voxel_world_blocky.h → world/blocky/terra_world_blocky.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_WORLD_BLOCKY_H #ifndef TERRA_WORLD_BLOCKY_H
#define 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 { class TerraWorldBlocky : public TerraWorldDefault {
GDCLASS(TerraWorldBlocky, TerraWorldDefault); GDCLASS(TerraWorldBlocky, TerraWorldDefault);

16
world/default/voxel_chunk_default.cpp → world/default/terra_chunk_default.cpp
View File

@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_chunk_default.h" #include "terra_chunk_default.h"
#include "../../defines.h" #include "../../defines.h"
@ -28,16 +28,16 @@ SOFTWARE.
#include physics_server_h #include physics_server_h
#include "../../../opensimplex/open_simplex_noise.h" #include "../../../opensimplex/open_simplex_noise.h"
#include "../../meshers/default/voxel_mesher_default.h" #include "../../meshers/default/terra_mesher_default.h"
#include "../voxel_world.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/terra_light_job.h"
#include "../jobs/voxel_prop_job.h" #include "../jobs/terra_prop_job.h"
#include "../jobs/voxel_terrarin_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"; 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";

12
world/default/voxel_chunk_default.h → world/default/terra_chunk_default.h
View File

@ -36,7 +36,7 @@ SOFTWARE.
#endif #endif
#include "../voxel_chunk.h" #include "../terra_chunk.h"
#include "../../defines.h" #include "../../defines.h"
@ -45,11 +45,11 @@ SOFTWARE.
#include "core/os/thread_safe.h" #include "core/os/thread_safe.h"
#include "scene/resources/packed_scene.h" #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"
#include "../../library/voxel_surface.h" #include "../../library/terra_surface.h"
#include "../../library/voxelman_library.h" #include "../../library/terraman_library.h"
class TerraWorld; class TerraWorld;
class TerraJob; class TerraJob;

12
world/default/voxel_world_default.cpp → world/default/terra_world_default.cpp
View File

@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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 "../../defines.h"
#include "../../meshers/default/voxel_mesher_default.h" #include "../../meshers/default/terra_mesher_default.h"
#include "../jobs/voxel_light_job.h" #include "../jobs/terra_light_job.h"
#include "../jobs/voxel_prop_job.h" #include "../jobs/terra_prop_job.h"
#include "../jobs/voxel_terrarin_job.h" #include "../jobs/terra_terrarin_job.h"
_FORCE_INLINE_ int TerraWorldDefault::get_build_flags() const { _FORCE_INLINE_ int TerraWorldDefault::get_build_flags() const {
return _build_flags; return _build_flags;

2
world/default/voxel_world_default.h → world/default/terra_world_default.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_WORLD_DEFAULT_H #ifndef TERRA_WORLD_DEFAULT_H
#define TERRA_WORLD_DEFAULT_H #define TERRA_WORLD_DEFAULT_H
#include "../voxel_world.h" #include "../terra_world.h"
class TerraWorldDefault : public TerraWorld { class TerraWorldDefault : public TerraWorld {
GDCLASS(TerraWorldDefault, TerraWorld); GDCLASS(TerraWorldDefault, TerraWorld);

4
world/jobs/voxel_job.cpp → world/jobs/terra_job.cpp
View File

@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. 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" #include "../../../opensimplex/open_simplex_noise.h"

0
world/jobs/voxel_job.h → world/jobs/terra_job.h
View File

10
world/jobs/voxel_light_job.cpp → world/jobs/terra_light_job.cpp
View File

@ -20,15 +20,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_light_job.h" #include "terra_light_job.h"
#include "../../defines.h" #include "../../defines.h"
#include "../../library/voxel_surface.h" #include "../../library/terra_surface.h"
#include "../../library/voxelman_library.h" #include "../../library/terraman_library.h"
#include "../../meshers/voxel_mesher.h" #include "../../meshers/terra_mesher.h"
#include "../default/voxel_chunk_default.h" #include "../default/terra_chunk_default.h"
void TerraLightJob::phase_light() { void TerraLightJob::phase_light() {
Ref<TerraChunkDefault> chunk = _chunk; Ref<TerraChunkDefault> chunk = _chunk;

2
world/jobs/voxel_light_job.h → world/jobs/terra_light_job.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_LIGHT_JOB_H #ifndef TERRA_LIGHT_JOB_H
#define TERRA_LIGHT_JOB_H #define TERRA_LIGHT_JOB_H
#include "voxel_job.h" #include "terra_job.h"
class TerraMesher; class TerraMesher;

12
world/jobs/voxel_prop_job.cpp → world/jobs/terra_prop_job.cpp
View File

@ -20,21 +20,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_prop_job.h" #include "terra_prop_job.h"
#include "../../defines.h" #include "../../defines.h"
#include "../../library/voxel_surface.h" #include "../../library/terra_surface.h"
#include "../../library/voxelman_library.h" #include "../../library/terraman_library.h"
#include "../../meshers/voxel_mesher.h" #include "../../meshers/terra_mesher.h"
#include "../default/voxel_chunk_default.h" #include "../default/terra_chunk_default.h"
#ifdef MESH_DATA_RESOURCE_PRESENT #ifdef MESH_DATA_RESOURCE_PRESENT
#include "../../../mesh_data_resource/mesh_data_resource.h" #include "../../../mesh_data_resource/mesh_data_resource.h"
#endif #endif
#include "../../world/default/voxel_world_default.h" #include "../../world/default/terra_world_default.h"
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
#include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"

2
world/jobs/voxel_prop_job.h → world/jobs/terra_prop_job.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_PROP_JOB_H #ifndef TERRA_PROP_JOB_H
#define TERRA_PROP_JOB_H #define TERRA_PROP_JOB_H
#include "voxel_job.h" #include "terra_job.h"
class TerraMesher; class TerraMesher;

12
world/jobs/voxel_terrarin_job.cpp → world/jobs/terra_terrarin_job.cpp
View File

@ -20,15 +20,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_terrarin_job.h" #include "terra_terrarin_job.h"
#include "../../library/voxel_surface.h" #include "../../library/terra_surface.h"
#include "../../library/voxelman_library.h" #include "../../library/terraman_library.h"
#include "../../meshers/default/voxel_mesher_default.h" #include "../../meshers/default/terra_mesher_default.h"
#include "../../meshers/voxel_mesher.h" #include "../../meshers/terra_mesher.h"
#include "../default/voxel_chunk_default.h" #include "../default/terra_chunk_default.h"
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
#include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"

2
world/jobs/voxel_terrarin_job.h → world/jobs/terra_terrarin_job.h
View File

@ -23,7 +23,7 @@ SOFTWARE.
#ifndef TERRA_TERRARIN_JOB_H #ifndef TERRA_TERRARIN_JOB_H
#define TERRA_TERRARIN_JOB_H #define TERRA_TERRARIN_JOB_H
#include "voxel_job.h" #include "terra_job.h"
#include "../../defines.h" #include "../../defines.h"

8
world/voxel_chunk.cpp → world/terra_chunk.cpp
View File

@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_chunk.h" #include "terra_chunk.h"
#include "voxel_world.h" #include "terra_world.h"
#include "../thirdparty/lz4/lz4.h" #include "../thirdparty/lz4/lz4.h"
#include "../defines.h" #include "../defines.h"
#include "jobs/voxel_job.h" #include "jobs/terra_job.h"
#include "voxel_structure.h" #include "terra_structure.h"
#if THREAD_POOL_PRESENT #if THREAD_POOL_PRESENT
#include "../../thread_pool/thread_pool.h" #include "../../thread_pool/thread_pool.h"

10
world/voxel_chunk.h → world/terra_chunk.h
View File

@ -48,11 +48,11 @@ include_pool_vector
#include "scene/resources/packed_scene.h" #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 #if PROPS_PRESENT
#include "../../props/props/prop_data.h" #include "../../props/props/prop_data.h"
@ -64,8 +64,8 @@ include_pool_vector
#define Texture Texture2D #define Texture Texture2D
#endif #endif
#include "../library/voxel_surface.h" #include "../library/terra_surface.h"
#include "../library/voxelman_library.h" #include "../library/terraman_library.h"
; //hackfix for a clang format issue ; //hackfix for a clang format issue
class TerraJob; class TerraJob;

2
world/environment_data.cpp → world/terra_environment_data.cpp
View File

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

0
world/environment_data.h → world/terra_environment_data.h
View File

2
world/voxel_structure.cpp → world/terra_structure.cpp
View File

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

2
world/voxel_structure.h → world/terra_structure.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
include_pool_vector include_pool_vector
#include "core/math/aabb.h" #include "core/math/aabb.h"
#include "voxel_chunk.h" #include "terra_chunk.h"
class TerraStructure : public Resource { class TerraStructure : public Resource {
GDCLASS(TerraStructure, Resource); GDCLASS(TerraStructure, Resource);

6
world/voxel_world.cpp → world/terra_world.cpp
View File

@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_world.h" #include "terra_world.h"
#include "core/version.h" #include "core/version.h"
#include "voxel_chunk.h" #include "terra_chunk.h"
#include "voxel_structure.h" #include "terra_structure.h"
#include "../defines.h" #include "../defines.h"

6
world/voxel_world.h → world/terra_world.h
View File

@ -37,9 +37,9 @@ SOFTWARE.
#include navigation_h #include navigation_h
#include "../areas/world_area.h" #include "../areas/terra_world_area.h"
#include "../level_generator/voxelman_level_generator.h" #include "../level_generator/terraman_level_generator.h"
#include "../library/voxelman_library.h" #include "../library/terraman_library.h"
#include "core/os/os.h" #include "core/os/os.h"

10
world/voxel_world_editor.cpp → world/terra_world_editor.cpp
View File

@ -20,21 +20,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "voxel_world_editor.h" #include "terra_world_editor.h"
#include "core/version.h" #include "core/version.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "voxel_world.h" #include "terra_world.h"
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "voxel_chunk.h" #include "terra_chunk.h"
#include "../library/voxel_surface.h" #include "../library/terra_surface.h"
#include "../library/voxelman_library.h" #include "../library/terraman_library.h"
#include "../defines.h" #include "../defines.h"

0
world/voxel_world_editor.h → world/terra_world_editor.h
View File