From 7c6d4f3242e6fff3b1e345515077d738e8615767 Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Mon, 29 Apr 2019 21:31:08 +0100 Subject: [PATCH] Moved ObjectPool to util/ and moved OctreeTables to root --- meshers/dmc/voxel_mesher_dmc.cpp | 2 +- meshers/dmc/voxel_mesher_dmc.h | 2 +- meshers/dmc/octree_tables.h => octree_tables.h | 1 + {meshers/dmc => util}/object_pool.h | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename meshers/dmc/octree_tables.h => octree_tables.h (96%) rename {meshers/dmc => util}/object_pool.h (100%) diff --git a/meshers/dmc/voxel_mesher_dmc.cpp b/meshers/dmc/voxel_mesher_dmc.cpp index 34a37bd5..02289371 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 0f4a3b61..bc3c6eda 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 c24b1c84..8cb04de7 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