From 1f6a3231c1b5c3d61e5ba21a6e0daec9690c2655 Mon Sep 17 00:00:00 2001
From: David Williams <david@david-williams.info>
Date: Fri, 17 Apr 2009 21:57:50 +0000
Subject: [PATCH] Renamed BlockData to Block, and moved it out of Impl. It
 might be useful more generally...

---
 library/PolyVoxCore/CMakeLists.txt                     |  4 ++--
 .../include/{PolyVoxImpl/BlockData.h => Block.h}       | 10 +++++-----
 .../include/{PolyVoxImpl/BlockData.inl => Block.inl}   |  2 +-
 library/PolyVoxCore/include/Volume.h                   |  2 +-
 library/PolyVoxCore/include/Volume.inl                 |  2 +-
 library/PolyVoxCore/include/VolumeIterator.inl         |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename library/PolyVoxCore/include/{PolyVoxImpl/BlockData.h => Block.h} (88%)
 rename library/PolyVoxCore/include/{PolyVoxImpl/BlockData.inl => Block.inl} (95%)

diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index 04631482..45cf36c3 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -16,6 +16,8 @@ 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
@@ -42,8 +44,6 @@ SET(IMPL_SRC_FILES
 )
 
 SET(IMPL_INC_FILES
-	include/PolyVoxImpl/BlockData.h
-	include/PolyVoxImpl/BlockData.inl
 	include/PolyVoxImpl/CPlusPlusZeroXSupport.h
 	include/PolyVoxImpl/DecimatedSurfaceExtractor.h
 	include/PolyVoxImpl/FastSurfaceExtractor.h
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/BlockData.h b/library/PolyVoxCore/include/Block.h
similarity index 88%
rename from library/PolyVoxCore/include/PolyVoxImpl/BlockData.h
rename to library/PolyVoxCore/include/Block.h
index 7341c85c..27df1afa 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/BlockData.h
+++ b/library/PolyVoxCore/include/Block.h
@@ -19,13 +19,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 #pragma endregion
 
-#ifndef __PolyVox_BlockData_H__
-#define __PolyVox_BlockData_H__
+#ifndef __PolyVox_Block_H__
+#define __PolyVox_Block_H__
 
 #pragma region Headers
-#include "../PolyVoxForwardDeclarations.h"
+#include "PolyVoxForwardDeclarations.h"
 
-#include "CPlusPlusZeroXSupport.h"
+#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 #pragma endregion
 
 namespace PolyVox
@@ -59,6 +59,6 @@ namespace PolyVox
 	};
 }
 
-#include "BlockData.inl"
+#include "Block.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/BlockData.inl b/library/PolyVoxCore/include/Block.inl
similarity index 95%
rename from library/PolyVoxCore/include/PolyVoxImpl/BlockData.inl
rename to library/PolyVoxCore/include/Block.inl
index 76745761..f9ff372d 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/BlockData.inl
+++ b/library/PolyVoxCore/include/Block.inl
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #pragma endregion
 
 #pragma region Headers
-#include "Utility.h"
+#include "PolyVoxImpl/Utility.h"
 #include "Vector.h"
 #include "Volume.h"
 
diff --git a/library/PolyVoxCore/include/Volume.h b/library/PolyVoxCore/include/Volume.h
index 8c142db0..14bd003f 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 "PolyVoxImpl/BlockData.h"
+#include "Block.h"
 #include "PolyVoxForwardDeclarations.h"
 
 #include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
diff --git a/library/PolyVoxCore/include/Volume.inl b/library/PolyVoxCore/include/Volume.inl
index 652ba6bc..1523f09e 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 "PolyVoxImpl/BlockData.h"
+#include "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 08a2aa3d..32570129 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 "PolyVoxImpl/BlockData.h"
+#include "Block.h"
 #include "Volume.h"
 #include "Vector.h"
 #include "Region.h"