Fix includes

Zylann · Jun 9, 2024 · d585a14 · d585a14
1 parent e915c28
commit d585a14
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/terrain/instancing/generate_instances_block_task.h b/terrain/instancing/generate_instances_block_task.h
@@ -4,9 +4,9 @@
 #include "../../util/containers/std_vector.h"
 #include "../../util/godot/core/array.h"
 #include "../../util/tasks/threaded_task.h"
+#include "instancer_task_output_queue.h"
 #include "up_mode.h"
 #include "voxel_instance_generator.h"
-#include "voxel_instancer_task_output_queue.h"
 
 #include <cstdint>
 #include <memory>

diff --git a/terrain/instancing/load_instance_block_task.cpp b/terrain/instancing/load_instance_block_task.cpp
@@ -8,7 +8,7 @@
 #include "../../util/math/conv.h"
 #include "../../util/profiling.h"
 #include "generate_instances_block_task.h"
-#include "voxel_instancer_quick_reloading_cache.h"
+#include "instancer_quick_reloading_cache.h"
 
 namespace zylann::voxel {
 
@@ -152,8 +152,9 @@ void LoadInstanceChunkTask::run(ThreadedTaskContext &ctx) {
  const int layer_id = loaded_layer_data.id;
  size_t layer_index;
  // Not using a hashmap here, this array is usually small
- if (!find(to_span_const(layers), layer_index,
- [layer_id](const Layer &layer) { return layer.id == layer_id; })) {
+ if (!find(to_span_const(layers), layer_index, [layer_id](const Layer &layer) {
+ return layer.id == layer_id;
+ })) {
  layer_index = layers.size();
  Layer layer;
  layer.id = layer_id;
@@ -207,8 +208,9 @@ void LoadInstanceChunkTask::run(ThreadedTaskContext &ctx) {
  size_t layer_index;
  // Not using a hashmap here, this array is usually small
  const int layer_id = item.id;
- if (!find(to_span_const(layers), layer_index,
- [layer_id](const Layer &layer) { return layer.id == layer_id; })) {
+ if (!find(to_span_const(layers), layer_index, [layer_id](const Layer &layer) {
+ return layer.id == layer_id;
+ })) {
  layer_index = layers.size();
  layers.push_back(Layer());
  }

diff --git a/terrain/instancing/load_instance_block_task.h b/terrain/instancing/load_instance_block_task.h
@@ -5,9 +5,9 @@
 #include "../../util/godot/core/array.h"
 #include "../../util/math/vector3i.h"
 #include "../../util/tasks/threaded_task.h"
+#include "instancer_task_output_queue.h"
 #include "up_mode.h"
 #include "voxel_instance_library.h"
-#include "voxel_instancer_task_output_queue.h"
 #include <cstdint>
 #include <memory>
 

diff --git a/terrain/instancing/voxel_instancer.cpp b/terrain/instancing/voxel_instancer.cpp
@@ -19,12 +19,12 @@
 #include "../../util/string/format.h"
 #include "../fixed_lod/voxel_terrain.h"
 #include "../variable_lod/voxel_lod_terrain.h"
+#include "instancer_quick_reloading_cache.h"
 #include "load_instance_block_task.h"
 #include "voxel_instance_component.h"
 #include "voxel_instance_generator.h"
 #include "voxel_instance_library_multimesh_item.h"
 #include "voxel_instance_library_scene_item.h"
-#include "voxel_instancer_quick_reloading_cache.h"
 #include "voxel_instancer_rigidbody.h"
 
 #ifdef TOOLS_ENABLED