Moved headers into subdirectories.

examples/Basic/OpenGLWidget.h

@@ -24,7 +24,7 @@ distribution.
 #ifndef __BasicExample_OpenGLWidget_H__
 #define __BasicExample_OpenGLWidget_H__
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 #include "glew/glew.h"
 

examples/Basic/main.cpp

@@ -23,10 +23,10 @@ freely, subject to the following restrictions:
 
 #include "OpenGLWidget.h"
 
-#include "MaterialDensityPair.h"
-#include "CubicSurfaceExtractorWithNormals.h"
-#include "SurfaceMesh.h"
-#include "SimpleVolume.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/CubicSurfaceExtractorWithNormals.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+#include "PolyVoxCore/SimpleVolume.h"
 
 #include <QApplication>
 

examples/OpenGL/OpenGLImmediateModeSupport.cpp

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #include "OpenGLImmediateModeSupport.h"
 #include "OpenGLSupport.h"
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 using namespace PolyVox;
 using namespace std;

examples/OpenGL/OpenGLImmediateModeSupport.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_OpenGLImmediateModeSupport_H__
 #define __OpenGLExample_OpenGLImmediateModeSupport_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include "glew/glew.h"
 

examples/OpenGL/OpenGLSupport.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_OpenGLSupport_H__
 #define __OpenGLExample_OpenGLSupport_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include "glew/glew.h"
 

examples/OpenGL/OpenGLVertexBufferObjectSupport.cpp

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #include "OpenGLSupport.h"
 #include "OpenGLVertexBufferObjectSupport.h"
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 using namespace PolyVox;
 using namespace std;

examples/OpenGL/OpenGLVertexBufferObjectSupport.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_OpenGLVertexBufferObjectSupport_H__
 #define __OpenGLExample_OpenGLVertexBufferObjectSupport_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include "glew/glew.h"
 

examples/OpenGL/OpenGLWidget.cpp

@@ -25,10 +25,10 @@ freely, subject to the following restrictions:
 
 #include <QMouseEvent>
 
-#include "GradientEstimators.h"
-#include "MaterialDensityPair.h"
-#include "MeshDecimator.h"
-#include "SurfaceExtractor.h"
+#include "PolyVoxCore/GradientEstimators.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/MeshDecimator.h"
+#include "PolyVoxCore/SurfaceExtractor.h"
 
 //Some namespaces we need
 using namespace std;

examples/OpenGL/OpenGLWidget.h

@@ -29,8 +29,8 @@ freely, subject to the following restrictions:
 #include <QGLWidget>
 #include <QTimer>
 
-#include "LargeVolume.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/Utility.h"
 
 #include "OpenGLImmediateModeSupport.h"

examples/OpenGL/Shapes.cpp

@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "Shapes.h"
 
-#include "MaterialDensityPair.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
 
 using namespace PolyVox;
 

examples/OpenGL/Shapes.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_Shapes_H__
 #define __OpenGLExample_Shapes_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 void createSphereInVolume(PolyVox::LargeVolume<PolyVox::MaterialDensityPair44>& volData, float fRadius, uint8_t uValue);
 void createCubeInVolume(PolyVox::LargeVolume<PolyVox::MaterialDensityPair44>& volData, PolyVox::Vector3DInt32 lowerCorner, PolyVox::Vector3DInt32 upperCorner, uint8_t uValue);

examples/OpenGL/main.cpp

@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Filters.h"
-#include "Log.h"
-#include "MaterialDensityPair.h"
-#include "LargeVolume.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Filters.h"
+#include "PolyVoxCore/Log.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/Utility.h"
 
 #include "OpenGLImmediateModeSupport.h"

examples/Paging/OpenGLWidget.h

@@ -24,7 +24,7 @@ distribution.
 #ifndef __BasicExample_OpenGLWidget_H__
 #define __BasicExample_OpenGLWidget_H__
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 #include "glew/glew.h"
 

examples/Paging/main.cpp

@@ -24,12 +24,12 @@ freely, subject to the following restrictions:
 #include "OpenGLWidget.h"
 #include "Perlin.h"
 
-#include "MaterialDensityPair.h"
-#include "CubicSurfaceExtractorWithNormals.h"
-#include "SurfaceExtractor.h"
-#include "SurfaceMesh.h"
-#include "LargeVolume.h"
-#include "Filters.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/CubicSurfaceExtractorWithNormals.h"
+#include "PolyVoxCore/SurfaceExtractor.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/Filters.h"
 
 #include <QApplication>
 

library/PolyVoxCore/CMakeLists.txt

@@ -16,50 +16,50 @@ SET(CORE_SRC_FILES
 
 #Projects headers files
 SET(CORE_INC_FILES
-	include/AmbientOcclusionCalculator.h
-	include/AmbientOcclusionCalculator.inl
-	include/Array.h
-	include/Array.inl
-	include/ArraySizes.h
-	include/AStarPathfinder.h
-	include/AStarPathfinder.inl
-	include/ConstVolumeProxy.h
-	include/CubicSurfaceExtractor.h
-	include/CubicSurfaceExtractor.inl
-	include/CubicSurfaceExtractorWithNormals.h
-	include/CubicSurfaceExtractorWithNormals.inl
-	include/Density.h
-	include/Filters.h
-	include/Filters.inl
-	include/GradientEstimators.h
-	include/GradientEstimators.inl
-	include/ImprovedCubicSurfaceExtractor.h
-	include/ImprovedCubicSurfaceExtractor.inl
-	include/LargeVolume.h
-	include/LargeVolume.inl
-	include/LargeVolumeSampler.inl
-	include/Log.h
-	include/Material.h
-	include/MaterialDensityPair.h
-	include/MeshDecimator.h
-	include/MeshDecimator.inl
-	include/PolyVoxForwardDeclarations.h
-	include/Raycast.h
-	include/Raycast.inl
-	include/RaycastWithCallback.h
-	include/RaycastWithCallback.inl
-	include/Region.h
-	include/SimpleVolume.h
-	include/SimpleVolume.inl
-	include/SimpleVolumeSampler.inl
-	include/SurfaceExtractor.h
-	include/SurfaceExtractor.inl
-	include/SurfaceMesh.h
-	include/SurfaceMesh.inl
-	include/Vector.h
-	include/Vector.inl
-	include/VertexTypes.h
-	include/VoxelFilters.h
+	include/PolyVoxCore/AmbientOcclusionCalculator.h
+	include/PolyVoxCore/AmbientOcclusionCalculator.inl
+	include/PolyVoxCore/Array.h
+	include/PolyVoxCore/Array.inl
+	include/PolyVoxCore/ArraySizes.h
+	include/PolyVoxCore/AStarPathfinder.h
+	include/PolyVoxCore/AStarPathfinder.inl
+	include/PolyVoxCore/ConstVolumeProxy.h
+	include/PolyVoxCore/CubicSurfaceExtractor.h
+	include/PolyVoxCore/CubicSurfaceExtractor.inl
+	include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
+	include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
+	include/PolyVoxCore/Density.h
+	include/PolyVoxCore/Filters.h
+	include/PolyVoxCore/Filters.inl
+	include/PolyVoxCore/GradientEstimators.h
+	include/PolyVoxCore/GradientEstimators.inl
+	include/PolyVoxCore/ImprovedCubicSurfaceExtractor.h
+	include/PolyVoxCore/ImprovedCubicSurfaceExtractor.inl
+	include/PolyVoxCore/LargeVolume.h
+	include/PolyVoxCore/LargeVolume.inl
+	include/PolyVoxCore/LargeVolumeSampler.inl
+	include/PolyVoxCore/Log.h
+	include/PolyVoxCore/Material.h
+	include/PolyVoxCore/MaterialDensityPair.h
+	include/PolyVoxCore/MeshDecimator.h
+	include/PolyVoxCore/MeshDecimator.inl
+	include/PolyVoxCore/PolyVoxForwardDeclarations.h
+	include/PolyVoxCore/Raycast.h
+	include/PolyVoxCore/Raycast.inl
+	include/PolyVoxCore/RaycastWithCallback.h
+	include/PolyVoxCore/RaycastWithCallback.inl
+	include/PolyVoxCore/Region.h
+	include/PolyVoxCore/SimpleVolume.h
+	include/PolyVoxCore/SimpleVolume.inl
+	include/PolyVoxCore/SimpleVolumeSampler.inl
+	include/PolyVoxCore/SurfaceExtractor.h
+	include/PolyVoxCore/SurfaceExtractor.inl
+	include/PolyVoxCore/SurfaceMesh.h
+	include/PolyVoxCore/SurfaceMesh.inl
+	include/PolyVoxCore/Vector.h
+	include/PolyVoxCore/Vector.inl
+	include/PolyVoxCore/VertexTypes.h
+	include/PolyVoxCore/VoxelFilters.h
 )
 
 SET(IMPL_SRC_FILES

library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h

@@ -24,10 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_AStarPathfinder_H__
 #define __PolyVox_AStarPathfinder_H__
 
-#include "Array.h"
+#include "PolyVoxCore/Array.h"
 #include "PolyVoxImpl/AStarPathfinderImpl.h"
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -189,6 +189,6 @@ namespace PolyVox
 	};
 }
 
-#include "AStarPathfinder.inl"
+#include "PolyVoxCore/AStarPathfinder.inl"
 
 #endif //__PolyVox_AStarPathfinder_H__

library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include <Material.h>
+#include "PolyVoxCore/Material.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __AmbientOcclusionCalculator_H__
 #define __AmbientOcclusionCalculator_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {
@@ -53,6 +53,6 @@ namespace PolyVox
 	};
 }
 
-#include "AmbientOcclusionCalculator.inl"
+#include "PolyVoxCore/AmbientOcclusionCalculator.inl"
 
 #endif //__AmbientOcclusionCalculator_H__

library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl

@@ -21,9 +21,9 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Array.h"
-#include "Raycast.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/Raycast.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/RandomUnitVectors.h"
 #include "PolyVoxImpl/RandomVectors.h"

library/PolyVoxCore/include/PolyVoxCore/Array.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Array_H__
 #define __PolyVox_Array_H__
 
-#include "ArraySizes.h" //Not strictly required, but convienient
+#include "PolyVoxCore/ArraySizes.h" //Not strictly required, but convienient
 
 #include "PolyVoxImpl/SubArray.h"
 
@@ -205,6 +205,6 @@ namespace PolyVox
 	typedef Array<3,uint32_t> Array3DUint32;
 }//namespace PolyVox
 
-#include "Array.inl"
+#include "PolyVoxCore/Array.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_ConstVolumeProxy_H__
 #define __PolyVox_ConstVolumeProxy_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h

@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_CubicSurfaceExtractor_H__
 #define __PolyVox_CubicSurfaceExtractor_H__
 
-#include "Array.h"
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -70,6 +70,6 @@ namespace PolyVox
 	};
 }
 
-#include "CubicSurfaceExtractor.inl"
+#include "PolyVoxCore/CubicSurfaceExtractor.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl

@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_CubicSurfaceExtractorWithNormals_H__
 #define __PolyVox_CubicSurfaceExtractorWithNormals_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -52,6 +52,6 @@ namespace PolyVox
 	};
 }
 
-#include "CubicSurfaceExtractorWithNormals.inl"
+#include "PolyVoxCore/CubicSurfaceExtractorWithNormals.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl

@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/Density.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Density_H__
 #define __PolyVox_Density_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox

library/PolyVoxCore/include/PolyVoxCore/Filters.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Filters_H__
 #define __PolyVox_Filters_H__
 
-#include "Array.h"
-#include "Region.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/Region.h"
 
 namespace PolyVox
 {
@@ -33,6 +33,6 @@ namespace PolyVox
 	void smoothRegion(VolumeType<VoxelType>& volData, const Region& regionToSmooth);
 }//namespace PolyVox
 
-#include "Filters.inl"
+#include "PolyVoxCore/Filters.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/Filters.inl

@@ -1,4 +1,4 @@
-#include "MaterialDensityPair.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h

@@ -28,7 +28,7 @@ freely, subject to the following restrictions:
 
 #include <vector>
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {
@@ -60,6 +60,6 @@ namespace PolyVox
 	//POLYVOX_API Vector3DFloat computeNormal(VolumeType<uint8_t>* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod);
 }
 
-#include "GradientEstimators.inl"
+#include "PolyVoxCore/GradientEstimators.inl"
 
 #endif //__PolyVox_GradientEstimators_H__

library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl

@@ -21,9 +21,9 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "VoxelFilters.h"
+#include "PolyVoxCore/VoxelFilters.h"
 
-#include "LargeVolume.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.h

@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_ImprovedCubicSurfaceExtractor_H__
 #define __PolyVox_ImprovedCubicSurfaceExtractor_H__
 
-#include "Array.h"
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -95,6 +95,6 @@ namespace PolyVox
 	};
 }
 
-#include "ImprovedCubicSurfaceExtractor.inl"
+#include "PolyVoxCore/ImprovedCubicSurfaceExtractor.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.inl

@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h

@@ -25,8 +25,8 @@ freely, subject to the following restrictions:
 #define __PolyVox_Volume_H__
 
 #include "PolyVoxImpl/Block.h"
-#include "Region.h"
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include <limits>
 #include <map>
@@ -359,7 +359,7 @@ private:
 	};
 }
 
-#include "LargeVolume.inl"
-#include "LargeVolumeSampler.inl"
+#include "PolyVoxCore/LargeVolume.inl"
+#include "PolyVoxCore/LargeVolumeSampler.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl

@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "ConstVolumeProxy.h"
+#include "PolyVoxCore/ConstVolumeProxy.h"
 #include "PolyVoxImpl/Block.h"
-#include "Log.h"
-#include "Region.h"
-#include "Vector.h"
+#include "PolyVoxCore/Log.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <limits>
 #include <cassert>

library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl

@@ -22,9 +22,9 @@ freely, subject to the following restrictions:
 *******************************************************************************/
 
 #include "PolyVoxImpl/Block.h"
-#include "LargeVolume.h"
-#include "Vector.h"
-#include "Region.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/Region.h"
 
 #define BORDER_LOW(x) ((( x >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != x)
 #define BORDER_HIGH(x) ((( (x+1) >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != (x+1))

library/PolyVoxCore/include/PolyVoxCore/Material.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Material_H__
 #define __PolyVox_Material_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 #include <cassert>

library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MaterialDensityPair_H__
 #define __PolyVox_MaterialDensityPair_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox

library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MeshDecimator_H__
 #define __PolyVox_MeshDecimator_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <bitset>
 #include <vector>
@@ -178,6 +178,6 @@ namespace PolyVox
 	};
 }
 
-#include "MeshDecimator.inl"
+#include "PolyVoxCore/MeshDecimator.inl"
 
 #endif //__PolyVox_MeshDecimator_H__

library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/Raycast.h

@@ -109,6 +109,6 @@ namespace PolyVox
 	};
 }
 
-#include "Raycast.inl"
+#include "PolyVoxCore/Raycast.inl"
 
 #endif //__PolyVox_Raycast_H__

library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h

@@ -55,6 +55,6 @@ namespace PolyVox
 	};
 }
 
-#include "RaycastWithCallback.inl"
+#include "PolyVoxCore/RaycastWithCallback.inl"
 
 #endif //__PolyVox_RaycastWithCallback_H__

library/PolyVoxCore/include/PolyVoxCore/Region.h

@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_Region_H__
 
 #include "PolyVoxImpl/TypeDef.h"
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SimpleVolume_H__
 #define __PolyVox_SimpleVolume_H__
 
-#include "Region.h"
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include <limits>
 #include <memory>
@@ -212,8 +212,8 @@ private:
 	};
 }
 
-#include "SimpleVolumeBlock.inl"
-#include "SimpleVolume.inl"
-#include "SimpleVolumeSampler.inl"
+#include "PolyVoxCore/SimpleVolumeBlock.inl"
+#include "PolyVoxCore/SimpleVolume.inl"
+#include "PolyVoxCore/SimpleVolumeSampler.inl"
 
 #endif //__PolyVox_SimpleVolume_H__

library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl

@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "ConstVolumeProxy.h"
+#include "PolyVoxCore/ConstVolumeProxy.h"
 #include "PolyVoxImpl/Block.h"
-#include "Log.h"
-#include "Region.h"
-#include "Vector.h"
+#include "PolyVoxCore/Log.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <limits>
 #include <cassert>

library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl

@@ -22,9 +22,9 @@ freely, subject to the following restrictions:
 *******************************************************************************/
 
 #include "PolyVoxImpl/Block.h"
-#include "SimpleVolume.h"
-#include "Vector.h"
-#include "Region.h"
+#include "PolyVoxCore/SimpleVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/Region.h"
 
 #define BORDER_LOW(x) ((( x >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != x)
 #define BORDER_HIGH(x) ((( (x+1) >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != (x+1))

library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SurfaceExtractor_H__
 #define __PolyVox_SurfaceExtractor_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -202,6 +202,6 @@ namespace PolyVox
 	};
 }
 
-#include "SurfaceExtractor.inl"
+#include "PolyVoxCore/SurfaceExtractor.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl

@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h

@@ -28,9 +28,9 @@ freely, subject to the following restrictions:
 #include <set>
 #include <memory>
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
@@ -98,6 +98,6 @@ namespace PolyVox
 	polyvox_shared_ptr< SurfaceMesh<VertexType> > extractSubset(SurfaceMesh<VertexType>& inputMesh, std::set<uint8_t> setMaterials);
 }
 
-#include "SurfaceMesh.inl"
+#include "PolyVoxCore/SurfaceMesh.inl"
 
 #endif /* __SurfaceMesh_H__ */

library/PolyVoxCore/include/PolyVoxCore/Vector.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Vector_H__
 #define __PolyVox_Vector_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include <iostream>
 
@@ -184,7 +184,7 @@ namespace PolyVox
 
 }//namespace PolyVox
 
-#include "Vector.inl"
+#include "PolyVoxCore/Vector.inl"
 
 #endif
 

library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h

@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_SurfaceVertex_H__
 
 #include "PolyVoxImpl/TypeDef.h"
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <bitset>
 #include <vector>

library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h

@@ -24,10 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_VoxelFilters_H__
 #define __PolyVox_VoxelFilters_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
-#include "LargeVolume.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_AStarPathfinderImpl_H__
 #define __PolyVox_AStarPathfinderImpl_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <limits> //For numeric_limits
 #include <set>

library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h

@@ -24,7 +24,7 @@ distribution.
 #ifndef __PolyVox_ArraySizesImpl_H__
 #define __PolyVox_ArraySizesImpl_H__
 
-#include "TypeDef.h"
+#include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
 {
@@ -56,6 +56,6 @@ namespace PolyVox
 	};
 }//namespace PolyVox
 
-#include "ArraySizesImpl.inl"
+#include "PolyVoxImpl/ArraySizesImpl.inl"
 
 #endif //__PolyVox_ArraySizesImpl_H__

library/PolyVoxCore/include/PolyVoxImpl/Block.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Block_H__
 #define __PolyVox_Block_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include <limits>
 #include <vector>
 
@@ -73,6 +73,6 @@ namespace PolyVox
 	};
 }
 
-#include "Block.inl"
+#include "PolyVoxImpl/Block.inl"
 
 #endif

library/PolyVoxCore/include/PolyVoxImpl/Block.inl

@@ -22,8 +22,8 @@ freely, subject to the following restrictions:
 *******************************************************************************/
 
 #include "PolyVoxImpl/Utility.h"
-#include "Vector.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include <cassert>
 #include <cstring> //For memcpy

library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MarchingCubeTables_H__
 #define __PolyVox_MarchingCubeTables_H__
 
-#include "TypeDef.h"
+#include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RandomUnitVectors_H__
 #define __PolyVox_RandomUnitVectors_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {	

library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RandomVectors_H__
 #define __PolyVox_RandomVectors_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {	

library/PolyVoxCore/include/PolyVoxImpl/SubArray.h

@@ -81,6 +81,6 @@ namespace PolyVox
 	};
 }//namespace PolyVox
 
-#include "SubArray.inl"
+#include "PolyVoxImpl/SubArray.inl"
 
 #endif //__PolyVox_SubArray_H__

library/PolyVoxCore/include/PolyVoxImpl/Utility.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Utility_H__
 #define __PolyVox_Utility_H__
 
-#include "TypeDef.h"
+#include "PolyVoxImpl/TypeDef.h"
 
 #include <cassert>
 

library/PolyVoxCore/source/AStarPathfinder.cpp

@@ -21,9 +21,9 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "AStarPathfinder.h"
+#include "PolyVoxCore/AStarPathfinder.h"
 
-#include "Material.h"
+#include "PolyVoxCore/Material.h"
 
 using namespace PolyVox;
 

library/PolyVoxCore/source/ArraySizes.cpp

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "ArraySizes.h"
+#include "PolyVoxCore/ArraySizes.h"
 
 namespace PolyVox
 {	

library/PolyVoxCore/source/GradientEstimators.cpp

@@ -21,12 +21,12 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "GradientEstimators.h"
-#include "SurfaceMesh.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/GradientEstimators.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
-#include "LargeVolume.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 using namespace std;
 

library/PolyVoxCore/source/Log.cpp

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Log.h"
+#include "PolyVoxCore/Log.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/source/MeshDecimator.cpp

@@ -1,6 +1,6 @@
-#include "MeshDecimator.h"
+#include "PolyVoxCore/MeshDecimator.h"
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/source/Region.cpp

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Region.h"
+#include "PolyVoxCore/Region.h"
 
 #include <limits>
 

library/PolyVoxCore/source/VertexTypes.cpp

@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include <sstream>
 
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {

library/PolyVoxCore/source/VoxelFilters.cpp

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "VoxelFilters.h"
+#include "PolyVoxCore/VoxelFilters.h"
 
 namespace PolyVox
 {

library/PolyVoxUtil/CMakeLists.txt

@@ -9,10 +9,10 @@ SET(UTIL_SRC_FILES
 
 #Projects headers files
 SET(UTIL_INC_FILES
-	include/Serialization.h
-	include/Serialization.inl
-	include/VolumeChangeTracker.h	
-	include/VolumeChangeTracker.inl
+	include/PolyVoxUtil/Serialization.h
+	include/PolyVoxUtil/Serialization.inl
+	include/PolyVoxUtil/VolumeChangeTracker.h	
+	include/PolyVoxUtil/VolumeChangeTracker.inl
 )
 
 ADD_DEFINITIONS(-DPOLYVOX_SHARED_EXPORTS) #Export symbols in the .dll

library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Serialization_H__
 #define __PolyVox_Serialization_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
 
 #include <iostream>
 #include <memory>
@@ -66,6 +66,6 @@ namespace PolyVox
 	bool saveVersion0(std::ostream& stream, VolumeType<VoxelType>& volume, VolumeSerializationProgressListener* progressListener = 0);
 }
 
-#include "Serialization.inl"
+#include "PolyVoxUtil/Serialization.inl"
 
 #endif

library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h

@@ -26,8 +26,8 @@ freely, subject to the following restrictions:
 
 #include <list>
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
 
 namespace PolyVox
 {	
@@ -76,6 +76,6 @@ namespace PolyVox
 	};
 }
 
-#include "VolumeChangeTracker.inl"
+#include "PolyVoxUtil/VolumeChangeTracker.inl"
 
 #endif

library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl

@@ -21,15 +21,13 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "VolumeChangeTracker.h"
-
-#include "GradientEstimators.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/GradientEstimators.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/Utility.h"
-#include "Vector.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {

tests/TestArray.cpp

@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "TestArray.h"
 
-#include <Array.h>
+#include "PolyVoxCore/Array.h"
 
 #include <QtTest>
 

tests/testmaterial.cpp

@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "testmaterial.h"
 
-#include <Material.h>
+#include "PolyVoxCore/Material.h"
 
 #include <QtTest>
 

tests/testvector.cpp

@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "testvector.h"
 
-#include <Vector.h>
+#include "PolyVoxCore/Vector.h"
 
 #include <QtTest>
 

tests/testvolume.cpp

@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "testvolume.h"
 
-#include <LargeVolume.h>
+#include "PolyVoxCore/LargeVolume.h"
 
 #include <QtTest>