Moved constants and tables under a folder

SCsub

@@ -12,6 +12,8 @@ env_voxel = env_modules.Clone()
 voxel_files = [
 	"*.cpp",
 	
+	"constants/*.cpp",
+
 	"meshers/blocky/*.cpp",
 	"meshers/transvoxel/*.cpp",
 	"meshers/dmc/*.cpp",

constants/cube_tables.h

@@ -1,7 +1,7 @@
 #ifndef CUBE_TABLES_H
 #define CUBE_TABLES_H
 
-#include "util/math/vector3i.h"
+#include "../util/math/vector3i.h"
 #include <core/math/vector3.h>
 
 namespace Cube {

constants/voxel_string_names.h

@@ -1,7 +1,7 @@
 #ifndef VOXEL_STRING_NAMES_H
 #define VOXEL_STRING_NAMES_H
 
-#include "core/string_name.h"
+#include <core/string_name.h>
 
 class VoxelStringNames {
 private:

generators/voxel_generator.cpp

@@ -1,5 +1,5 @@
 #include "voxel_generator.h"
-#include "../voxel_string_names.h"
+#include "../constants/voxel_string_names.h"
 
 VoxelGenerator::VoxelGenerator() {
 }

generators/voxel_generator_script.cpp

@@ -1,6 +1,6 @@
 #include "voxel_generator_script.h"
+#include "../constants/voxel_string_names.h"
 #include "../util/godot/funcs.h"
-#include "../voxel_string_names.h"
 
 VoxelGeneratorScript::VoxelGeneratorScript() {
 }

meshers/blocky/voxel.h

@@ -1,7 +1,7 @@
 #ifndef VOXEL_TYPE_H
 #define VOXEL_TYPE_H
 
-#include "../../cube_tables.h"
+#include "../../constants/cube_tables.h"
 #include "../../util/fixed_array.h"
 
 #include <scene/resources/mesh.h>

meshers/blocky/voxel_mesher_blocky.cpp

@@ -1,5 +1,5 @@
 #include "voxel_mesher_blocky.h"
-#include "../../cube_tables.h"
+#include "../../constants/cube_tables.h"
 #include "../../storage/voxel_buffer.h"
 #include "../../util/array_slice.h"
 #include "../../util/funcs.h"

meshers/dmc/voxel_mesher_dmc.cpp

@@ -1,6 +1,6 @@
 #include "voxel_mesher_dmc.h"
-#include "../../cube_tables.h"
-#include "../../octree_tables.h"
+#include "../../constants/cube_tables.h"
+#include "../../constants/octree_tables.h"
 #include "marching_cubes_tables.h"
 #include "mesh_builder.h"
 #include <core/os/os.h>

meshers/transvoxel/voxel_mesher_transvoxel.h

@@ -1,7 +1,7 @@
 #ifndef VOXEL_MESHER_TRANSVOXEL_H
 #define VOXEL_MESHER_TRANSVOXEL_H
 
-#include "../../cube_tables.h"
+#include "../../constants/cube_tables.h"
 #include "../../util/fixed_array.h"
 #include "../voxel_mesher.h"
 #include <vector>

meshers/voxel_mesher.h

@@ -1,7 +1,7 @@
 #ifndef VOXEL_MESHER_H
 #define VOXEL_MESHER_H
 
-#include "../cube_tables.h"
+#include "../constants/cube_tables.h"
 #include "../util/fixed_array.h"
 #include <scene/resources/mesh.h>
 

register_types.cpp

@@ -39,9 +39,9 @@
 #ifdef VOXEL_FAST_NOISE_2_SUPPORT
 #include "util/noise/fast_noise_2.h"
 #endif
+#include "constants/voxel_string_names.h"
 #include "util/noise/fast_noise_lite.h"
 #include "util/noise/fast_noise_lite_gradient.h"
-#include "voxel_string_names.h"
 
 #include <core/engine.h>
 

server/voxel_server.cpp

@@ -1,9 +1,9 @@
 #include "voxel_server.h"
+#include "../constants/voxel_constants.h"
 #include "../meshers/transvoxel/voxel_mesher_transvoxel.h"
 #include "../util/funcs.h"
 #include "../util/macros.h"
 #include "../util/profiling.h"
-#include "../voxel_constants.h"
 #include <core/os/memory.h>
 #include <scene/main/viewport.h>
 #include <thread>

storage/voxel_buffer.h

@@ -1,10 +1,10 @@
 #ifndef VOXEL_BUFFER_H
 #define VOXEL_BUFFER_H
 
+#include "../constants/voxel_constants.h"
 #include "../util/array_slice.h"
 #include "../util/fixed_array.h"
 #include "../util/math/rect3i.h"
-#include "../voxel_constants.h"
 
 #include <core/map.h>
 #include <core/reference.h>

streams/instance_data.cpp

@@ -1,8 +1,8 @@
 #include "instance_data.h"
+#include "../constants/voxel_constants.h"
 #include "../util/array_slice.h"
 #include "../util/math/funcs.h"
 #include "../util/serialization.h"
-#include "../voxel_constants.h"
 #include <core/variant.h>
 
 namespace {

streams/voxel_stream.cpp

@@ -1,5 +1,4 @@
 #include "voxel_stream.h"
-#include "../voxel_string_names.h"
 #include <core/script_language.h>
 
 VoxelStream::VoxelStream() {

streams/voxel_stream_script.cpp

@@ -1,6 +1,6 @@
 #include "voxel_stream_script.h"
+#include "../constants/voxel_string_names.h"
 #include "../util/godot/funcs.h"
-#include "../voxel_string_names.h"
 
 VoxelStream::Result VoxelStreamScript::emerge_block(Ref<VoxelBuffer> out_buffer, Vector3i origin_in_voxels, int lod) {
 	ERR_FAIL_COND_V(out_buffer.is_null(), RESULT_ERROR);

terrain/lod_octree.h

@@ -1,9 +1,9 @@
 #ifndef LOD_OCTREE_H
 #define LOD_OCTREE_H
 
-#include "../octree_tables.h"
+#include "../constants/octree_tables.h"
+#include "../constants/voxel_constants.h"
 #include "../util/math/vector3i.h"
-#include "../voxel_constants.h"
 
 // Octree designed to handle level of detail.
 class LodOctree {

terrain/voxel_block.cpp

@@ -1,7 +1,8 @@
 #include "voxel_block.h"
+#include "../constants/voxel_string_names.h"
 #include "../util/macros.h"
 #include "../util/profiling.h"
-#include "../voxel_string_names.h"
+
 #include <scene/3d/spatial.h>
 #include <scene/resources/concave_polygon_shape.h>
 

terrain/voxel_block.h

@@ -1,7 +1,7 @@
 #ifndef VOXEL_BLOCK_H
 #define VOXEL_BLOCK_H
 
-#include "../cube_tables.h"
+#include "../constants/cube_tables.h"
 #include "../storage/voxel_buffer.h"
 #include "../util/godot/direct_mesh_instance.h"
 #include "../util/godot/direct_static_body.h"

terrain/voxel_lod_terrain.cpp

@@ -1,4 +1,5 @@
 #include "voxel_lod_terrain.h"
+#include "../constants/voxel_string_names.h"
 #include "../edition/voxel_tool_lod_terrain.h"
 #include "../meshers/transvoxel/voxel_mesher_transvoxel.h"
 #include "../server/voxel_server.h"
@@ -8,7 +9,6 @@
 #include "../util/math/rect3i.h"
 #include "../util/profiling.h"
 #include "../util/profiling_clock.h"
-#include "../voxel_string_names.h"
 #include "instancing/voxel_instancer.h"
 #include "voxel_map.h"
 

terrain/voxel_map.cpp

@@ -1,5 +1,5 @@
 #include "voxel_map.h"
-#include "../cube_tables.h"
+#include "../constants/cube_tables.h"
 #include "../util/macros.h"
 #include "voxel_block.h"
 #include <limits>

terrain/voxel_terrain.cpp

@@ -1,4 +1,6 @@
 #include "voxel_terrain.h"
+#include "../constants/voxel_constants.h"
+#include "../constants/voxel_string_names.h"
 #include "../edition/voxel_tool_terrain.h"
 #include "../server/voxel_server.h"
 #include "../util/funcs.h"
@@ -6,8 +8,6 @@
 #include "../util/macros.h"
 #include "../util/profiling.h"
 #include "../util/profiling_clock.h"
-#include "../voxel_constants.h"
-#include "../voxel_string_names.h"
 #include "voxel_block.h"
 #include "voxel_map.h"