Moved VoxelBuffer and VoxelMemoryPool under storage/ directory

SCsub

@@ -12,6 +12,7 @@ files = [
 	"meshers/cubes/*.cpp",
 	"meshers/*.cpp",
 	"streams/*.cpp",
+	"storage/*.cpp",
 	"generators/*.cpp",
 	"generators/graph/*.cpp",
 	"util/*.cpp",

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();

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<VoxelBuffer> vb) {
 	ERR_FAIL_COND(vb.is_null());

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 <core/image.h>
 

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 <core/os/os.h>

meshers/cubes/voxel_mesher_cubes.cpp

@@ -1,4 +1,5 @@
 #include "voxel_mesher_cubes.h"
+#include "../../storage/voxel_buffer.h"
 
 namespace {
 // 2-----3

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 <core/math/vector3.h>
 
 namespace dmc {

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 <core/os/os.h>
 

meshers/voxel_mesher.cpp

@@ -1,4 +1,5 @@
 #include "voxel_mesher.h"
+#include "../storage/voxel_buffer.h"
 
 Ref<Mesh> VoxelMesher::build_mesh(Ref<VoxelBuffer> voxels, Array materials) {
 	ERR_FAIL_COND_V(voxels.is_null(), Ref<ArrayMesh>());

meshers/voxel_mesher.h

@@ -3,9 +3,10 @@
 
 #include "../cube_tables.h"
 #include "../util/fixed_array.h"
-#include "../voxel_buffer.h"
 #include <scene/resources/mesh.h>
 
+class VoxelBuffer;
+
 class VoxelMesher : public Reference {
 	GDCLASS(VoxelMesher, Reference)
 public:

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 <core/engine.h>
 

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 <core/os/mutex.h>
 
 #include <queue>

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 <core/func_ref.h>

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 <core/map.h>
 #include <core/reference.h>

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 <core/print_string.h>
+#include <core/variant.h>
 
 namespace {
 VoxelMemoryPool *g_memory_pool = nullptr;

streams/vox_loader.cpp

@@ -1,4 +1,5 @@
 #include "vox_loader.h"
+#include "../storage/voxel_buffer.h"
 #include <core/os/file_access.h>
 
 namespace vox {

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 {
 

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 {

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 <core/io/marshalls.h>
 #include <core/io/stream_peer.h>

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