diff --git a/examples/Basic/main.cpp b/examples/Basic/main.cpp index b2d7bb3d..3fba8964 100644 --- a/examples/Basic/main.cpp +++ b/examples/Basic/main.cpp @@ -23,10 +23,10 @@ freely, subject to the following restrictions: #include "OpenGLWidget.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/examples/DecodeOnGPU/main.cpp b/examples/DecodeOnGPU/main.cpp index a13dd677..52091119 100644 --- a/examples/DecodeOnGPU/main.cpp +++ b/examples/DecodeOnGPU/main.cpp @@ -23,10 +23,10 @@ freely, subject to the following restrictions: #include "OpenGLWidget.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/examples/OpenGL/Shapes.cpp b/examples/OpenGL/Shapes.cpp index 434ff1ca..1ebe6e58 100644 --- a/examples/OpenGL/Shapes.cpp +++ b/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; diff --git a/examples/OpenGL/Shapes.h b/examples/OpenGL/Shapes.h index 140fdea3..f2f5b193 100644 --- a/examples/OpenGL/Shapes.h +++ b/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 "PolyVoxCore/MaterialDensityPair.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/MaterialDensityPair.h" void createSphereInVolume(PolyVox::LargeVolume& volData, float fRadius, uint8_t uValue); void createCubeInVolume(PolyVox::LargeVolume& volData, PolyVox::Vector3DInt32 lowerCorner, PolyVox::Vector3DInt32 upperCorner, uint8_t uValue); diff --git a/examples/OpenGL/main.cpp b/examples/OpenGL/main.cpp index a76c2800..6e94c5b8 100644 --- a/examples/OpenGL/main.cpp +++ b/examples/OpenGL/main.cpp @@ -21,13 +21,13 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/FilePager.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/MaterialDensityPair.h" -#include "PolyVoxCore/LowPassFilter.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/Impl/Utility.h" +#include "PolyVox/FilePager.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/LowPassFilter.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/Impl/Utility.h" #include "Shapes.h" diff --git a/examples/Paging/main.cpp b/examples/Paging/main.cpp index a3e60356..09b325d8 100644 --- a/examples/Paging/main.cpp +++ b/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 "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/examples/SmoothLOD/main.cpp b/examples/SmoothLOD/main.cpp index da90282c..b8c56f08 100644 --- a/examples/SmoothLOD/main.cpp +++ b/examples/SmoothLOD/main.cpp @@ -23,12 +23,12 @@ freely, subject to the following restrictions: #include "OpenGLWidget.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/VolumeResampler.h" +#include "PolyVox/Density.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/VolumeResampler.h" #include diff --git a/examples/common/OpenGLWidget.h b/examples/common/OpenGLWidget.h index 4112a2fa..ba8fdedc 100644 --- a/examples/common/OpenGLWidget.h +++ b/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" diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 109d0a9e..db01270d 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -26,69 +26,69 @@ PROJECT(PolyVoxHeaders) #Projects headers files SET(CORE_INC_FILES - PolyVoxCore/AmbientOcclusionCalculator.h - PolyVoxCore/AmbientOcclusionCalculator.inl - PolyVoxCore/Array.h - PolyVoxCore/AStarPathfinder.h - PolyVoxCore/AStarPathfinder.inl - PolyVoxCore/BaseVolume.h - PolyVoxCore/BaseVolume.inl - PolyVoxCore/BaseVolumeSampler.inl - PolyVoxCore/CubicSurfaceExtractor.h - PolyVoxCore/CubicSurfaceExtractor.inl - PolyVoxCore/DefaultIsQuadNeeded.h - PolyVoxCore/DefaultMarchingCubesController.h - PolyVoxCore/Density.h - PolyVoxCore/FilePager.h - PolyVoxCore/GradientEstimators.h - PolyVoxCore/GradientEstimators.inl - PolyVoxCore/Interpolation.h - PolyVoxCore/IteratorController.h - PolyVoxCore/IteratorController.inl - PolyVoxCore/LargeVolume.h - PolyVoxCore/LowPassFilter.h - PolyVoxCore/LowPassFilter.inl - PolyVoxCore/MarchingCubesSurfaceExtractor.h - PolyVoxCore/MarchingCubesSurfaceExtractor.inl - PolyVoxCore/Material.h - PolyVoxCore/MaterialDensityPair.h - PolyVoxCore/Mesh.h - PolyVoxCore/Mesh.inl - PolyVoxCore/PagedVolume.h - PolyVoxCore/PagedVolume.inl - PolyVoxCore/PagedVolumeChunk.inl - PolyVoxCore/PagedVolumeSampler.inl - PolyVoxCore/PolyVoxForwardDeclarations.h - PolyVoxCore/Picking.h - PolyVoxCore/Picking.inl - PolyVoxCore/RawVolume.h - PolyVoxCore/RawVolume.inl - PolyVoxCore/RawVolumeSampler.inl - PolyVoxCore/Raycast.h - PolyVoxCore/Raycast.inl - PolyVoxCore/Region.h - PolyVoxCore/Region.inl - PolyVoxCore/SimpleVolume.h - PolyVoxCore/Vector.h - PolyVoxCore/Vector.inl - PolyVoxCore/Vertex.h - PolyVoxCore/VolumeResampler.h - PolyVoxCore/VolumeResampler.inl - PolyVoxCore/VoxelFilters.h - PolyVoxCore/VoxelFilters.inl + PolyVox/AmbientOcclusionCalculator.h + PolyVox/AmbientOcclusionCalculator.inl + PolyVox/Array.h + PolyVox/AStarPathfinder.h + PolyVox/AStarPathfinder.inl + PolyVox/BaseVolume.h + PolyVox/BaseVolume.inl + PolyVox/BaseVolumeSampler.inl + PolyVox/CubicSurfaceExtractor.h + PolyVox/CubicSurfaceExtractor.inl + PolyVox/DefaultIsQuadNeeded.h + PolyVox/DefaultMarchingCubesController.h + PolyVox/Density.h + PolyVox/FilePager.h + PolyVox/GradientEstimators.h + PolyVox/GradientEstimators.inl + PolyVox/Interpolation.h + PolyVox/IteratorController.h + PolyVox/IteratorController.inl + PolyVox/LargeVolume.h + PolyVox/LowPassFilter.h + PolyVox/LowPassFilter.inl + PolyVox/MarchingCubesSurfaceExtractor.h + PolyVox/MarchingCubesSurfaceExtractor.inl + PolyVox/Material.h + PolyVox/MaterialDensityPair.h + PolyVox/Mesh.h + PolyVox/Mesh.inl + PolyVox/PagedVolume.h + PolyVox/PagedVolume.inl + PolyVox/PagedVolumeChunk.inl + PolyVox/PagedVolumeSampler.inl + PolyVox/PolyVoxForwardDeclarations.h + PolyVox/Picking.h + PolyVox/Picking.inl + PolyVox/RawVolume.h + PolyVox/RawVolume.inl + PolyVox/RawVolumeSampler.inl + PolyVox/Raycast.h + PolyVox/Raycast.inl + PolyVox/Region.h + PolyVox/Region.inl + PolyVox/SimpleVolume.h + PolyVox/Vector.h + PolyVox/Vector.inl + PolyVox/Vertex.h + PolyVox/VolumeResampler.h + PolyVox/VolumeResampler.inl + PolyVox/VoxelFilters.h + PolyVox/VoxelFilters.inl ) SET(IMPL_INC_FILES - PolyVoxCore/Impl/AStarPathfinderImpl.h - PolyVoxCore/Impl/Config.h - PolyVoxCore/Impl/ErrorHandling.h - PolyVoxCore/Impl/Logging.h - PolyVoxCore/Impl/MarchingCubesTables.h - PolyVoxCore/Impl/RandomUnitVectors.h - PolyVoxCore/Impl/RandomVectors.h - PolyVoxCore/Impl/Timer.h - PolyVoxCore/Impl/TypeDef.h - PolyVoxCore/Impl/Utility.h + PolyVox/Impl/AStarPathfinderImpl.h + PolyVox/Impl/Config.h + PolyVox/Impl/ErrorHandling.h + PolyVox/Impl/Logging.h + PolyVox/Impl/MarchingCubesTables.h + PolyVox/Impl/RandomUnitVectors.h + PolyVox/Impl/RandomVectors.h + PolyVox/Impl/Timer.h + PolyVox/Impl/TypeDef.h + PolyVox/Impl/Utility.h ) #NOTE: The following line should be uncommented when building shared libs. diff --git a/include/PolyVoxCore/AStarPathfinder.h b/include/PolyVox/AStarPathfinder.h similarity index 99% rename from include/PolyVoxCore/AStarPathfinder.h rename to include/PolyVox/AStarPathfinder.h index 0c9d7a89..d453cff3 100644 --- a/include/PolyVoxCore/AStarPathfinder.h +++ b/include/PolyVox/AStarPathfinder.h @@ -224,6 +224,6 @@ namespace PolyVox }; } -#include "PolyVoxCore/AStarPathfinder.inl" +#include "PolyVox/AStarPathfinder.inl" #endif //__PolyVox_AStarPathfinder_H__ diff --git a/include/PolyVoxCore/AStarPathfinder.inl b/include/PolyVox/AStarPathfinder.inl similarity index 99% rename from include/PolyVoxCore/AStarPathfinder.inl rename to include/PolyVox/AStarPathfinder.inl index e0c570bd..42f1cf35 100644 --- a/include/PolyVoxCore/AStarPathfinder.inl +++ b/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 { diff --git a/include/PolyVoxCore/AmbientOcclusionCalculator.h b/include/PolyVox/AmbientOcclusionCalculator.h similarity index 92% rename from include/PolyVoxCore/AmbientOcclusionCalculator.h rename to include/PolyVox/AmbientOcclusionCalculator.h index b9ca636a..2560127d 100644 --- a/include/PolyVoxCore/AmbientOcclusionCalculator.h +++ b/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 "PolyVoxCore/Region.h" -#include "PolyVoxCore/Raycast.h" +#include "PolyVox/Array.h" +#include "PolyVox/Region.h" +#include "PolyVox/Raycast.h" //These two should not be here! -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/Material.h" +#include "PolyVox/PagedVolume.h" #include @@ -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__ diff --git a/include/PolyVoxCore/AmbientOcclusionCalculator.inl b/include/PolyVox/AmbientOcclusionCalculator.inl similarity index 100% rename from include/PolyVoxCore/AmbientOcclusionCalculator.inl rename to include/PolyVox/AmbientOcclusionCalculator.inl diff --git a/include/PolyVoxCore/Array.h b/include/PolyVox/Array.h similarity index 98% rename from include/PolyVoxCore/Array.h rename to include/PolyVox/Array.h index aa03f604..68f54db5 100644 --- a/include/PolyVoxCore/Array.h +++ b/include/PolyVox/Array.h @@ -24,7 +24,7 @@ distribution. #ifndef __PolyVox_Array_H__ #define __PolyVox_Array_H__ -#include +#include #include diff --git a/include/PolyVoxCore/BaseVolume.h b/include/PolyVox/BaseVolume.h similarity index 98% rename from include/PolyVoxCore/BaseVolume.h rename to include/PolyVox/BaseVolume.h index 6947188f..57898ffb 100644 --- a/include/PolyVoxCore/BaseVolume.h +++ b/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 "PolyVoxCore/Vector.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vector.h" #include @@ -211,7 +211,7 @@ namespace PolyVox }; } -#include "PolyVoxCore/BaseVolume.inl" -#include "PolyVoxCore/BaseVolumeSampler.inl" +#include "PolyVox/BaseVolume.inl" +#include "PolyVox/BaseVolumeSampler.inl" #endif //__PolyVox_BaseVolume_H__ diff --git a/include/PolyVoxCore/BaseVolume.inl b/include/PolyVox/BaseVolume.inl similarity index 100% rename from include/PolyVoxCore/BaseVolume.inl rename to include/PolyVox/BaseVolume.inl diff --git a/include/PolyVoxCore/BaseVolumeSampler.inl b/include/PolyVox/BaseVolumeSampler.inl similarity index 99% rename from include/PolyVoxCore/BaseVolumeSampler.inl rename to include/PolyVox/BaseVolumeSampler.inl index 0084f0db..993113a3 100644 --- a/include/PolyVoxCore/BaseVolumeSampler.inl +++ b/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 { diff --git a/include/PolyVoxCore/CubicSurfaceExtractor.h b/include/PolyVox/CubicSurfaceExtractor.h similarity index 98% rename from include/PolyVoxCore/CubicSurfaceExtractor.h rename to include/PolyVox/CubicSurfaceExtractor.h index 6ea600e9..b0855061 100644 --- a/include/PolyVoxCore/CubicSurfaceExtractor.h +++ b/include/PolyVox/CubicSurfaceExtractor.h @@ -28,11 +28,11 @@ freely, subject to the following restrictions: #include "PolyVoxForwardDeclarations.h" -#include "PolyVoxCore/Array.h" -#include "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these? -#include "PolyVoxCore/DefaultIsQuadNeeded.h" -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/Vertex.h" +#include "PolyVox/Array.h" +#include "PolyVox/BaseVolume.h" //For wrap modes... should move these? +#include "PolyVox/DefaultIsQuadNeeded.h" +#include "PolyVox/Mesh.h" +#include "PolyVox/Vertex.h" namespace PolyVox { @@ -223,6 +223,6 @@ namespace PolyVox } } -#include "PolyVoxCore/CubicSurfaceExtractor.inl" +#include "PolyVox/CubicSurfaceExtractor.inl" #endif diff --git a/include/PolyVoxCore/CubicSurfaceExtractor.inl b/include/PolyVox/CubicSurfaceExtractor.inl similarity index 99% rename from include/PolyVoxCore/CubicSurfaceExtractor.inl rename to include/PolyVox/CubicSurfaceExtractor.inl index 429140e9..6eefe3ec 100644 --- a/include/PolyVoxCore/CubicSurfaceExtractor.inl +++ b/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 { diff --git a/include/PolyVoxCore/DefaultIsQuadNeeded.h b/include/PolyVox/DefaultIsQuadNeeded.h similarity index 94% rename from include/PolyVoxCore/DefaultIsQuadNeeded.h rename to include/PolyVox/DefaultIsQuadNeeded.h index ef15444e..5c25c8c1 100644 --- a/include/PolyVoxCore/DefaultIsQuadNeeded.h +++ b/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 diff --git a/include/PolyVoxCore/DefaultMarchingCubesController.h b/include/PolyVox/DefaultMarchingCubesController.h similarity index 99% rename from include/PolyVoxCore/DefaultMarchingCubesController.h rename to include/PolyVox/DefaultMarchingCubesController.h index 2d1b6144..5e99f3ae 100644 --- a/include/PolyVoxCore/DefaultMarchingCubesController.h +++ b/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 diff --git a/include/PolyVoxCore/Density.h b/include/PolyVox/Density.h similarity index 97% rename from include/PolyVoxCore/Density.h rename to include/PolyVox/Density.h index 1cb18065..22b24f85 100644 --- a/include/PolyVoxCore/Density.h +++ b/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" diff --git a/include/PolyVoxCore/FilePager.h b/include/PolyVox/FilePager.h similarity index 98% rename from include/PolyVoxCore/FilePager.h rename to include/PolyVox/FilePager.h index ed3b7a9a..19c8ca62 100644 --- a/include/PolyVoxCore/FilePager.h +++ b/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 "PolyVoxCore/Region.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/Region.h" #include #include diff --git a/include/PolyVoxCore/GradientEstimators.h b/include/PolyVox/GradientEstimators.h similarity index 95% rename from include/PolyVoxCore/GradientEstimators.h rename to include/PolyVox/GradientEstimators.h index 02b1eb0c..30ea14ab 100644 --- a/include/PolyVoxCore/GradientEstimators.h +++ b/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 "PolyVoxCore/VoxelFilters.h" +#include "PolyVox/Vector.h" +#include "PolyVox/VoxelFilters.h" #include @@ -59,6 +59,6 @@ namespace PolyVox //POLYVOX_API Vector3DFloat computeNormal(VolumeType* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod); } -#include "PolyVoxCore/GradientEstimators.inl" +#include "PolyVox/GradientEstimators.inl" #endif //__PolyVox_GradientEstimators_H__ diff --git a/include/PolyVoxCore/GradientEstimators.inl b/include/PolyVox/GradientEstimators.inl similarity index 100% rename from include/PolyVoxCore/GradientEstimators.inl rename to include/PolyVox/GradientEstimators.inl diff --git a/include/PolyVoxCore/Impl/AStarPathfinderImpl.h b/include/PolyVox/Impl/AStarPathfinderImpl.h similarity index 99% rename from include/PolyVoxCore/Impl/AStarPathfinderImpl.h rename to include/PolyVox/Impl/AStarPathfinderImpl.h index f37bbfa8..37165eb9 100644 --- a/include/PolyVoxCore/Impl/AStarPathfinderImpl.h +++ b/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 #include //For numeric_limits diff --git a/include/PolyVoxCore/Impl/Config.h b/include/PolyVox/Impl/Config.h similarity index 100% rename from include/PolyVoxCore/Impl/Config.h rename to include/PolyVox/Impl/Config.h diff --git a/include/PolyVoxCore/Impl/ErrorHandling.h b/include/PolyVox/Impl/ErrorHandling.h similarity index 99% rename from include/PolyVoxCore/Impl/ErrorHandling.h rename to include/PolyVox/Impl/ErrorHandling.h index a1049bf7..bab86143 100644 --- a/include/PolyVoxCore/Impl/ErrorHandling.h +++ b/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 // For std::exit #include // For std::cerr diff --git a/include/PolyVoxCore/Impl/Logging.h b/include/PolyVox/Impl/Logging.h similarity index 99% rename from include/PolyVoxCore/Impl/Logging.h rename to include/PolyVox/Impl/Logging.h index a9a3b2b5..ca8cb3cb 100644 --- a/include/PolyVoxCore/Impl/Logging.h +++ b/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 #include diff --git a/include/PolyVoxCore/Impl/MarchingCubesTables.h b/include/PolyVox/Impl/MarchingCubesTables.h similarity index 99% rename from include/PolyVoxCore/Impl/MarchingCubesTables.h rename to include/PolyVox/Impl/MarchingCubesTables.h index 2a251120..793208d3 100644 --- a/include/PolyVoxCore/Impl/MarchingCubesTables.h +++ b/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 diff --git a/include/PolyVoxCore/Impl/RandomUnitVectors.h b/include/PolyVox/Impl/RandomUnitVectors.h similarity index 99% rename from include/PolyVoxCore/Impl/RandomUnitVectors.h rename to include/PolyVox/Impl/RandomUnitVectors.h index aac04c05..95ff60e3 100644 --- a/include/PolyVoxCore/Impl/RandomUnitVectors.h +++ b/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 { diff --git a/include/PolyVoxCore/Impl/RandomVectors.h b/include/PolyVox/Impl/RandomVectors.h similarity index 99% rename from include/PolyVoxCore/Impl/RandomVectors.h rename to include/PolyVox/Impl/RandomVectors.h index a18d5e1f..346587f6 100644 --- a/include/PolyVoxCore/Impl/RandomVectors.h +++ b/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 { diff --git a/include/PolyVoxCore/Impl/Timer.h b/include/PolyVox/Impl/Timer.h similarity index 100% rename from include/PolyVoxCore/Impl/Timer.h rename to include/PolyVox/Impl/Timer.h diff --git a/include/PolyVoxCore/Impl/TypeDef.h b/include/PolyVox/Impl/TypeDef.h similarity index 100% rename from include/PolyVoxCore/Impl/TypeDef.h rename to include/PolyVox/Impl/TypeDef.h diff --git a/include/PolyVoxCore/Impl/Utility.h b/include/PolyVox/Impl/Utility.h similarity index 98% rename from include/PolyVoxCore/Impl/Utility.h rename to include/PolyVox/Impl/Utility.h index e5ba354c..2fb3e59e 100644 --- a/include/PolyVoxCore/Impl/Utility.h +++ b/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 diff --git a/include/PolyVoxCore/Interpolation.h b/include/PolyVox/Interpolation.h similarity index 100% rename from include/PolyVoxCore/Interpolation.h rename to include/PolyVox/Interpolation.h diff --git a/include/PolyVoxCore/IteratorController.h b/include/PolyVox/IteratorController.h similarity index 94% rename from include/PolyVoxCore/IteratorController.h rename to include/PolyVox/IteratorController.h index b819fd6e..a03ffc75 100644 --- a/include/PolyVoxCore/IteratorController.h +++ b/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__ diff --git a/include/PolyVoxCore/IteratorController.inl b/include/PolyVox/IteratorController.inl similarity index 100% rename from include/PolyVoxCore/IteratorController.inl rename to include/PolyVox/IteratorController.inl diff --git a/include/PolyVoxCore/LargeVolume.h b/include/PolyVox/LargeVolume.h similarity index 100% rename from include/PolyVoxCore/LargeVolume.h rename to include/PolyVox/LargeVolume.h diff --git a/include/PolyVoxCore/LowPassFilter.h b/include/PolyVox/LowPassFilter.h similarity index 90% rename from include/PolyVoxCore/LowPassFilter.h rename to include/PolyVox/LowPassFilter.h index 5ec1ea71..75fcbb37 100644 --- a/include/PolyVoxCore/LowPassFilter.h +++ b/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 "PolyVoxCore/RawVolume.h" //Is this desirable? -#include "PolyVoxCore/Region.h" +#include "PolyVox/IteratorController.h" +#include "PolyVox/RawVolume.h" //Is this desirable? +#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__ diff --git a/include/PolyVoxCore/LowPassFilter.inl b/include/PolyVox/LowPassFilter.inl similarity index 100% rename from include/PolyVoxCore/LowPassFilter.inl rename to include/PolyVox/LowPassFilter.inl diff --git a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h b/include/PolyVox/MarchingCubesSurfaceExtractor.h similarity index 98% rename from include/PolyVoxCore/MarchingCubesSurfaceExtractor.h rename to include/PolyVox/MarchingCubesSurfaceExtractor.h index d1702f22..69ec0569 100644 --- a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h +++ b/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 "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these? -#include "PolyVoxCore/Mesh.h" -#include "PolyVoxCore/DefaultMarchingCubesController.h" -#include "PolyVoxCore/Vertex.h" +#include "PolyVox/Array.h" +#include "PolyVox/BaseVolume.h" //For wrap modes... should move these? +#include "PolyVox/Mesh.h" +#include "PolyVox/DefaultMarchingCubesController.h" +#include "PolyVox/Vertex.h" namespace PolyVox { @@ -353,6 +353,6 @@ namespace PolyVox } } -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.inl" +#include "PolyVox/MarchingCubesSurfaceExtractor.inl" #endif diff --git a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl b/include/PolyVox/MarchingCubesSurfaceExtractor.inl similarity index 99% rename from include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl rename to include/PolyVox/MarchingCubesSurfaceExtractor.inl index cf8dcf67..4fb98272 100644 --- a/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl +++ b/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 { diff --git a/include/PolyVoxCore/Material.h b/include/PolyVox/Material.h similarity index 96% rename from include/PolyVoxCore/Material.h rename to include/PolyVox/Material.h index 2958d7e5..e3d98c99 100644 --- a/include/PolyVoxCore/Material.h +++ b/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 { diff --git a/include/PolyVoxCore/MaterialDensityPair.h b/include/PolyVox/MaterialDensityPair.h similarity index 96% rename from include/PolyVoxCore/MaterialDensityPair.h rename to include/PolyVox/MaterialDensityPair.h index 83cc1739..87592ce7 100644 --- a/include/PolyVoxCore/MaterialDensityPair.h +++ b/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 "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here +#include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type +#include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here #include "Impl/TypeDef.h" diff --git a/include/PolyVoxCore/Mesh.h b/include/PolyVox/Mesh.h similarity index 93% rename from include/PolyVoxCore/Mesh.h rename to include/PolyVox/Mesh.h index 4c1b3582..08bc0d07 100644 --- a/include/PolyVoxCore/Mesh.h +++ b/include/PolyVox/Mesh.h @@ -26,9 +26,9 @@ freely, subject to the following restrictions: #include "Impl/TypeDef.h" -#include "PolyVoxCore/PolyVoxForwardDeclarations.h" -#include "PolyVoxCore/Region.h" -#include "PolyVoxCore/Vertex.h" //Should probably do away with this on in the future... +#include "PolyVox/PolyVoxForwardDeclarations.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vertex.h" //Should probably do away with this on in the future... #include #include @@ -98,6 +98,6 @@ namespace PolyVox } } -#include "PolyVoxCore/Mesh.inl" +#include "PolyVox/Mesh.inl" #endif /* __Mesh_H__ */ diff --git a/include/PolyVoxCore/Mesh.inl b/include/PolyVox/Mesh.inl similarity index 100% rename from include/PolyVoxCore/Mesh.inl rename to include/PolyVox/Mesh.inl diff --git a/include/PolyVoxCore/PagedVolume.h b/include/PolyVox/PagedVolume.h similarity index 98% rename from include/PolyVoxCore/PagedVolume.h rename to include/PolyVox/PagedVolume.h index adf27243..e5ca536f 100644 --- a/include/PolyVoxCore/PagedVolume.h +++ b/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 "PolyVoxCore/Region.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/BaseVolume.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vector.h" #include #include //For abort() @@ -359,8 +359,8 @@ namespace PolyVox }; } -#include "PolyVoxCore/PagedVolume.inl" -#include "PolyVoxCore/PagedVolumeChunk.inl" -#include "PolyVoxCore/PagedVolumeSampler.inl" +#include "PolyVox/PagedVolume.inl" +#include "PolyVox/PagedVolumeChunk.inl" +#include "PolyVox/PagedVolumeSampler.inl" #endif //__PolyVox_PagedVolume_H__ diff --git a/include/PolyVoxCore/PagedVolume.inl b/include/PolyVox/PagedVolume.inl similarity index 99% rename from include/PolyVoxCore/PagedVolume.inl rename to include/PolyVox/PagedVolume.inl index 642c1ff8..e6c5b04b 100644 --- a/include/PolyVoxCore/PagedVolume.inl +++ b/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 #include diff --git a/include/PolyVoxCore/PagedVolumeChunk.inl b/include/PolyVox/PagedVolumeChunk.inl similarity index 99% rename from include/PolyVoxCore/PagedVolumeChunk.inl rename to include/PolyVox/PagedVolumeChunk.inl index d7e249bd..7a51c79b 100644 --- a/include/PolyVoxCore/PagedVolumeChunk.inl +++ b/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 { diff --git a/include/PolyVoxCore/PagedVolumeSampler.inl b/include/PolyVox/PagedVolumeSampler.inl similarity index 100% rename from include/PolyVoxCore/PagedVolumeSampler.inl rename to include/PolyVox/PagedVolumeSampler.inl diff --git a/include/PolyVoxCore/Picking.h b/include/PolyVox/Picking.h similarity index 96% rename from include/PolyVoxCore/Picking.h rename to include/PolyVox/Picking.h index ee757ddb..49b026ca 100644 --- a/include/PolyVoxCore/Picking.h +++ b/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__ diff --git a/include/PolyVoxCore/Picking.inl b/include/PolyVox/Picking.inl similarity index 98% rename from include/PolyVoxCore/Picking.inl rename to include/PolyVox/Picking.inl index c776ee00..c5829f09 100644 --- a/include/PolyVoxCore/Picking.inl +++ b/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 { diff --git a/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/include/PolyVox/PolyVoxForwardDeclarations.h similarity index 100% rename from include/PolyVoxCore/PolyVoxForwardDeclarations.h rename to include/PolyVox/PolyVoxForwardDeclarations.h diff --git a/include/PolyVoxCore/RawVolume.h b/include/PolyVox/RawVolume.h similarity index 97% rename from include/PolyVoxCore/RawVolume.h rename to include/PolyVox/RawVolume.h index 3201bb8a..73a2f1e5 100644 --- a/include/PolyVoxCore/RawVolume.h +++ b/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 "PolyVoxCore/Region.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/BaseVolume.h" +#include "PolyVox/Region.h" +#include "PolyVox/Vector.h" #include //For abort() #include @@ -167,7 +167,7 @@ namespace PolyVox }; } -#include "PolyVoxCore/RawVolume.inl" -#include "PolyVoxCore/RawVolumeSampler.inl" +#include "PolyVox/RawVolume.inl" +#include "PolyVox/RawVolumeSampler.inl" #endif //__PolyVox_RawVolume_H__ diff --git a/include/PolyVoxCore/RawVolume.inl b/include/PolyVox/RawVolume.inl similarity index 100% rename from include/PolyVoxCore/RawVolume.inl rename to include/PolyVox/RawVolume.inl diff --git a/include/PolyVoxCore/RawVolumeSampler.inl b/include/PolyVox/RawVolumeSampler.inl similarity index 100% rename from include/PolyVoxCore/RawVolumeSampler.inl rename to include/PolyVox/RawVolumeSampler.inl diff --git a/include/PolyVoxCore/Raycast.h b/include/PolyVox/Raycast.h similarity index 98% rename from include/PolyVoxCore/Raycast.h rename to include/PolyVox/Raycast.h index 3adb28c4..4d4888b8 100644 --- a/include/PolyVoxCore/Raycast.h +++ b/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__ diff --git a/include/PolyVoxCore/Raycast.inl b/include/PolyVox/Raycast.inl similarity index 100% rename from include/PolyVoxCore/Raycast.inl rename to include/PolyVox/Raycast.inl diff --git a/include/PolyVoxCore/Region.h b/include/PolyVox/Region.h similarity index 99% rename from include/PolyVoxCore/Region.h rename to include/PolyVox/Region.h index 6221b87b..71cdb09f 100644 --- a/include/PolyVoxCore/Region.h +++ b/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 diff --git a/include/PolyVoxCore/Region.inl b/include/PolyVox/Region.inl similarity index 100% rename from include/PolyVoxCore/Region.inl rename to include/PolyVox/Region.inl diff --git a/include/PolyVoxCore/SimpleVolume.h b/include/PolyVox/SimpleVolume.h similarity index 100% rename from include/PolyVoxCore/SimpleVolume.h rename to include/PolyVox/SimpleVolume.h diff --git a/include/PolyVoxCore/Vector.h b/include/PolyVox/Vector.h similarity index 99% rename from include/PolyVoxCore/Vector.h rename to include/PolyVox/Vector.h index 416158ed..695ce8c0 100644 --- a/include/PolyVoxCore/Vector.h +++ b/include/PolyVox/Vector.h @@ -242,7 +242,7 @@ namespace std } -#include "PolyVoxCore/Vector.inl" +#include "PolyVox/Vector.inl" #endif diff --git a/include/PolyVoxCore/Vector.inl b/include/PolyVox/Vector.inl similarity index 100% rename from include/PolyVoxCore/Vector.inl rename to include/PolyVox/Vector.inl diff --git a/include/PolyVoxCore/Vertex.h b/include/PolyVox/Vertex.h similarity index 97% rename from include/PolyVoxCore/Vertex.h rename to include/PolyVox/Vertex.h index 1eb6f429..12900c5a 100644 --- a/include/PolyVoxCore/Vertex.h +++ b/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 #include diff --git a/include/PolyVoxCore/VolumeResampler.h b/include/PolyVox/VolumeResampler.h similarity index 95% rename from include/PolyVoxCore/VolumeResampler.h rename to include/PolyVox/VolumeResampler.h index ec7aed00..c2869262 100644 --- a/include/PolyVoxCore/VolumeResampler.h +++ b/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 diff --git a/include/PolyVoxCore/VolumeResampler.inl b/include/PolyVox/VolumeResampler.inl similarity index 99% rename from include/PolyVoxCore/VolumeResampler.inl rename to include/PolyVox/VolumeResampler.inl index ae09dfb9..3360d54b 100644 --- a/include/PolyVoxCore/VolumeResampler.inl +++ b/include/PolyVox/VolumeResampler.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxCore/Interpolation.h" +#include "PolyVox/Interpolation.h" #include diff --git a/include/PolyVoxCore/VoxelFilters.h b/include/PolyVox/VoxelFilters.h similarity index 96% rename from include/PolyVoxCore/VoxelFilters.h rename to include/PolyVox/VoxelFilters.h index 1c54b9ea..af48dd6d 100644 --- a/include/PolyVoxCore/VoxelFilters.h +++ b/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 diff --git a/include/PolyVoxCore/VoxelFilters.inl b/include/PolyVox/VoxelFilters.inl similarity index 100% rename from include/PolyVoxCore/VoxelFilters.inl rename to include/PolyVox/VoxelFilters.inl diff --git a/tests/TestAStarPathfinder.cpp b/tests/TestAStarPathfinder.cpp index 15c118d7..c6c52da0 100644 --- a/tests/TestAStarPathfinder.cpp +++ b/tests/TestAStarPathfinder.cpp @@ -23,9 +23,9 @@ freely, subject to the following restrictions: #include "TestAStarPathfinder.h" -#include "PolyVoxCore/AStarPathfinder.h" -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/RawVolume.h" +#include "PolyVox/AStarPathfinder.h" +#include "PolyVox/Material.h" +#include "PolyVox/RawVolume.h" #include diff --git a/tests/TestAmbientOcclusionGenerator.cpp b/tests/TestAmbientOcclusionGenerator.cpp index 97ab7993..253af603 100644 --- a/tests/TestAmbientOcclusionGenerator.cpp +++ b/tests/TestAmbientOcclusionGenerator.cpp @@ -23,8 +23,8 @@ freely, subject to the following restrictions: #include "TestAmbientOcclusionGenerator.h" -#include "PolyVoxCore/AmbientOcclusionCalculator.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/AmbientOcclusionCalculator.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/tests/TestArray.cpp b/tests/TestArray.cpp index 13aeaee1..5c3a5bfb 100644 --- a/tests/TestArray.cpp +++ b/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 diff --git a/tests/TestCubicSurfaceExtractor.cpp b/tests/TestCubicSurfaceExtractor.cpp index 61398777..0b12bb34 100644 --- a/tests/TestCubicSurfaceExtractor.cpp +++ b/tests/TestCubicSurfaceExtractor.cpp @@ -23,12 +23,12 @@ freely, subject to the following restrictions: #include "TestCubicSurfaceExtractor.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/MaterialDensityPair.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/CubicSurfaceExtractor.h" +#include "PolyVox/Density.h" +#include "PolyVox/Material.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" #include diff --git a/tests/TestLowPassFilter.cpp b/tests/TestLowPassFilter.cpp index 5af198b9..849cf927 100644 --- a/tests/TestLowPassFilter.cpp +++ b/tests/TestLowPassFilter.cpp @@ -23,9 +23,9 @@ freely, subject to the following restrictions: #include "TestLowPassFilter.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/LowPassFilter.h" -#include "PolyVoxCore/RawVolume.h" +#include "PolyVox/Density.h" +#include "PolyVox/LowPassFilter.h" +#include "PolyVox/RawVolume.h" #include diff --git a/tests/TestPicking.cpp b/tests/TestPicking.cpp index fa255b55..78f2b5c6 100644 --- a/tests/TestPicking.cpp +++ b/tests/TestPicking.cpp @@ -23,8 +23,8 @@ freely, subject to the following restrictions: #include "TestPicking.h" -#include "PolyVoxCore/Picking.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/Picking.h" +#include "PolyVox/PagedVolume.h" #include diff --git a/tests/TestRaycast.cpp b/tests/TestRaycast.cpp index a7b148fa..655d2b0b 100644 --- a/tests/TestRaycast.cpp +++ b/tests/TestRaycast.cpp @@ -23,11 +23,11 @@ freely, subject to the following restrictions: #include "TestRaycast.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/Raycast.h" -#include "PolyVoxCore/PagedVolume.h" +#include "PolyVox/Density.h" +#include "PolyVox/Raycast.h" +#include "PolyVox/PagedVolume.h" -#include "PolyVoxCore/Impl/RandomUnitVectors.h" +#include "PolyVox/Impl/RandomUnitVectors.h" #include diff --git a/tests/TestRegion.cpp b/tests/TestRegion.cpp index a0f74913..12a100a1 100644 --- a/tests/TestRegion.cpp +++ b/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 diff --git a/tests/TestSurfaceExtractor.cpp b/tests/TestSurfaceExtractor.cpp index 92e28755..bbdca389 100644 --- a/tests/TestSurfaceExtractor.cpp +++ b/tests/TestSurfaceExtractor.cpp @@ -23,12 +23,12 @@ freely, subject to the following restrictions: #include "TestSurfaceExtractor.h" -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/FilePager.h" -#include "PolyVoxCore/MaterialDensityPair.h" -#include "PolyVoxCore/RawVolume.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/MarchingCubesSurfaceExtractor.h" +#include "PolyVox/Density.h" +#include "PolyVox/FilePager.h" +#include "PolyVox/MaterialDensityPair.h" +#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/MarchingCubesSurfaceExtractor.h" #include diff --git a/tests/TestVolumeSubclass.cpp b/tests/TestVolumeSubclass.cpp index 9be146d4..0a301e3e 100644 --- a/tests/TestVolumeSubclass.cpp +++ b/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 "PolyVoxCore/CubicSurfaceExtractor.h" -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/Vector.h" +#include "PolyVox/BaseVolume.h" +#include "PolyVox/CubicSurfaceExtractor.h" +#include "PolyVox/Material.h" +#include "PolyVox/Vector.h" #include diff --git a/tests/testmaterial.cpp b/tests/testmaterial.cpp index a4662e34..4e8b6843 100644 --- a/tests/testmaterial.cpp +++ b/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 diff --git a/tests/testvector.cpp b/tests/testvector.cpp index 08649f28..61aa4760 100644 --- a/tests/testvector.cpp +++ b/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 diff --git a/tests/testvolume.cpp b/tests/testvolume.cpp index 3eafceb2..df2a3a97 100644 --- a/tests/testvolume.cpp +++ b/tests/testvolume.cpp @@ -23,9 +23,9 @@ freely, subject to the following restrictions: #include "testvolume.h" -#include "PolyVoxCore/FilePager.h" -#include "PolyVoxCore/PagedVolume.h" -#include "PolyVoxCore/RawVolume.h" +#include "PolyVox/FilePager.h" +#include "PolyVox/PagedVolume.h" +#include "PolyVox/RawVolume.h" #include #include diff --git a/tests/testvolume.h b/tests/testvolume.h index ea1a1d0b..41ec64dd 100644 --- a/tests/testvolume.h +++ b/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