From cb37ab39da1ca8579b8583c605ba18e91f408b40 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 26 Apr 2009 21:20:17 +0000 Subject: [PATCH] Moved Block from PolyVoxCore to PolyVoxImpl. --- library/PolyVoxCore/CMakeLists.txt | 4 ++-- library/PolyVoxCore/include/{ => PolyVoxImpl}/Block.h | 0 library/PolyVoxCore/include/{ => PolyVoxImpl}/Block.inl | 0 library/PolyVoxCore/include/Volume.h | 2 +- library/PolyVoxCore/include/Volume.inl | 2 +- library/PolyVoxCore/include/VolumeIterator.inl | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename library/PolyVoxCore/include/{ => PolyVoxImpl}/Block.h (100%) rename library/PolyVoxCore/include/{ => PolyVoxImpl}/Block.inl (100%) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 45cf36c3..1e797b17 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -16,8 +16,6 @@ SET(CORE_SRC_FILES #Projects headers files SET(CORE_INC_FILES - include/Block.h - include/Block.inl include/GradientEstimators.inl include/IndexedSurfacePatch.h include/Log.h @@ -44,6 +42,8 @@ SET(IMPL_SRC_FILES ) SET(IMPL_INC_FILES + include/PolyVoxImpl/Block.h + include/PolyVoxImpl/Block.inl include/PolyVoxImpl/CPlusPlusZeroXSupport.h include/PolyVoxImpl/DecimatedSurfaceExtractor.h include/PolyVoxImpl/FastSurfaceExtractor.h diff --git a/library/PolyVoxCore/include/Block.h b/library/PolyVoxCore/include/PolyVoxImpl/Block.h similarity index 100% rename from library/PolyVoxCore/include/Block.h rename to library/PolyVoxCore/include/PolyVoxImpl/Block.h diff --git a/library/PolyVoxCore/include/Block.inl b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl similarity index 100% rename from library/PolyVoxCore/include/Block.inl rename to library/PolyVoxCore/include/PolyVoxImpl/Block.inl diff --git a/library/PolyVoxCore/include/Volume.h b/library/PolyVoxCore/include/Volume.h index 7f323d89..e3e137cf 100644 --- a/library/PolyVoxCore/include/Volume.h +++ b/library/PolyVoxCore/include/Volume.h @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define __PolyVox_Volume_H__ #pragma region Headers -#include "Block.h" +#include "PolyVoxImpl/Block.h" #include "PolyVoxForwardDeclarations.h" #include "PolyVoxImpl/CPlusPlusZeroXSupport.h" diff --git a/library/PolyVoxCore/include/Volume.inl b/library/PolyVoxCore/include/Volume.inl index 9441a939..82b5b04d 100644 --- a/library/PolyVoxCore/include/Volume.inl +++ b/library/PolyVoxCore/include/Volume.inl @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma endregion #pragma region Headers -#include "Block.h" +#include "PolyVoxImpl/Block.h" #include "Log.h" #include "VolumeIterator.h" #include "Region.h" diff --git a/library/PolyVoxCore/include/VolumeIterator.inl b/library/PolyVoxCore/include/VolumeIterator.inl index 9df139a0..113101e4 100644 --- a/library/PolyVoxCore/include/VolumeIterator.inl +++ b/library/PolyVoxCore/include/VolumeIterator.inl @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma endregion #pragma region Headers -#include "Block.h" +#include "PolyVoxImpl/Block.h" #include "Volume.h" #include "Vector.h" #include "Region.h"