When PolyVox files include other PolyVox files the 'PolyVox' part of the path is not needed. This is only needed when examples, tests, and external applications include PolyVox.

include/PolyVox/AStarPathfinder.h

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

include/PolyVox/AStarPathfinder.inl

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "PolyVox/Impl/ErrorHandling.h"
+#include "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 "PolyVox/Array.h"
+#include "Array.h"
-#include "PolyVox/Region.h"
+#include "Region.h"
-#include "PolyVox/Raycast.h"
+#include "Raycast.h"
 
 //These two should not be here!
-#include "PolyVox/Material.h"
+#include "Material.h"
-#include "PolyVox/PagedVolume.h"
+#include "PagedVolume.h"
 
 #include <algorithm>
 
@@ -77,6 +77,6 @@ namespace PolyVox
 	void calculateAmbientOcclusion(VolumeType* volInput, Array<3, uint8_t>* arrayResult, const Region& region, float fRayLength, uint8_t uNoOfSamplesPerOutputElement, IsVoxelTransparentCallback isVoxelTransparentCallback);
 }
 
-#include "PolyVox/AmbientOcclusionCalculator.inl"
+#include "AmbientOcclusionCalculator.inl"
 
 #endif //__AmbientOcclusionCalculator_H__

include/PolyVox/BaseVolume.h

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

include/PolyVox/BaseVolumeSampler.inl

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

include/PolyVox/CubicSurfaceExtractor.h

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

include/PolyVox/CubicSurfaceExtractor.inl

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "PolyVox/Impl/Timer.h"
+#include "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 "PolyVox/Impl/PlatformDefinitions.h"
+#include "Impl/PlatformDefinitions.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 "PolyVox/BaseVolume.h"
+#include "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 "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
+#include "DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
 
 #include "Impl/PlatformDefinitions.h"
 

include/PolyVox/FilePager.h

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

include/PolyVox/IteratorController.h

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_IteratorController_H__
 #define __PolyVox_IteratorController_H__
 
-#include "PolyVox/Region.h"
+#include "Region.h"
 
 namespace PolyVox
 {
@@ -41,6 +41,6 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVox/IteratorController.inl"
+#include "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 "PolyVox/IteratorController.h"
+#include "IteratorController.h"
-#include "PolyVox/RawVolume.h" //Is this desirable?
+#include "RawVolume.h" //Is this desirable?
-#include "PolyVox/Region.h"
+#include "Region.h"
 
 namespace PolyVox
 {
@@ -54,7 +54,7 @@ namespace PolyVox
 
 }//namespace PolyVox
 
-#include "PolyVox/LowPassFilter.inl"
+#include "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/PlatformDefinitions.h"
 
-#include "PolyVox/Array.h"
+#include "Array.h"
-#include "PolyVox/BaseVolume.h" //For wrap modes... should move these?
+#include "BaseVolume.h" //For wrap modes... should move these?
-#include "PolyVox/Mesh.h"
+#include "Mesh.h"
-#include "PolyVox/DefaultMarchingCubesController.h"
+#include "DefaultMarchingCubesController.h"
-#include "PolyVox/Vertex.h"
+#include "Vertex.h"
 
 namespace PolyVox
 {
@@ -173,6 +173,6 @@ namespace PolyVox
 	}
 }
 
-#include "PolyVox/MarchingCubesSurfaceExtractor.inl"
+#include "MarchingCubesSurfaceExtractor.inl"
 
 #endif

include/PolyVox/MarchingCubesSurfaceExtractor.inl

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

include/PolyVox/Material.h

@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 
 #include "Impl/PlatformDefinitions.h"
 
-#include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
+#include "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 "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
+#include "DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
-#include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
+#include "DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
 
 #include "Impl/PlatformDefinitions.h"
 

include/PolyVox/Mesh.h

@@ -26,9 +26,9 @@ freely, subject to the following restrictions:
 
 #include "Impl/PlatformDefinitions.h"
 
-#include "PolyVox/PolyVoxForwardDeclarations.h"
+#include "PolyVoxForwardDeclarations.h"
-#include "PolyVox/Region.h"
+#include "Region.h"
-#include "PolyVox/Vertex.h" //Should probably do away with this on in the future...
+#include "Vertex.h" //Should probably do away with this on in the future...
 
 #include <algorithm>
 #include <cstdlib>
@@ -98,6 +98,6 @@ namespace PolyVox
 	}
 }
 
-#include "PolyVox/Mesh.inl"
+#include "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 "PolyVox/BaseVolume.h"
+#include "BaseVolume.h"
-#include "PolyVox/Region.h"
+#include "Region.h"
-#include "PolyVox/Vector.h"
+#include "Vector.h"
 
 #include <limits>
 #include <cstdlib> //For abort()
@@ -326,8 +326,8 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVox/PagedVolume.inl"
+#include "PagedVolume.inl"
-#include "PolyVox/PagedVolumeChunk.inl"
+#include "PagedVolumeChunk.inl"
-#include "PolyVox/PagedVolumeSampler.inl"
+#include "PagedVolumeSampler.inl"
 
 #endif //__PolyVox_PagedVolume_H__

include/PolyVox/PagedVolume.inl

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

include/PolyVox/PagedVolumeChunk.inl

@@ -21,8 +21,8 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVox/Impl/Morton.h"
+#include "Impl/Morton.h"
-#include "PolyVox/Impl/Utility.h"
+#include "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 "PolyVox/Vector.h"
+#include "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 "PolyVox/Picking.inl"
+#include "Picking.inl"
 
 #endif //__PolyVox_Picking_H__

include/PolyVox/Picking.inl

@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "PolyVox/Raycast.h"
+#include "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 "PolyVox/BaseVolume.h"
+#include "BaseVolume.h"
-#include "PolyVox/Region.h"
+#include "Region.h"
-#include "PolyVox/Vector.h"
+#include "Vector.h"
 
 #include <cstdlib> //For abort()
 #include <limits>
@@ -171,7 +171,7 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVox/RawVolume.inl"
+#include "RawVolume.inl"
-#include "PolyVox/RawVolumeSampler.inl"
+#include "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 "PolyVox/Vector.h"
+#include "Vector.h"
 
 namespace PolyVox
 {
@@ -98,6 +98,6 @@ namespace PolyVox
 	RaycastResult raycastWithDirection(VolumeType* volData, const Vector3DFloat& v3dStart, const Vector3DFloat& v3dDirectionAndLength, Callback& callback);
 }
 
-#include "PolyVox/Raycast.inl"
+#include "Raycast.inl"
 
 #endif //__PolyVox_Raycast_H__

include/PolyVox/Region.h

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

include/PolyVox/Vector.h

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

include/PolyVox/Vertex.h

@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 
 #include "Impl/PlatformDefinitions.h"
 
-#include "PolyVox/Vector.h"
+#include "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 "PolyVox/Region.h"
+#include "Region.h"
 
 namespace PolyVox
 {
@@ -51,7 +51,7 @@ namespace PolyVox
 
 }//namespace PolyVox
 
-#include "PolyVox/VolumeResampler.inl"
+#include "VolumeResampler.inl"
 
 #endif
 

include/PolyVox/VolumeResampler.inl

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