From 6c80da0425ea90fe990a4f8b42ffdacdfc5e770e Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Mon, 14 Sep 2020 19:33:02 +0100 Subject: [PATCH] Moved VoxelBuffer and VoxelMemoryPool under storage/ directory --- SCsub | 1 + edition/voxel_tool.cpp | 2 +- edition/voxel_tool_buffer.cpp | 2 +- generators/voxel_generator_heightmap.h | 2 +- meshers/blocky/voxel_mesher_blocky.cpp | 1 + meshers/cubes/voxel_mesher_cubes.cpp | 1 + meshers/dmc/hermite_value.h | 2 +- meshers/transvoxel/voxel_mesher_transvoxel.cpp | 1 + meshers/voxel_mesher.cpp | 1 + meshers/voxel_mesher.h | 3 ++- register_types.cpp | 4 ++-- server/voxel_thread_pool.h | 2 +- voxel_buffer.cpp => storage/voxel_buffer.cpp | 2 +- voxel_buffer.h => storage/voxel_buffer.h | 6 +++--- voxel_memory_pool.cpp => storage/voxel_memory_pool.cpp | 6 +++--- voxel_memory_pool.h => storage/voxel_memory_pool.h | 0 streams/vox_loader.cpp | 1 + streams/vox_loader.h | 4 +++- streams/voxel_block_request.h | 4 +--- streams/voxel_block_serializer.cpp | 4 ++-- terrain/voxel_block.h | 2 +- 21 files changed, 29 insertions(+), 22 deletions(-) rename voxel_buffer.cpp => storage/voxel_buffer.cpp (99%) rename voxel_buffer.h => storage/voxel_buffer.h (98%) rename voxel_memory_pool.cpp => storage/voxel_memory_pool.cpp (96%) rename voxel_memory_pool.h => storage/voxel_memory_pool.h (100%) diff --git a/SCsub b/SCsub index 83794f33..8913cdc5 100644 --- a/SCsub +++ b/SCsub @@ -12,6 +12,7 @@ files = [ "meshers/cubes/*.cpp", "meshers/*.cpp", "streams/*.cpp", + "storage/*.cpp", "generators/*.cpp", "generators/graph/*.cpp", "util/*.cpp", diff --git a/edition/voxel_tool.cpp b/edition/voxel_tool.cpp index 9f856bf5..7aa41203 100644 --- a/edition/voxel_tool.cpp +++ b/edition/voxel_tool.cpp @@ -1,8 +1,8 @@ #include "voxel_tool.h" +#include "../storage/voxel_buffer.h" #include "../terrain/voxel_lod_terrain.h" #include "../util/macros.h" #include "../util/profiling.h" -#include "../voxel_buffer.h" Vector3 VoxelRaycastResult::_b_get_position() const { return position.to_vec3(); diff --git a/edition/voxel_tool_buffer.cpp b/edition/voxel_tool_buffer.cpp index 347aa049..b8f13209 100644 --- a/edition/voxel_tool_buffer.cpp +++ b/edition/voxel_tool_buffer.cpp @@ -1,5 +1,5 @@ #include "voxel_tool_buffer.h" -#include "../voxel_buffer.h" +#include "../storage/voxel_buffer.h" VoxelToolBuffer::VoxelToolBuffer(Ref vb) { ERR_FAIL_COND(vb.is_null()); diff --git a/generators/voxel_generator_heightmap.h b/generators/voxel_generator_heightmap.h index fd1de4df..d17f0369 100644 --- a/generators/voxel_generator_heightmap.h +++ b/generators/voxel_generator_heightmap.h @@ -1,7 +1,7 @@ #ifndef VOXEL_GENERATOR_HEIGHTMAP_H #define VOXEL_GENERATOR_HEIGHTMAP_H -#include "../voxel_buffer.h" +#include "../storage/voxel_buffer.h" #include "voxel_generator.h" #include diff --git a/meshers/blocky/voxel_mesher_blocky.cpp b/meshers/blocky/voxel_mesher_blocky.cpp index 5b9247ea..ce8bf0c4 100644 --- a/meshers/blocky/voxel_mesher_blocky.cpp +++ b/meshers/blocky/voxel_mesher_blocky.cpp @@ -1,5 +1,6 @@ #include "voxel_mesher_blocky.h" #include "../../cube_tables.h" +#include "../../storage/voxel_buffer.h" #include "../../util/array_slice.h" #include "../../util/utility.h" #include diff --git a/meshers/cubes/voxel_mesher_cubes.cpp b/meshers/cubes/voxel_mesher_cubes.cpp index 6d259f26..99a67cb3 100644 --- a/meshers/cubes/voxel_mesher_cubes.cpp +++ b/meshers/cubes/voxel_mesher_cubes.cpp @@ -1,4 +1,5 @@ #include "voxel_mesher_cubes.h" +#include "../../storage/voxel_buffer.h" namespace { // 2-----3 diff --git a/meshers/dmc/hermite_value.h b/meshers/dmc/hermite_value.h index f2dcfd64..f05a753a 100644 --- a/meshers/dmc/hermite_value.h +++ b/meshers/dmc/hermite_value.h @@ -1,8 +1,8 @@ #ifndef HERMITE_VALUE_H #define HERMITE_VALUE_H +#include "../../storage/voxel_buffer.h" #include "../../util/utility.h" -#include "../../voxel_buffer.h" #include namespace dmc { diff --git a/meshers/transvoxel/voxel_mesher_transvoxel.cpp b/meshers/transvoxel/voxel_mesher_transvoxel.cpp index 54d917cd..a5af031f 100644 --- a/meshers/transvoxel/voxel_mesher_transvoxel.cpp +++ b/meshers/transvoxel/voxel_mesher_transvoxel.cpp @@ -1,4 +1,5 @@ #include "voxel_mesher_transvoxel.h" +#include "../../storage/voxel_buffer.h" #include "transvoxel_tables.cpp" #include diff --git a/meshers/voxel_mesher.cpp b/meshers/voxel_mesher.cpp index 0c007d31..7579343c 100644 --- a/meshers/voxel_mesher.cpp +++ b/meshers/voxel_mesher.cpp @@ -1,4 +1,5 @@ #include "voxel_mesher.h" +#include "../storage/voxel_buffer.h" Ref VoxelMesher::build_mesh(Ref voxels, Array materials) { ERR_FAIL_COND_V(voxels.is_null(), Ref()); diff --git a/meshers/voxel_mesher.h b/meshers/voxel_mesher.h index d053beac..05468ab1 100644 --- a/meshers/voxel_mesher.h +++ b/meshers/voxel_mesher.h @@ -3,9 +3,10 @@ #include "../cube_tables.h" #include "../util/fixed_array.h" -#include "../voxel_buffer.h" #include +class VoxelBuffer; + class VoxelMesher : public Reference { GDCLASS(VoxelMesher, Reference) public: diff --git a/register_types.cpp b/register_types.cpp index 466db8bb..d4808430 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -17,6 +17,8 @@ #include "meshers/cubes/voxel_mesher_cubes.h" #include "meshers/dmc/voxel_mesher_dmc.h" #include "meshers/transvoxel/voxel_mesher_transvoxel.h" +#include "storage/voxel_buffer.h" +#include "storage/voxel_memory_pool.h" #include "streams/vox_loader.h" #include "streams/voxel_stream_block_files.h" #include "streams/voxel_stream_file.h" @@ -27,8 +29,6 @@ #include "terrain/voxel_terrain.h" #include "terrain/voxel_viewer.h" #include "util/macros.h" -#include "voxel_buffer.h" -#include "voxel_memory_pool.h" #include "voxel_string_names.h" #include diff --git a/server/voxel_thread_pool.h b/server/voxel_thread_pool.h index e7c35aec..3efbb35d 100644 --- a/server/voxel_thread_pool.h +++ b/server/voxel_thread_pool.h @@ -1,9 +1,9 @@ #ifndef VOXEL_THREAD_POOL_H #define VOXEL_THREAD_POOL_H +#include "../storage/voxel_buffer.h" #include "../util/array_slice.h" #include "../util/fixed_array.h" -#include "../voxel_buffer.h" #include #include diff --git a/voxel_buffer.cpp b/storage/voxel_buffer.cpp similarity index 99% rename from voxel_buffer.cpp rename to storage/voxel_buffer.cpp index db595335..8dd2c0cd 100644 --- a/voxel_buffer.cpp +++ b/storage/voxel_buffer.cpp @@ -4,7 +4,7 @@ #include "voxel_memory_pool.h" #endif -#include "edition/voxel_tool_buffer.h" +#include "../edition/voxel_tool_buffer.h" #include "voxel_buffer.h" #include diff --git a/voxel_buffer.h b/storage/voxel_buffer.h similarity index 98% rename from voxel_buffer.h rename to storage/voxel_buffer.h index b7dbacf6..896dd9a7 100644 --- a/voxel_buffer.h +++ b/storage/voxel_buffer.h @@ -1,9 +1,9 @@ #ifndef VOXEL_BUFFER_H #define VOXEL_BUFFER_H -#include "math/rect3i.h" -#include "util/array_slice.h" -#include "util/fixed_array.h" +#include "../math/rect3i.h" +#include "../util/array_slice.h" +#include "../util/fixed_array.h" #include #include diff --git a/voxel_memory_pool.cpp b/storage/voxel_memory_pool.cpp similarity index 96% rename from voxel_memory_pool.cpp rename to storage/voxel_memory_pool.cpp index 1ffed2df..490795d2 100644 --- a/voxel_memory_pool.cpp +++ b/storage/voxel_memory_pool.cpp @@ -1,7 +1,7 @@ #include "voxel_memory_pool.h" -#include "core/print_string.h" -#include "core/variant.h" -#include "util/profiling.h" +#include "../util/profiling.h" +#include +#include namespace { VoxelMemoryPool *g_memory_pool = nullptr; diff --git a/voxel_memory_pool.h b/storage/voxel_memory_pool.h similarity index 100% rename from voxel_memory_pool.h rename to storage/voxel_memory_pool.h diff --git a/streams/vox_loader.cpp b/streams/vox_loader.cpp index c9423113..9e1587a4 100644 --- a/streams/vox_loader.cpp +++ b/streams/vox_loader.cpp @@ -1,4 +1,5 @@ #include "vox_loader.h" +#include "../storage/voxel_buffer.h" #include namespace vox { diff --git a/streams/vox_loader.h b/streams/vox_loader.h index 525b3eac..79ea84f3 100644 --- a/streams/vox_loader.h +++ b/streams/vox_loader.h @@ -1,8 +1,10 @@ #ifndef VOX_LOADER_H #define VOX_LOADER_H +#include "../math/vector3i.h" #include "../meshers/cubes/voxel_color_palette.h" -#include "../voxel_buffer.h" + +class VoxelBuffer; namespace vox { diff --git a/streams/voxel_block_request.h b/streams/voxel_block_request.h index 4366d46f..559eb3f2 100644 --- a/streams/voxel_block_request.h +++ b/streams/voxel_block_request.h @@ -2,9 +2,7 @@ #define VOXEL_BLOCK_REQUEST_H #include "../math/vector3i.h" -#include "../voxel_buffer.h" - -class VoxelBuffer; +#include "../storage/voxel_buffer.h" // TODO Rename VoxelStreamBlockRequest struct VoxelBlockRequest { diff --git a/streams/voxel_block_serializer.cpp b/streams/voxel_block_serializer.cpp index 62f70dd7..79885f41 100644 --- a/streams/voxel_block_serializer.cpp +++ b/streams/voxel_block_serializer.cpp @@ -1,10 +1,10 @@ #include "voxel_block_serializer.h" #include "../math/vector3i.h" +#include "../storage/voxel_buffer.h" +#include "../storage/voxel_memory_pool.h" #include "../thirdparty/lz4/lz4.h" #include "../util/macros.h" #include "../util/profiling.h" -#include "../voxel_buffer.h" -#include "../voxel_memory_pool.h" #include #include diff --git a/terrain/voxel_block.h b/terrain/voxel_block.h index e927d1ed..3a160c7a 100644 --- a/terrain/voxel_block.h +++ b/terrain/voxel_block.h @@ -2,10 +2,10 @@ #define VOXEL_BLOCK_H #include "../cube_tables.h" +#include "../storage/voxel_buffer.h" #include "../util/direct_mesh_instance.h" #include "../util/direct_static_body.h" #include "../util/fixed_array.h" -#include "../voxel_buffer.h" #include "voxel_viewer_ref_count.h" //#define VOXEL_DEBUG_LOD_MATERIALS