diff --git a/meshers/dmc/voxel_mesher_dmc.cpp b/meshers/dmc/voxel_mesher_dmc.cpp index 34a37bd..0228937 100644 --- a/meshers/dmc/voxel_mesher_dmc.cpp +++ b/meshers/dmc/voxel_mesher_dmc.cpp @@ -1,8 +1,8 @@ #include "voxel_mesher_dmc.h" #include "../../cube_tables.h" +#include "../../octree_tables.h" #include "marching_cubes_tables.h" #include "mesh_builder.h" -#include "octree_tables.h" #include // Dual marching cubes diff --git a/meshers/dmc/voxel_mesher_dmc.h b/meshers/dmc/voxel_mesher_dmc.h index 0f4a3b6..bc3c6ed 100644 --- a/meshers/dmc/voxel_mesher_dmc.h +++ b/meshers/dmc/voxel_mesher_dmc.h @@ -1,10 +1,10 @@ #ifndef VOXEL_MESHER_DMC_H #define VOXEL_MESHER_DMC_H +#include "../../util/object_pool.h" #include "../voxel_mesher.h" #include "hermite_value.h" #include "mesh_builder.h" -#include "object_pool.h" #include namespace dmc { diff --git a/meshers/dmc/octree_tables.h b/octree_tables.h similarity index 96% rename from meshers/dmc/octree_tables.h rename to octree_tables.h index c24b1c8..8cb04de 100644 --- a/meshers/dmc/octree_tables.h +++ b/octree_tables.h @@ -27,6 +27,7 @@ namespace OctreeTables { // |/ |/ |/ |/ // 1---------------8---------------0 X----o +// The order is important for some algorithms (DMC) const int g_octant_position[8][3]{ { 0, 0, 0 }, diff --git a/meshers/dmc/object_pool.h b/util/object_pool.h similarity index 100% rename from meshers/dmc/object_pool.h rename to util/object_pool.h