Moved instancing stuff under a folder

SCsub

@@ -33,6 +33,8 @@ voxel_files = [
 	"util/noise/fast_noise_lite_gradient.cpp",
 
 	"terrain/*.cpp",
+	"terrain/instancing/*.cpp",
+
 	"server/*.cpp",
 	"math/*.cpp",
 	"edition/*.cpp",

register_types.cpp

@@ -27,8 +27,8 @@
 #include "streams/vox_loader.h"
 #include "streams/voxel_stream_block_files.h"
 #include "streams/voxel_stream_script.h"
+#include "terrain/instancing/voxel_instancer.h"
 #include "terrain/voxel_box_mover.h"
-#include "terrain/voxel_instancer.h"
 #include "terrain/voxel_lod_terrain.h"
 #include "terrain/voxel_map.h"
 #include "terrain/voxel_terrain.h"

terrain/instancing/voxel_instance_generator.cpp

@@ -1,5 +1,5 @@
 #include "voxel_instance_generator.h"
-#include "../util/profiling.h"
+#include "../../util/profiling.h"
 #include <scene/resources/mesh.h>
 
 static inline Vector3 normalized(Vector3 pos, float &length) {

terrain/instancing/voxel_instance_generator.h

@@ -1,7 +1,8 @@
 #ifndef VOXEL_INSTANCE_GENERATOR_H
 #define VOXEL_INSTANCE_GENERATOR_H
 
-#include "../storage/voxel_buffer.h"
+//#include "../../storage/voxel_buffer.h"
+#include "../../math/vector3i.h"
 #include <core/resource.h>
 #include <limits>
 #include <vector>

terrain/instancing/voxel_instancer.cpp

@@ -1,9 +1,9 @@
 #include "voxel_instancer.h"
-#include "../edition/voxel_tool.h"
-#include "../generators/graph/voxel_generator_graph.h"
-#include "../util/macros.h"
-#include "../util/profiling.h"
-#include "voxel_lod_terrain.h"
+#include "../../edition/voxel_tool.h"
+//#include "../../generators/graph/voxel_generator_graph.h"
+#include "../../util/macros.h"
+#include "../../util/profiling.h"
+#include "../voxel_lod_terrain.h"
 
 #include <scene/3d/collision_shape.h>
 #include <scene/3d/mesh_instance.h>

terrain/instancing/voxel_instancer.h

@@ -1,11 +1,11 @@
 #ifndef VOXEL_INSTANCER_H
 #define VOXEL_INSTANCER_H
 
-#include "../math/rect3i.h"
-#include "../streams/instance_data.h"
-#include "../util/array_slice.h"
-#include "../util/direct_multimesh_instance.h"
-#include "../util/fixed_array.h"
+#include "../../math/rect3i.h"
+#include "../../streams/instance_data.h"
+#include "../../util/array_slice.h"
+#include "../../util/direct_multimesh_instance.h"
+#include "../../util/fixed_array.h"
 #include "voxel_instance_generator.h"
 
 #include <scene/3d/spatial.h>

terrain/voxel_lod_terrain.cpp

@@ -7,7 +7,7 @@
 #include "../util/profiling.h"
 #include "../util/profiling_clock.h"
 #include "../voxel_string_names.h"
-#include "voxel_instancer.h"
+#include "instancing/voxel_instancer.h"
 #include "voxel_map.h"
 
 #include <core/core_string_names.h>