Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.

examples/Basic/main.cpp

@@ -23,10 +23,10 @@ freely, subject to the following restrictions:
 
 #include "OpenGLWidget.h"
 
-#include "PolyVoxCore/CubicSurfaceExtractor.h"
+#include "PolyVox/CubicSurfaceExtractor.h"
-#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h"
+#include "PolyVox/MarchingCubesSurfaceExtractor.h"
-#include "PolyVoxCore/Mesh.h"
+#include "PolyVox/Mesh.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
 
 #include <QApplication>
 

examples/DecodeOnGPU/main.cpp

@@ -23,10 +23,10 @@ freely, subject to the following restrictions:
 
 #include "OpenGLWidget.h"
 
-#include "PolyVoxCore/CubicSurfaceExtractor.h"
+#include "PolyVox/CubicSurfaceExtractor.h"
-#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h"
+#include "PolyVox/MarchingCubesSurfaceExtractor.h"
-#include "PolyVoxCore/Mesh.h"
+#include "PolyVox/Mesh.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
 
 #include <QApplication>
 

examples/OpenGL/Shapes.cpp

@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "Shapes.h"
 
-#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVox/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 "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
-#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVox/MaterialDensityPair.h"
 
 void createSphereInVolume(PolyVox::LargeVolume<PolyVox::MaterialDensityPair88>& volData, float fRadius, uint8_t uValue);
 void createCubeInVolume(PolyVox::LargeVolume<PolyVox::MaterialDensityPair88>& volData, PolyVox::Vector3DInt32 lowerCorner, PolyVox::Vector3DInt32 upperCorner, uint8_t uValue);

examples/OpenGL/main.cpp

@@ -21,13 +21,13 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/FilePager.h"
+#include "PolyVox/FilePager.h"
-#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h"
+#include "PolyVox/MarchingCubesSurfaceExtractor.h"
-#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVox/MaterialDensityPair.h"
-#include "PolyVoxCore/LowPassFilter.h"
+#include "PolyVox/LowPassFilter.h"
-#include "PolyVoxCore/RawVolume.h"
+#include "PolyVox/RawVolume.h"
-#include "PolyVoxCore/Mesh.h"
+#include "PolyVox/Mesh.h"
-#include "PolyVoxCore/Impl/Utility.h"
+#include "PolyVox/Impl/Utility.h"
 
 #include "Shapes.h"
 

examples/Paging/main.cpp

@@ -24,11 +24,11 @@ freely, subject to the following restrictions:
 #include "OpenGLWidget.h"
 #include "Perlin.h"
 
-#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVox/MaterialDensityPair.h"
-#include "PolyVoxCore/CubicSurfaceExtractor.h"
+#include "PolyVox/CubicSurfaceExtractor.h"
-#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h"
+#include "PolyVox/MarchingCubesSurfaceExtractor.h"
-#include "PolyVoxCore/Mesh.h"
+#include "PolyVox/Mesh.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
 
 #include <QApplication>
 

examples/SmoothLOD/main.cpp

@@ -23,12 +23,12 @@ freely, subject to the following restrictions:
 
 #include "OpenGLWidget.h"
 
-#include "PolyVoxCore/Density.h"
+#include "PolyVox/Density.h"
-#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h"
+#include "PolyVox/MarchingCubesSurfaceExtractor.h"
-#include "PolyVoxCore/Mesh.h"
+#include "PolyVox/Mesh.h"
-#include "PolyVoxCore/RawVolume.h"
+#include "PolyVox/RawVolume.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
-#include "PolyVoxCore/VolumeResampler.h"
+#include "PolyVox/VolumeResampler.h"
 
 #include <QApplication>
 

examples/common/OpenGLWidget.h

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

include/CMakeLists.txt

@@ -26,69 +26,69 @@ PROJECT(PolyVoxHeaders)
 
 #Projects headers files
 SET(CORE_INC_FILES
-	PolyVoxCore/AmbientOcclusionCalculator.h
+	PolyVox/AmbientOcclusionCalculator.h
-	PolyVoxCore/AmbientOcclusionCalculator.inl
+	PolyVox/AmbientOcclusionCalculator.inl
-	PolyVoxCore/Array.h
+	PolyVox/Array.h
-	PolyVoxCore/AStarPathfinder.h
+	PolyVox/AStarPathfinder.h
-	PolyVoxCore/AStarPathfinder.inl
+	PolyVox/AStarPathfinder.inl
-	PolyVoxCore/BaseVolume.h
+	PolyVox/BaseVolume.h
-	PolyVoxCore/BaseVolume.inl
+	PolyVox/BaseVolume.inl
-	PolyVoxCore/BaseVolumeSampler.inl
+	PolyVox/BaseVolumeSampler.inl
-	PolyVoxCore/CubicSurfaceExtractor.h
+	PolyVox/CubicSurfaceExtractor.h
-	PolyVoxCore/CubicSurfaceExtractor.inl
+	PolyVox/CubicSurfaceExtractor.inl
-	PolyVoxCore/DefaultIsQuadNeeded.h
+	PolyVox/DefaultIsQuadNeeded.h
-	PolyVoxCore/DefaultMarchingCubesController.h
+	PolyVox/DefaultMarchingCubesController.h
-	PolyVoxCore/Density.h
+	PolyVox/Density.h
-	PolyVoxCore/FilePager.h
+	PolyVox/FilePager.h
-	PolyVoxCore/GradientEstimators.h
+	PolyVox/GradientEstimators.h
-	PolyVoxCore/GradientEstimators.inl
+	PolyVox/GradientEstimators.inl
-	PolyVoxCore/Interpolation.h
+	PolyVox/Interpolation.h
-	PolyVoxCore/IteratorController.h
+	PolyVox/IteratorController.h
-	PolyVoxCore/IteratorController.inl
+	PolyVox/IteratorController.inl
-	PolyVoxCore/LargeVolume.h
+	PolyVox/LargeVolume.h
-	PolyVoxCore/LowPassFilter.h
+	PolyVox/LowPassFilter.h
-	PolyVoxCore/LowPassFilter.inl
+	PolyVox/LowPassFilter.inl
-	PolyVoxCore/MarchingCubesSurfaceExtractor.h
+	PolyVox/MarchingCubesSurfaceExtractor.h
-	PolyVoxCore/MarchingCubesSurfaceExtractor.inl
+	PolyVox/MarchingCubesSurfaceExtractor.inl
-	PolyVoxCore/Material.h
+	PolyVox/Material.h
-	PolyVoxCore/MaterialDensityPair.h
+	PolyVox/MaterialDensityPair.h
-	PolyVoxCore/Mesh.h
+	PolyVox/Mesh.h
-	PolyVoxCore/Mesh.inl
+	PolyVox/Mesh.inl
-	PolyVoxCore/PagedVolume.h
+	PolyVox/PagedVolume.h
-	PolyVoxCore/PagedVolume.inl
+	PolyVox/PagedVolume.inl
-	PolyVoxCore/PagedVolumeChunk.inl
+	PolyVox/PagedVolumeChunk.inl
-	PolyVoxCore/PagedVolumeSampler.inl
+	PolyVox/PagedVolumeSampler.inl
-	PolyVoxCore/PolyVoxForwardDeclarations.h
+	PolyVox/PolyVoxForwardDeclarations.h
-	PolyVoxCore/Picking.h
+	PolyVox/Picking.h
-	PolyVoxCore/Picking.inl
+	PolyVox/Picking.inl
-	PolyVoxCore/RawVolume.h
+	PolyVox/RawVolume.h
-	PolyVoxCore/RawVolume.inl
+	PolyVox/RawVolume.inl
-	PolyVoxCore/RawVolumeSampler.inl
+	PolyVox/RawVolumeSampler.inl
-	PolyVoxCore/Raycast.h
+	PolyVox/Raycast.h
-	PolyVoxCore/Raycast.inl
+	PolyVox/Raycast.inl
-	PolyVoxCore/Region.h
+	PolyVox/Region.h
-	PolyVoxCore/Region.inl
+	PolyVox/Region.inl
-	PolyVoxCore/SimpleVolume.h
+	PolyVox/SimpleVolume.h
-	PolyVoxCore/Vector.h
+	PolyVox/Vector.h
-	PolyVoxCore/Vector.inl
+	PolyVox/Vector.inl
-	PolyVoxCore/Vertex.h
+	PolyVox/Vertex.h
-	PolyVoxCore/VolumeResampler.h
+	PolyVox/VolumeResampler.h
-	PolyVoxCore/VolumeResampler.inl
+	PolyVox/VolumeResampler.inl
-	PolyVoxCore/VoxelFilters.h
+	PolyVox/VoxelFilters.h
-	PolyVoxCore/VoxelFilters.inl
+	PolyVox/VoxelFilters.inl
 )
 
 SET(IMPL_INC_FILES
-	PolyVoxCore/Impl/AStarPathfinderImpl.h
+	PolyVox/Impl/AStarPathfinderImpl.h
-    PolyVoxCore/Impl/Config.h
+    PolyVox/Impl/Config.h
-	PolyVoxCore/Impl/ErrorHandling.h
+	PolyVox/Impl/ErrorHandling.h
-	PolyVoxCore/Impl/Logging.h
+	PolyVox/Impl/Logging.h
-	PolyVoxCore/Impl/MarchingCubesTables.h
+	PolyVox/Impl/MarchingCubesTables.h
-	PolyVoxCore/Impl/RandomUnitVectors.h
+	PolyVox/Impl/RandomUnitVectors.h
-	PolyVoxCore/Impl/RandomVectors.h
+	PolyVox/Impl/RandomVectors.h
-	PolyVoxCore/Impl/Timer.h
+	PolyVox/Impl/Timer.h
-	PolyVoxCore/Impl/TypeDef.h
+	PolyVox/Impl/TypeDef.h
-	PolyVoxCore/Impl/Utility.h
+	PolyVox/Impl/Utility.h
 )
 
 #NOTE: The following line should be uncommented when building shared libs.

include/PolyVox/AStarPathfinder.h

@@ -224,6 +224,6 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVoxCore/AStarPathfinder.inl"
+#include "PolyVox/AStarPathfinder.inl"
 
 #endif //__PolyVox_AStarPathfinder_H__

include/PolyVox/AStarPathfinder.inl

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

include/PolyVox/AmbientOcclusionCalculator.h

@@ -27,13 +27,13 @@ freely, subject to the following restrictions:
 #include "Impl/RandomUnitVectors.h"
 #include "Impl/RandomVectors.h"
 
-#include "PolyVoxCore/Array.h"
+#include "PolyVox/Array.h"
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
-#include "PolyVoxCore/Raycast.h"
+#include "PolyVox/Raycast.h"
 
 //These two should not be here!
-#include "PolyVoxCore/Material.h"
+#include "PolyVox/Material.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
 
 #include <algorithm>
 
@@ -77,6 +77,6 @@ namespace PolyVox
 	void calculateAmbientOcclusion(VolumeType* volInput, Array<3, uint8_t>* arrayResult, Region region, float fRayLength, uint8_t uNoOfSamplesPerOutputElement, IsVoxelTransparentCallback isVoxelTransparentCallback);
 }
 
-#include "PolyVoxCore/AmbientOcclusionCalculator.inl"
+#include "PolyVox/AmbientOcclusionCalculator.inl"
 
 #endif //__AmbientOcclusionCalculator_H__

include/PolyVox/Array.h

@@ -24,7 +24,7 @@ distribution.
 #ifndef __PolyVox_Array_H__
 #define __PolyVox_Array_H__
 
-#include <PolyVoxCore/Impl/ErrorHandling.h>
+#include <PolyVox/Impl/ErrorHandling.h>
 
 #include <cstdint>
 

include/PolyVox/BaseVolume.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_BaseVolume_H__
 #define __PolyVox_BaseVolume_H__
 
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 #include <limits>
 
@@ -211,7 +211,7 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVoxCore/BaseVolume.inl"
+#include "PolyVox/BaseVolume.inl"
-#include "PolyVoxCore/BaseVolumeSampler.inl"
+#include "PolyVox/BaseVolumeSampler.inl"
 
 #endif //__PolyVox_BaseVolume_H__

include/PolyVox/BaseVolumeSampler.inl

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

include/PolyVox/CubicSurfaceExtractor.h

@@ -28,11 +28,11 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxForwardDeclarations.h"
 
-#include "PolyVoxCore/Array.h"
+#include "PolyVox/Array.h"
-#include "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these?
+#include "PolyVox/BaseVolume.h" //For wrap modes... should move these?
-#include "PolyVoxCore/DefaultIsQuadNeeded.h"
+#include "PolyVox/DefaultIsQuadNeeded.h"
-#include "PolyVoxCore/Mesh.h"
+#include "PolyVox/Mesh.h"
-#include "PolyVoxCore/Vertex.h"
+#include "PolyVox/Vertex.h"
 
 namespace PolyVox
 {
@@ -223,6 +223,6 @@ namespace PolyVox
 	}
 }
 
-#include "PolyVoxCore/CubicSurfaceExtractor.inl"
+#include "PolyVox/CubicSurfaceExtractor.inl"
 
 #endif

include/PolyVox/CubicSurfaceExtractor.inl

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

include/PolyVox/DefaultIsQuadNeeded.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_DefaultIsQuadNeeded_H__
 #define __PolyVox_DefaultIsQuadNeeded_H__
 
-#include "PolyVoxCore/Impl/TypeDef.h"
+#include "PolyVox/Impl/TypeDef.h"
 
 #include <cstdint>
 

include/PolyVox/DefaultMarchingCubesController.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MarchingCubesController_H__
 #define __PolyVox_MarchingCubesController_H__
 
-#include "PolyVoxCore/BaseVolume.h"
+#include "PolyVox/BaseVolume.h"
 
 #include <limits>
 

include/PolyVox/Density.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Density_H__
 #define __PolyVox_Density_H__
 
-#include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
+#include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
 
 #include "Impl/TypeDef.h"
 

include/PolyVox/FilePager.h

@@ -24,10 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_FilePager_H__
 #define __PolyVox_FilePager_H__
 
-#include "PolyVoxCore/Impl/TypeDef.h"
+#include "PolyVox/Impl/TypeDef.h"
 
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
 
 #include <cstdlib>
 #include <ctime>

include/PolyVox/GradientEstimators.h

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

include/PolyVox/Impl/AStarPathfinderImpl.h

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

include/PolyVox/Impl/ErrorHandling.h

@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_ErrorHandling_H__
 #define __PolyVox_ErrorHandling_H__
 
-#include "PolyVoxCore/Impl/Config.h"
+#include "PolyVox/Impl/Config.h"
 
-#include "PolyVoxCore/Impl/Logging.h"
+#include "PolyVox/Impl/Logging.h"
 
 #include <cstdlib>  // For std::exit
 #include <iostream> // For std::cerr

include/PolyVox/Impl/Logging.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Logging_H__
 #define __PolyVox_Logging_H__
 
-#include "PolyVoxCore/Impl/Config.h"
+#include "PolyVox/Impl/Config.h"
 
 #include <iostream>
 #include <sstream>

include/PolyVox/Impl/MarchingCubesTables.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MarchingCubeTables_H__
 #define __PolyVox_MarchingCubeTables_H__
 
-#include "PolyVoxCore/Impl/TypeDef.h"
+#include "PolyVox/Impl/TypeDef.h"
 
 #include <cstdint>
 

include/PolyVox/Impl/RandomUnitVectors.h

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

include/PolyVox/Impl/RandomVectors.h

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

include/PolyVox/Impl/Utility.h

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

include/PolyVox/IteratorController.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_IteratorController_H__
 #define __PolyVox_IteratorController_H__
 
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
 
 namespace PolyVox
 {
@@ -41,6 +41,6 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVoxCore/IteratorController.inl"
+#include "PolyVox/IteratorController.inl"
 
 #endif //__PolyVox_IteratorController_H__

include/PolyVox/LowPassFilter.h

@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_LowPassFilter_H__
 #define __PolyVox_LowPassFilter_H__
 
-#include "PolyVoxCore/IteratorController.h"
+#include "PolyVox/IteratorController.h"
-#include "PolyVoxCore/RawVolume.h" //Is this desirable?
+#include "PolyVox/RawVolume.h" //Is this desirable?
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
 
 namespace PolyVox
 {
@@ -54,7 +54,7 @@ namespace PolyVox
 
 }//namespace PolyVox
 
-#include "PolyVoxCore/LowPassFilter.inl"
+#include "PolyVox/LowPassFilter.inl"
 
 #endif //__PolyVox_LowPassFilter_H__
 

include/PolyVox/MarchingCubesSurfaceExtractor.h

@@ -27,11 +27,11 @@ freely, subject to the following restrictions:
 #include "Impl/MarchingCubesTables.h"
 #include "Impl/TypeDef.h"
 
-#include "PolyVoxCore/Array.h"
+#include "PolyVox/Array.h"
-#include "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these?
+#include "PolyVox/BaseVolume.h" //For wrap modes... should move these?
-#include "PolyVoxCore/Mesh.h"
+#include "PolyVox/Mesh.h"
-#include "PolyVoxCore/DefaultMarchingCubesController.h"
+#include "PolyVox/DefaultMarchingCubesController.h"
-#include "PolyVoxCore/Vertex.h"
+#include "PolyVox/Vertex.h"
 
 namespace PolyVox
 {
@@ -353,6 +353,6 @@ namespace PolyVox
 	}
 }
 
-#include "PolyVoxCore/MarchingCubesSurfaceExtractor.inl"
+#include "PolyVox/MarchingCubesSurfaceExtractor.inl"
 
 #endif

include/PolyVox/MarchingCubesSurfaceExtractor.inl

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

include/PolyVox/Material.h

@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 
 #include "Impl/TypeDef.h"
 
-#include "PolyVoxCore/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
+#include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
 
 namespace PolyVox
 {

include/PolyVox/MaterialDensityPair.h

@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MaterialDensityPair_H__
 #define __PolyVox_MaterialDensityPair_H__
 
-#include "PolyVoxCore/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
+#include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
-#include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
+#include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
 
 #include "Impl/TypeDef.h"
 

include/PolyVox/Mesh.h

@@ -26,9 +26,9 @@ freely, subject to the following restrictions:
 
 #include "Impl/TypeDef.h"
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVox/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
-#include "PolyVoxCore/Vertex.h" //Should probably do away with this on in the future...
+#include "PolyVox/Vertex.h" //Should probably do away with this on in the future...
 
 #include <algorithm>
 #include <cstdlib>
@@ -98,6 +98,6 @@ namespace PolyVox
 	}
 }
 
-#include "PolyVoxCore/Mesh.inl"
+#include "PolyVox/Mesh.inl"
 
 #endif /* __Mesh_H__ */

include/PolyVox/PagedVolume.h

@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_PagedVolume_H__
 #define __PolyVox_PagedVolume_H__
 
-#include "PolyVoxCore/BaseVolume.h"
+#include "PolyVox/BaseVolume.h"
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 #include <limits>
 #include <cstdlib> //For abort()
@@ -359,8 +359,8 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVoxCore/PagedVolume.inl"
+#include "PolyVox/PagedVolume.inl"
-#include "PolyVoxCore/PagedVolumeChunk.inl"
+#include "PolyVox/PagedVolumeChunk.inl"
-#include "PolyVoxCore/PagedVolumeSampler.inl"
+#include "PolyVox/PagedVolumeSampler.inl"
 
 #endif //__PolyVox_PagedVolume_H__

include/PolyVox/PagedVolume.inl

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

include/PolyVox/PagedVolumeChunk.inl

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

include/PolyVox/Picking.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Picking_H__
 #define __PolyVox_Picking_H__
 
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 namespace PolyVox
 {
@@ -44,6 +44,6 @@ namespace PolyVox
 	PickResult pickVoxel(VolumeType* volData, const Vector3DFloat& v3dStart, const Vector3DFloat& v3dDirectionAndLength, const typename VolumeType::VoxelType& emptyVoxelExample);
 }
 
-#include "PolyVoxCore/Picking.inl"
+#include "PolyVox/Picking.inl"
 
 #endif //__PolyVox_Picking_H__

include/PolyVox/Picking.inl

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

include/PolyVox/RawVolume.h

@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RawVolume_H__
 #define __PolyVox_RawVolume_H__
 
-#include "PolyVoxCore/BaseVolume.h"
+#include "PolyVox/BaseVolume.h"
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 #include <cstdlib> //For abort()
 #include <limits>
@@ -167,7 +167,7 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVoxCore/RawVolume.inl"
+#include "PolyVox/RawVolume.inl"
-#include "PolyVoxCore/RawVolumeSampler.inl"
+#include "PolyVox/RawVolumeSampler.inl"
 
 #endif //__PolyVox_RawVolume_H__

include/PolyVox/Raycast.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Raycast_H__
 #define __PolyVox_Raycast_H__
 
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 namespace PolyVox
 {
@@ -98,6 +98,6 @@ namespace PolyVox
 	RaycastResult raycastWithDirection(VolumeType* volData, const Vector3DFloat& v3dStart, const Vector3DFloat& v3dDirectionAndLength, Callback& callback);
 }
 
-#include "PolyVoxCore/Raycast.inl"
+#include "PolyVox/Raycast.inl"
 
 #endif //__PolyVox_Raycast_H__

include/PolyVox/Region.h

@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 
 #include "Impl/TypeDef.h"
 
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 namespace PolyVox
 {
@@ -458,6 +458,6 @@ namespace PolyVox
 	}
 }
 
-#include "PolyVoxCore/Region.inl"
+#include "PolyVox/Region.inl"
 
 #endif

include/PolyVox/Vector.h

@@ -242,7 +242,7 @@ namespace std
 }
 
 
-#include "PolyVoxCore/Vector.inl"
+#include "PolyVox/Vector.inl"
 
 #endif
 

include/PolyVox/Vertex.h

@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 
 #include "Impl/TypeDef.h"
 
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 #include <bitset>
 #include <vector>

include/PolyVox/VolumeResampler.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_VolumeResampler_H__
 #define __PolyVox_VolumeResampler_H__
 
-#include "PolyVoxCore/Region.h"
+#include "PolyVox/Region.h"
 
 namespace PolyVox
 {
@@ -51,7 +51,7 @@ namespace PolyVox
 
 }//namespace PolyVox
 
-#include "PolyVoxCore/VolumeResampler.inl"
+#include "PolyVox/VolumeResampler.inl"
 
 #endif
 

include/PolyVox/VolumeResampler.inl

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

include/PolyVox/VoxelFilters.h

@@ -32,6 +32,6 @@ namespace PolyVox
 	float computeSmoothedVoxel(typename VolumeType::Sampler& volIter);
 }
 
-#include "PolyVoxCore/VoxelFilters.inl"
+#include "PolyVox/VoxelFilters.inl"
 
 #endif

tests/TestAStarPathfinder.cpp

@@ -23,9 +23,9 @@ freely, subject to the following restrictions:
 
 #include "TestAStarPathfinder.h"
 
-#include "PolyVoxCore/AStarPathfinder.h"
+#include "PolyVox/AStarPathfinder.h"
-#include "PolyVoxCore/Material.h"
+#include "PolyVox/Material.h"
-#include "PolyVoxCore/RawVolume.h"
+#include "PolyVox/RawVolume.h"
 
 #include <QtTest>
 

tests/TestAmbientOcclusionGenerator.cpp

@@ -23,8 +23,8 @@ freely, subject to the following restrictions:
 
 #include "TestAmbientOcclusionGenerator.h"
 
-#include "PolyVoxCore/AmbientOcclusionCalculator.h"
+#include "PolyVox/AmbientOcclusionCalculator.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
 
 #include <QtTest>
 

tests/TestArray.cpp

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

tests/TestCubicSurfaceExtractor.cpp

@@ -23,12 +23,12 @@ freely, subject to the following restrictions:
 
 #include "TestCubicSurfaceExtractor.h"
 
-#include "PolyVoxCore/Density.h"
+#include "PolyVox/Density.h"
-#include "PolyVoxCore/Material.h"
+#include "PolyVox/Material.h"
-#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVox/MaterialDensityPair.h"
-#include "PolyVoxCore/RawVolume.h"
+#include "PolyVox/RawVolume.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
-#include "PolyVoxCore/CubicSurfaceExtractor.h"
+#include "PolyVox/CubicSurfaceExtractor.h"
 
 #include <QtTest>
 

tests/TestLowPassFilter.cpp

@@ -23,9 +23,9 @@ freely, subject to the following restrictions:
 
 #include "TestLowPassFilter.h"
 
-#include "PolyVoxCore/Density.h"
+#include "PolyVox/Density.h"
-#include "PolyVoxCore/LowPassFilter.h"
+#include "PolyVox/LowPassFilter.h"
-#include "PolyVoxCore/RawVolume.h"
+#include "PolyVox/RawVolume.h"
 
 #include <QtTest>
 

tests/TestPicking.cpp

@@ -23,8 +23,8 @@ freely, subject to the following restrictions:
 
 #include "TestPicking.h"
 
-#include "PolyVoxCore/Picking.h"
+#include "PolyVox/Picking.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
 
 #include <QtTest>
 

tests/TestRaycast.cpp

@@ -23,11 +23,11 @@ freely, subject to the following restrictions:
 
 #include "TestRaycast.h"
 
-#include "PolyVoxCore/Density.h"
+#include "PolyVox/Density.h"
-#include "PolyVoxCore/Raycast.h"
+#include "PolyVox/Raycast.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
 
-#include "PolyVoxCore/Impl/RandomUnitVectors.h"
+#include "PolyVox/Impl/RandomUnitVectors.h"
 
 #include <QtTest>
 

tests/TestRegion.cpp

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

tests/TestSurfaceExtractor.cpp

@@ -23,12 +23,12 @@ freely, subject to the following restrictions:
 
 #include "TestSurfaceExtractor.h"
 
-#include "PolyVoxCore/Density.h"
+#include "PolyVox/Density.h"
-#include "PolyVoxCore/FilePager.h"
+#include "PolyVox/FilePager.h"
-#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVox/MaterialDensityPair.h"
-#include "PolyVoxCore/RawVolume.h"
+#include "PolyVox/RawVolume.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
-#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h"
+#include "PolyVox/MarchingCubesSurfaceExtractor.h"
 
 #include <QtTest>
 

tests/TestVolumeSubclass.cpp

@@ -23,12 +23,12 @@ freely, subject to the following restrictions:
 
 #include "TestVolumeSubclass.h"
 
-#include "PolyVoxCore/Array.h"
+#include "PolyVox/Array.h"
 
-#include "PolyVoxCore/BaseVolume.h"
+#include "PolyVox/BaseVolume.h"
-#include "PolyVoxCore/CubicSurfaceExtractor.h"
+#include "PolyVox/CubicSurfaceExtractor.h"
-#include "PolyVoxCore/Material.h"
+#include "PolyVox/Material.h"
-#include "PolyVoxCore/Vector.h"
+#include "PolyVox/Vector.h"
 
 #include <QtTest>
 

tests/testmaterial.cpp

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

tests/testvector.cpp

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

tests/testvolume.cpp

@@ -23,9 +23,9 @@ freely, subject to the following restrictions:
 
 #include "testvolume.h"
 
-#include "PolyVoxCore/FilePager.h"
+#include "PolyVox/FilePager.h"
-#include "PolyVoxCore/PagedVolume.h"
+#include "PolyVox/PagedVolume.h"
-#include "PolyVoxCore/RawVolume.h"
+#include "PolyVox/RawVolume.h"
 
 #include <QtGlobal>
 #include <QtTest>

tests/testvolume.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_TestVolume_H__
 #define __PolyVox_TestVolume_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVox/PolyVoxForwardDeclarations.h"
 
 #include <QObject>