Renamed util/funcs.h => container_funcs.h

edition/voxel_tool_lod_terrain.cpp

@@ -3,7 +3,6 @@
 #include "../storage/voxel_buffer_gd.h"
 #include "../storage/voxel_data_grid.h"
 #include "../terrain/variable_lod/voxel_lod_terrain.h"
-#include "../util/funcs.h"
 #include "../util/godot/funcs.h"
 #include "../util/island_finder.h"
 #include "../util/tasks/async_dependency_tracker.h"

generators/graph/voxel_generator_graph.cpp

@@ -1,5 +1,6 @@
 #include "voxel_generator_graph.h"
 #include "../../storage/voxel_buffer_internal.h"
+#include "../../util/container_funcs.h"
 #include "../../util/expression_parser.h"
 #include "../../util/godot/funcs.h"
 #include "../../util/log.h"

generators/graph/voxel_graph_runtime.cpp

@@ -1,6 +1,6 @@
 #include "voxel_graph_runtime.h"
+#include "../../util/container_funcs.h"
 #include "../../util/expression_parser.h"
-#include "../../util/funcs.h"
 #include "../../util/log.h"
 #include "../../util/macros.h"
 #include "../../util/profiling.h"

meshers/blocky/voxel_mesher_blocky.cpp

@@ -1,7 +1,6 @@
 #include "voxel_mesher_blocky.h"
 #include "../../constants/cube_tables.h"
 #include "../../storage/voxel_buffer_internal.h"
-#include "../../util/funcs.h"
 #include "../../util/godot/funcs.h"
 #include "../../util/span.h"
 #include <core/os/os.h>

meshers/cubes/voxel_mesher_cubes.cpp

@@ -1,6 +1,5 @@
 #include "voxel_mesher_cubes.h"
 #include "../../storage/voxel_buffer_internal.h"
-#include "../../util/funcs.h"
 #include "../../util/godot/funcs.h"
 #include "../../util/profiling.h"
 #include <core/math/geometry_2d.h>

meshers/dmc/mesh_builder.cpp

@@ -1,5 +1,4 @@
 #include "mesh_builder.h"
-#include "../../util/funcs.h"
 #include "../../util/godot/funcs.h"
 #include <scene/resources/mesh.h>
 

meshers/transvoxel/transvoxel.cpp

@@ -1,6 +1,5 @@
 #include "transvoxel.h"
 #include "../../constants/cube_tables.h"
-#include "../../util/funcs.h"
 #include "../../util/godot/funcs.h"
 #include "../../util/profiling.h"
 #include "transvoxel_tables.cpp"

meshers/transvoxel/voxel_mesher_transvoxel.cpp

@@ -3,7 +3,6 @@
 #include "../../storage/voxel_buffer_gd.h"
 #include "../../storage/voxel_data_map.h"
 #include "../../thirdparty/meshoptimizer/meshoptimizer.h"
-#include "../../util/funcs.h"
 #include "../../util/godot/funcs.h"
 #include "../../util/profiling.h"
 #include "transvoxel_tables.cpp"

meshers/voxel_mesher.h

@@ -3,7 +3,9 @@
 
 #include "../constants/cube_tables.h"
 #include "../util/fixed_array.h"
+
 #include <scene/resources/mesh.h>
+#include <vector>
 
 namespace zylann::voxel {
 

server/voxel_server.cpp

@@ -1,8 +1,6 @@
 #include "voxel_server.h"
 #include "../constants/voxel_constants.h"
 #include "../storage/voxel_memory_pool.h"
-#include "../util/funcs.h"
-#include "../util/godot/funcs.h"
 #include "../util/log.h"
 #include "../util/macros.h"
 #include "../util/profiling.h"

storage/voxel_buffer_internal.cpp

@@ -4,7 +4,7 @@
 #include "voxel_memory_pool.h"
 #endif
 
-#include "../util/funcs.h"
+#include "../util/container_funcs.h"
 #include "../util/profiling.h"
 #include "../util/string_funcs.h"
 #include "voxel_buffer_internal.h"

terrain/fixed_lod/voxel_terrain.cpp

@@ -5,7 +5,7 @@
 #include "../../server/voxel_server.h"
 #include "../../server/voxel_server_updater.h"
 #include "../../storage/voxel_buffer_gd.h"
-#include "../../util/funcs.h"
+#include "../../util/container_funcs.h"
 #include "../../util/macros.h"
 #include "../../util/profiling.h"
 #include "../../util/profiling_clock.h"

terrain/instancing/voxel_instance_generator.cpp

@@ -1,5 +1,5 @@
 #include "voxel_instance_generator.h"
-#include "../../util/funcs.h"
+#include "../../util/container_funcs.h"
 #include "../../util/profiling.h"
 
 #include <core/core_string_names.h>

terrain/instancing/voxel_instancer.cpp

@@ -1,5 +1,5 @@
 #include "../../edition/voxel_tool.h"
-#include "../../util/funcs.h"
+#include "../../util/container_funcs.h"
 #include "../../util/godot/funcs.h"
 #include "../../util/profiling.h"
 #include "../../util/string_funcs.h"

terrain/variable_lod/voxel_lod_terrain.cpp

@@ -4,7 +4,7 @@
 #include "../../meshers/transvoxel/voxel_mesher_transvoxel.h"
 #include "../../server/voxel_server_gd.h"
 #include "../../server/voxel_server_updater.h"
-#include "../../util/funcs.h"
+#include "../../util/container_funcs.h"
 #include "../../util/godot/funcs.h"
 #include "../../util/log.h"
 #include "../../util/profiling.h"

terrain/variable_lod/voxel_lod_terrain_update_task.cpp

@@ -4,7 +4,7 @@
 #include "../../server/mesh_block_task.h"
 #include "../../server/save_block_data_task.h"
 #include "../../server/voxel_server.h"
-#include "../../util/godot/funcs.h"
+#include "../../util/container_funcs.h"
 #include "../../util/profiling.h"
 #include "../../util/profiling_clock.h"
 #include "../../util/string_funcs.h"

tests/tests.cpp

@@ -10,6 +10,7 @@
 #include "../streams/region/voxel_stream_region_files.h"
 #include "../streams/voxel_block_serializer.h"
 #include "../streams/voxel_block_serializer_gd.h"
+#include "../util/container_funcs.h"
 #include "../util/expression_parser.h"
 #include "../util/flat_map.h"
 #include "../util/godot/funcs.h"

util/container_funcs.h

@@ -1,5 +1,5 @@
-#ifndef HEADER_VOXEL_UTILITY_H
-#define HEADER_VOXEL_UTILITY_H
+#ifndef ZN_CONTAINER_FUNCS_H
+#define ZN_CONTAINER_FUNCS_H
 
 #include "span.h"
 #include <vector>
@@ -146,4 +146,4 @@ inline bool is_uniform(const Item_T *p_data, size_t item_count) {
 
 } // namespace zylann
 
-#endif // HEADER_VOXEL_UTILITY_H
+#endif // ZN_CONTAINER_FUNCS_H

util/godot/funcs.cpp

@@ -1,5 +1,4 @@
 #include "funcs.h"
-#include "../funcs.h"
 #include "../profiling.h"
 
 #include <core/config/engine.h>

util/math/box3i.h

@@ -3,6 +3,7 @@
 
 #include "vector3i.h"
 #include <iosfwd>
+#include <vector>
 
 namespace zylann {
 

util/math/vector3i.h

@@ -1,7 +1,6 @@
 #ifndef ZYLANN_VECTOR3I_H
 #define ZYLANN_VECTOR3I_H
 
-#include "../funcs.h"
 #include "funcs.h"
 
 #include <core/math/vector3.h>