From bd1d2b224410ca2a5f8ac1502e0ae6fe065fca8f Mon Sep 17 00:00:00 2001 From: David Williams Date: Wed, 1 Apr 2009 22:51:13 +0000 Subject: [PATCH] Moved various files from PolyVoxCore to PolyVoxImpl. --- examples/OpenGL/OpenGLWidget.h | 2 +- examples/OpenGL/main.cpp | 2 +- library/CMakeLists.txt | 15 ++++----- library/include/PolyVoxCore/Constants.h | 32 ------------------- .../include/PolyVoxCore/IndexedSurfacePatch.h | 3 +- .../PolyVoxCore/{ => PolyVoxImpl}/BlockData.h | 0 .../{ => PolyVoxImpl}/BlockData.inl | 0 .../PolyVoxImpl/DecimatedSurfaceExtractor.h | 3 +- .../PolyVoxImpl/FastSurfaceExtractor.h | 3 +- .../{ => PolyVoxImpl}/MarchingCubesTables.h | 0 .../PolyVoxImpl/ReferenceSurfaceExtractor.h | 3 +- .../PolyVoxCore/{ => PolyVoxImpl}/TypeDef.h | 0 .../PolyVoxCore/{ => PolyVoxImpl}/Utility.h | 3 +- library/include/PolyVoxCore/Region.h | 2 +- .../include/PolyVoxCore/SurfaceAdjusters.h | 3 +- .../include/PolyVoxCore/SurfaceExtractors.h | 3 +- library/include/PolyVoxCore/SurfaceVertex.h | 2 +- library/include/PolyVoxCore/Volume.inl | 2 +- .../include/PolyVoxCore/VolumeIterator.inl | 2 +- library/include/PolyVoxCore/VoxelFilters.h | 3 +- library/include/PolyVoxUtil/Serialization.h | 3 +- .../include/PolyVoxUtil/VolumeChangeTracker.h | 3 +- .../PolyVoxImpl/DecimatedSurfaceExtractor.cpp | 2 +- .../PolyVoxImpl/FastSurfaceExtractor.cpp | 2 +- .../{ => PolyVoxImpl}/MarchingCubesTables.cpp | 2 +- .../PolyVoxImpl/ReferenceSurfaceExtractor.cpp | 2 +- .../PolyVoxCore/{ => PolyVoxImpl}/Utility.cpp | 2 +- .../source/PolyVoxCore/SurfaceAdjusters.cpp | 2 +- .../source/PolyVoxCore/SurfaceExtractors.cpp | 2 +- library/source/PolyVoxCore/SurfaceVertex.cpp | 1 - library/source/PolyVoxUtil/Serialization.cpp | 2 +- .../PolyVoxUtil/VolumeChangeTracker.cpp | 4 +-- 32 files changed, 33 insertions(+), 77 deletions(-) delete mode 100644 library/include/PolyVoxCore/Constants.h rename library/include/PolyVoxCore/{ => PolyVoxImpl}/BlockData.h (100%) rename library/include/PolyVoxCore/{ => PolyVoxImpl}/BlockData.inl (100%) rename library/include/PolyVoxCore/{ => PolyVoxImpl}/MarchingCubesTables.h (100%) rename library/include/PolyVoxCore/{ => PolyVoxImpl}/TypeDef.h (100%) rename library/include/PolyVoxCore/{ => PolyVoxImpl}/Utility.h (95%) rename library/source/PolyVoxCore/{ => PolyVoxImpl}/MarchingCubesTables.cpp (97%) rename library/source/PolyVoxCore/{ => PolyVoxImpl}/Utility.cpp (94%) diff --git a/examples/OpenGL/OpenGLWidget.h b/examples/OpenGL/OpenGLWidget.h index 8ebc525c..3b7c07ed 100644 --- a/examples/OpenGL/OpenGLWidget.h +++ b/examples/OpenGL/OpenGLWidget.h @@ -8,7 +8,7 @@ #include "PolyVoxCore/Volume.h" #include "PolyVoxCore/IndexedSurfacePatch.h" #include "PolyVoxCore/SurfaceExtractors.h" -#include "PolyVoxCore/Utility.h" +#include "PolyVoxCore/PolyVoxImpl/Utility.h" #include "OpenGLImmediateModeSupport.h" #include "OpenGLVertexBufferObjectSupport.h" diff --git a/examples/OpenGL/main.cpp b/examples/OpenGL/main.cpp index 9de55672..c0fed582 100644 --- a/examples/OpenGL/main.cpp +++ b/examples/OpenGL/main.cpp @@ -1,7 +1,7 @@ #include "PolyVoxCore/Volume.h" #include "PolyVoxCore/IndexedSurfacePatch.h" #include "PolyVoxCore/SurfaceExtractors.h" -#include "PolyVoxCore/Utility.h" +#include "PolyVoxCore/PolyVoxImpl/Utility.h" #include "OpenGLImmediateModeSupport.h" #include "OpenGLVertexBufferObjectSupport.h" diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 7107d414..6b32387b 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -6,32 +6,24 @@ PROJECT(PolyVoxCore) SET(CORE_SRC_FILES source/PolyVoxCore/GradientEstimators.cpp source/PolyVoxCore/IndexedSurfacePatch.cpp - source/PolyVoxCore/MarchingCubesTables.cpp source/PolyVoxCore/Region.cpp source/PolyVoxCore/SurfaceAdjusters.cpp source/PolyVoxCore/SurfaceExtractors.cpp source/PolyVoxCore/SurfaceVertex.cpp - source/PolyVoxCore/Utility.cpp source/PolyVoxCore/VoxelFilters.cpp ) #Projects headers files SET(CORE_INC_FILES - include/PolyVoxCore/BlockData.h - include/PolyVoxCore/BlockData.inl - include/PolyVoxCore/Constants.h include/PolyVoxCore/Enums.h include/PolyVoxCore/GradientEstimators.h include/PolyVoxCore/GradientEstimators.inl include/PolyVoxCore/IndexedSurfacePatch.h - include/PolyVoxCore/MarchingCubesTables.h include/PolyVoxCore/PolyVoxForwardDeclarations.h include/PolyVoxCore/Region.h include/PolyVoxCore/SurfaceAdjusters.h include/PolyVoxCore/SurfaceExtractors.h include/PolyVoxCore/SurfaceVertex.h - include/PolyVoxCore/TypeDef.h - include/PolyVoxCore/Utility.h include/PolyVoxCore/Vector.h include/PolyVoxCore/Vector.inl include/PolyVoxCore/Volume.h @@ -44,14 +36,21 @@ SET(CORE_INC_FILES SET(IMPL_SRC_FILES source/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.cpp source/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.cpp + source/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.cpp source/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.cpp + source/PolyVoxCore/PolyVoxImpl/Utility.cpp ) SET(IMPL_INC_FILES + include/PolyVoxCore/PolyVoxImpl/BlockData.h + include/PolyVoxCore/PolyVoxImpl/BlockData.inl include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h + include/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h + include/PolyVoxCore/PolyVoxImpl/TypeDef.h + include/PolyVoxCore/PolyVoxImpl/Utility.h ) #Projects source files diff --git a/library/include/PolyVoxCore/Constants.h b/library/include/PolyVoxCore/Constants.h deleted file mode 100644 index db64817e..00000000 --- a/library/include/PolyVoxCore/Constants.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma region License -/****************************************************************************** -This file is part of the PolyVox library -Copyright (C) 2006 David Williams - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -******************************************************************************/ -#pragma endregion - -#ifndef __PolyVox_Constants_H__ -#define __PolyVox_Constants_H__ - -#include "PolyVoxForwardDeclarations.h" - -namespace PolyVox -{ - -} - -#endif diff --git a/library/include/PolyVoxCore/IndexedSurfacePatch.h b/library/include/PolyVoxCore/IndexedSurfacePatch.h index 39556bb7..2cb5dc20 100644 --- a/library/include/PolyVoxCore/IndexedSurfacePatch.h +++ b/library/include/PolyVoxCore/IndexedSurfacePatch.h @@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "PolyVoxImpl/CPlusPlusZeroXSupport.h" -#include "Constants.h" #include "PolyVoxForwardDeclarations.h" #include "SurfaceVertex.h" -#include "TypeDef.h" +#include "PolyVoxImpl/TypeDef.h" namespace PolyVox { diff --git a/library/include/PolyVoxCore/BlockData.h b/library/include/PolyVoxCore/PolyVoxImpl/BlockData.h similarity index 100% rename from library/include/PolyVoxCore/BlockData.h rename to library/include/PolyVoxCore/PolyVoxImpl/BlockData.h diff --git a/library/include/PolyVoxCore/BlockData.inl b/library/include/PolyVoxCore/PolyVoxImpl/BlockData.inl similarity index 100% rename from library/include/PolyVoxCore/BlockData.inl rename to library/include/PolyVoxCore/PolyVoxImpl/BlockData.inl diff --git a/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h b/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h index b0d8d4f0..f8eaec8b 100644 --- a/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h +++ b/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h @@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVoxImpl_DecimatedSurfaceExtractor_H__ #pragma region Headers -#include "PolyVoxCore/Constants.h" #include "PolyVoxCore/PolyVoxForwardDeclarations.h" -#include "PolyVoxCore/TypeDef.h" +#include "PolyVoxCore/PolyVoxImpl/TypeDef.h" #include "CPlusPlusZeroXSupport.h" #pragma endregion diff --git a/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h b/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h index be09ac11..e837b1b4 100644 --- a/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h +++ b/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h @@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVoxImpl_FastSurfaceExtractor_H__ #pragma region Headers -#include "PolyVoxCore/Constants.h" #include "PolyVoxCore/PolyVoxForwardDeclarations.h" -#include "PolyVoxCore/TypeDef.h" +#include "PolyVoxCore/PolyVoxImpl/TypeDef.h" #include "CPlusPlusZeroXSupport.h" #pragma endregion diff --git a/library/include/PolyVoxCore/MarchingCubesTables.h b/library/include/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h similarity index 100% rename from library/include/PolyVoxCore/MarchingCubesTables.h rename to library/include/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h diff --git a/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h b/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h index 75beb2b9..a608a619 100644 --- a/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h +++ b/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h @@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVoxImpl_ReferenceSurfaceExtractor_H__ #pragma region Headers -#include "PolyVoxCore/Constants.h" #include "PolyVoxCore/PolyVoxForwardDeclarations.h" -#include "PolyVoxCore/TypeDef.h" +#include "PolyVoxCore/PolyVoxImpl/TypeDef.h" #include "CPlusPlusZeroXSupport.h" #pragma endregion diff --git a/library/include/PolyVoxCore/TypeDef.h b/library/include/PolyVoxCore/PolyVoxImpl/TypeDef.h similarity index 100% rename from library/include/PolyVoxCore/TypeDef.h rename to library/include/PolyVoxCore/PolyVoxImpl/TypeDef.h diff --git a/library/include/PolyVoxCore/Utility.h b/library/include/PolyVoxCore/PolyVoxImpl/Utility.h similarity index 95% rename from library/include/PolyVoxCore/Utility.h rename to library/include/PolyVoxCore/PolyVoxImpl/Utility.h index 0cd81706..869bc0ff 100644 --- a/library/include/PolyVoxCore/Utility.h +++ b/library/include/PolyVoxCore/PolyVoxImpl/Utility.h @@ -22,10 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef __PolyVox_Utility_H__ #define __PolyVox_Utility_H__ +#include "CPlusPlusZeroXSupport.h" #include "TypeDef.h" -#include "PolyVoxForwardDeclarations.h" - #include namespace PolyVox diff --git a/library/include/PolyVoxCore/Region.h b/library/include/PolyVoxCore/Region.h index 7762402f..28184cc4 100644 --- a/library/include/PolyVoxCore/Region.h +++ b/library/include/PolyVoxCore/Region.h @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVox_Region_H__ #pragma region Headers -#include "TypeDef.h" +#include "PolyVoxImpl/TypeDef.h" #include "Vector.h" #pragma endregion diff --git a/library/include/PolyVoxCore/SurfaceAdjusters.h b/library/include/PolyVoxCore/SurfaceAdjusters.h index 6b88f31c..171bc194 100644 --- a/library/include/PolyVoxCore/SurfaceAdjusters.h +++ b/library/include/PolyVoxCore/SurfaceAdjusters.h @@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVox_SurfaceAdjusters_H__ #pragma region Headers -#include "Constants.h" #include "PolyVoxForwardDeclarations.h" -#include "TypeDef.h" +#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/CPlusPlusZeroXSupport.h" #pragma endregion diff --git a/library/include/PolyVoxCore/SurfaceExtractors.h b/library/include/PolyVoxCore/SurfaceExtractors.h index fe04b8f0..8ffdf215 100644 --- a/library/include/PolyVoxCore/SurfaceExtractors.h +++ b/library/include/PolyVoxCore/SurfaceExtractors.h @@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVox_SurfaceExtractors_H__ #pragma region Headers -#include "Constants.h" #include "PolyVoxForwardDeclarations.h" -#include "TypeDef.h" +#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/CPlusPlusZeroXSupport.h" diff --git a/library/include/PolyVoxCore/SurfaceVertex.h b/library/include/PolyVoxCore/SurfaceVertex.h index 3d5f46fe..0566646f 100644 --- a/library/include/PolyVoxCore/SurfaceVertex.h +++ b/library/include/PolyVoxCore/SurfaceVertex.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef __PolyVox_SurfaceVertex_H__ #define __PolyVox_SurfaceVertex_H__ -#include "TypeDef.h" +#include "PolyVoxImpl/TypeDef.h" #include "Vector.h" namespace PolyVox diff --git a/library/include/PolyVoxCore/Volume.inl b/library/include/PolyVoxCore/Volume.inl index 3482767a..b267fa81 100644 --- a/library/include/PolyVoxCore/Volume.inl +++ b/library/include/PolyVoxCore/Volume.inl @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma endregion #pragma region Headers -#include "BlockData.h" +#include "PolyVoxImpl/BlockData.h" #include "VolumeIterator.h" #include "Region.h" #include "Vector.h" diff --git a/library/include/PolyVoxCore/VolumeIterator.inl b/library/include/PolyVoxCore/VolumeIterator.inl index 9dc3ac4c..5b8580e0 100644 --- a/library/include/PolyVoxCore/VolumeIterator.inl +++ b/library/include/PolyVoxCore/VolumeIterator.inl @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma endregion #pragma region Headers -#include "BlockData.h" +#include "PolyVoxImpl/BlockData.h" #include "Volume.h" #include "Vector.h" #include "Region.h" diff --git a/library/include/PolyVoxCore/VoxelFilters.h b/library/include/PolyVoxCore/VoxelFilters.h index ddfcd8b6..15075935 100644 --- a/library/include/PolyVoxCore/VoxelFilters.h +++ b/library/include/PolyVoxCore/VoxelFilters.h @@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVox_VoxelFilters_H__ #pragma region Headers -#include "Constants.h" #include "PolyVoxForwardDeclarations.h" -#include "TypeDef.h" +#include "PolyVoxImpl/TypeDef.h" #pragma endregion namespace PolyVox diff --git a/library/include/PolyVoxUtil/Serialization.h b/library/include/PolyVoxUtil/Serialization.h index 54f45eed..e012f5aa 100644 --- a/library/include/PolyVoxUtil/Serialization.h +++ b/library/include/PolyVoxUtil/Serialization.h @@ -22,10 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef __PolyVox_Serialization_H__ #define __PolyVox_Serialization_H__ -#include "PolyVoxCore/Constants.h" #include "PolyVoxCore/PolyVoxForwardDeclarations.h" #include "PolyVoxCore/Region.h" -#include "PolyVoxCore/TypeDef.h" +#include "PolyVoxCore/PolyVoxImpl/TypeDef.h" #include diff --git a/library/include/PolyVoxUtil/VolumeChangeTracker.h b/library/include/PolyVoxUtil/VolumeChangeTracker.h index 771bd9b6..5190b50d 100644 --- a/library/include/PolyVoxUtil/VolumeChangeTracker.h +++ b/library/include/PolyVoxUtil/VolumeChangeTracker.h @@ -24,10 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include -#include "PolyVoxCore/Constants.h" #include "PolyVoxCore/PolyVoxForwardDeclarations.h" #include "PolyVoxCore/Region.h" -#include "PolyVoxCore/TypeDef.h" +#include "PolyVoxCore/PolyVoxImpl/TypeDef.h" namespace PolyVox { diff --git a/library/source/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.cpp b/library/source/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.cpp index c3749ce5..96e21b6a 100644 --- a/library/source/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.cpp +++ b/library/source/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "PolyVoxCore/Volume.h" #include "PolyVoxCore/GradientEstimators.h" #include "PolyVoxCore/IndexedSurfacePatch.h" -#include "PolyVoxCore/MarchingCubesTables.h" +#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h" #include "PolyVoxCore/Region.h" #include "PolyVoxCore/VolumeIterator.h" diff --git a/library/source/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.cpp b/library/source/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.cpp index acd16ac2..b65960de 100644 --- a/library/source/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.cpp +++ b/library/source/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "PolyVoxCore/VolumeIterator.h" #include "PolyVoxCore/IndexedSurfacePatch.h" -#include "PolyVoxCore/MarchingCubesTables.h" +#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h" #include "PolyVoxCore/SurfaceVertex.h" namespace PolyVox diff --git a/library/source/PolyVoxCore/MarchingCubesTables.cpp b/library/source/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.cpp similarity index 97% rename from library/source/PolyVoxCore/MarchingCubesTables.cpp rename to library/source/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.cpp index 64e4a290..e843fcce 100644 --- a/library/source/PolyVoxCore/MarchingCubesTables.cpp +++ b/library/source/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/index.html -#include "PolyVoxCore/MarchingCubesTables.h" +#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h" namespace PolyVox { diff --git a/library/source/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.cpp b/library/source/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.cpp index 567784b6..1bbe8d27 100644 --- a/library/source/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.cpp +++ b/library/source/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "PolyVoxCore/Volume.h" #include "PolyVoxCore/VolumeIterator.h" #include "PolyVoxCore/IndexedSurfacePatch.h" -#include "PolyVoxCore/MarchingCubesTables.h" +#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h" #include "PolyVoxCore/Region.h" #include "PolyVoxCore/SurfaceVertex.h" #include "PolyVoxCore/Vector.h" diff --git a/library/source/PolyVoxCore/Utility.cpp b/library/source/PolyVoxCore/PolyVoxImpl/Utility.cpp similarity index 94% rename from library/source/PolyVoxCore/Utility.cpp rename to library/source/PolyVoxCore/PolyVoxImpl/Utility.cpp index cb6059ac..e6565331 100644 --- a/library/source/PolyVoxCore/Utility.cpp +++ b/library/source/PolyVoxCore/PolyVoxImpl/Utility.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ #pragma endregion -#include "PolyVoxCore/Utility.h" +#include "PolyVoxCore/PolyVoxImpl/Utility.h" #include #include diff --git a/library/source/PolyVoxCore/SurfaceAdjusters.cpp b/library/source/PolyVoxCore/SurfaceAdjusters.cpp index bae605ad..2e06af47 100644 --- a/library/source/PolyVoxCore/SurfaceAdjusters.cpp +++ b/library/source/PolyVoxCore/SurfaceAdjusters.cpp @@ -3,7 +3,7 @@ #include "PolyVoxCore/VolumeIterator.h" #include "PolyVoxCore/GradientEstimators.h" #include "PolyVoxCore/IndexedSurfacePatch.h" -#include "PolyVoxCore/Utility.h" +#include "PolyVoxCore/PolyVoxImpl/Utility.h" #include "PolyVoxCore/VoxelFilters.h" #include diff --git a/library/source/PolyVoxCore/SurfaceExtractors.cpp b/library/source/PolyVoxCore/SurfaceExtractors.cpp index 01b94e2a..171bbf34 100644 --- a/library/source/PolyVoxCore/SurfaceExtractors.cpp +++ b/library/source/PolyVoxCore/SurfaceExtractors.cpp @@ -3,7 +3,7 @@ #include "PolyVoxCore/Volume.h" #include "PolyVoxCore/GradientEstimators.h" #include "PolyVoxCore/IndexedSurfacePatch.h" -#include "PolyVoxCore/MarchingCubesTables.h" +#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h" #include "PolyVoxCore/Region.h" #include "PolyVoxCore/SurfaceAdjusters.h" #include "PolyVoxCore/VolumeIterator.h" diff --git a/library/source/PolyVoxCore/SurfaceVertex.cpp b/library/source/PolyVoxCore/SurfaceVertex.cpp index f96918c3..12cdc360 100644 --- a/library/source/PolyVoxCore/SurfaceVertex.cpp +++ b/library/source/PolyVoxCore/SurfaceVertex.cpp @@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include -#include "PolyVoxCore/Constants.h" #include "PolyVoxCore/SurfaceVertex.h" namespace PolyVox diff --git a/library/source/PolyVoxUtil/Serialization.cpp b/library/source/PolyVoxUtil/Serialization.cpp index b874e6b8..1e1cdd21 100644 --- a/library/source/PolyVoxUtil/Serialization.cpp +++ b/library/source/PolyVoxUtil/Serialization.cpp @@ -2,7 +2,7 @@ #include "PolyVoxCore/Volume.h" #include "PolyVoxCore/VolumeIterator.h" -#include "PolyVoxCore/Utility.h" +#include "PolyVoxCore/PolyVoxImpl/Utility.h" using namespace std; diff --git a/library/source/PolyVoxUtil/VolumeChangeTracker.cpp b/library/source/PolyVoxUtil/VolumeChangeTracker.cpp index 22c2b137..a4d14190 100644 --- a/library/source/PolyVoxUtil/VolumeChangeTracker.cpp +++ b/library/source/PolyVoxUtil/VolumeChangeTracker.cpp @@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "PolyVoxCore/GradientEstimators.h" #include "PolyVoxCore/IndexedSurfacePatch.h" -#include "PolyVoxCore/MarchingCubesTables.h" +#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h" #include "PolyVoxCore/SurfaceExtractors.h" #include "PolyVoxCore/SurfaceVertex.h" -#include "PolyVoxCore/Utility.h" +#include "PolyVoxCore/PolyVoxImpl/Utility.h" #include "PolyVoxCore/Vector.h" #include "PolyVoxCore/Volume.h" #include "PolyVoxCore/VolumeIterator.h"