From 354b6aa9d0ad9d0f9bf57f0148ffd6456b96c304 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 20 Dec 2015 20:56:37 +0000 Subject: [PATCH] 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 | 2 +- include/PolyVox/AStarPathfinder.inl | 2 +- include/PolyVox/AmbientOcclusionCalculator.h | 12 ++++++------ include/PolyVox/BaseVolume.h | 8 ++++---- include/PolyVox/BaseVolumeSampler.inl | 2 +- include/PolyVox/CubicSurfaceExtractor.h | 12 ++++++------ include/PolyVox/CubicSurfaceExtractor.inl | 2 +- include/PolyVox/DefaultIsQuadNeeded.h | 2 +- include/PolyVox/DefaultMarchingCubesController.h | 2 +- include/PolyVox/Density.h | 2 +- include/PolyVox/FilePager.h | 6 +++--- include/PolyVox/IteratorController.h | 4 ++-- include/PolyVox/LowPassFilter.h | 8 ++++---- include/PolyVox/MarchingCubesSurfaceExtractor.h | 12 ++++++------ include/PolyVox/MarchingCubesSurfaceExtractor.inl | 2 +- include/PolyVox/Material.h | 2 +- include/PolyVox/MaterialDensityPair.h | 4 ++-- include/PolyVox/Mesh.h | 8 ++++---- include/PolyVox/PagedVolume.h | 12 ++++++------ include/PolyVox/PagedVolume.inl | 2 +- include/PolyVox/PagedVolumeChunk.inl | 4 ++-- include/PolyVox/Picking.h | 4 ++-- include/PolyVox/Picking.inl | 2 +- include/PolyVox/RawVolume.h | 10 +++++----- include/PolyVox/Raycast.h | 4 ++-- include/PolyVox/Region.h | 4 ++-- include/PolyVox/Vector.h | 2 +- include/PolyVox/Vertex.h | 2 +- include/PolyVox/VolumeResampler.h | 4 ++-- include/PolyVox/VolumeResampler.inl | 2 +- 30 files changed, 72 insertions(+), 72 deletions(-) diff --git a/include/PolyVox/AStarPathfinder.h b/include/PolyVox/AStarPathfinder.h index 6aa2b71f..1b38c816 100644 --- a/include/PolyVox/AStarPathfinder.h +++ b/include/PolyVox/AStarPathfinder.h @@ -224,6 +224,6 @@ namespace PolyVox }; } -#include "PolyVox/AStarPathfinder.inl" +#include "AStarPathfinder.inl" #endif //__PolyVox_AStarPathfinder_H__ diff --git a/include/PolyVox/AStarPathfinder.inl b/include/PolyVox/AStarPathfinder.inl index 42f1cf35..574702ea 100644 --- a/include/PolyVox/AStarPathfinder.inl +++ b/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 { diff --git a/include/PolyVox/AmbientOcclusionCalculator.h b/include/PolyVox/AmbientOcclusionCalculator.h index 2fded9f9..0da699aa 100644 --- a/include/PolyVox/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 "PolyVox/Array.h" -#include "PolyVox/Region.h" -#include "PolyVox/Raycast.h" +#include "Array.h" +#include "Region.h" +#include "Raycast.h" //These two should not be here! -#include "PolyVox/Material.h" -#include "PolyVox/PagedVolume.h" +#include "Material.h" +#include "PagedVolume.h" #include @@ -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__ diff --git a/include/PolyVox/BaseVolume.h b/include/PolyVox/BaseVolume.h index e58dbe21..151a850a 100644 --- a/include/PolyVox/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 "PolyVox/Region.h" -#include "PolyVox/Vector.h" +#include "Region.h" +#include "Vector.h" #include @@ -135,7 +135,7 @@ namespace PolyVox }; } -#include "PolyVox/BaseVolume.inl" -#include "PolyVox/BaseVolumeSampler.inl" +#include "BaseVolume.inl" +#include "BaseVolumeSampler.inl" #endif //__PolyVox_BaseVolume_H__ diff --git a/include/PolyVox/BaseVolumeSampler.inl b/include/PolyVox/BaseVolumeSampler.inl index ccd14410..52c53516 100644 --- a/include/PolyVox/BaseVolumeSampler.inl +++ b/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 { diff --git a/include/PolyVox/CubicSurfaceExtractor.h b/include/PolyVox/CubicSurfaceExtractor.h index e7728ae7..81d3120b 100644 --- a/include/PolyVox/CubicSurfaceExtractor.h +++ b/include/PolyVox/CubicSurfaceExtractor.h @@ -28,11 +28,11 @@ freely, subject to the following restrictions: #include "PolyVoxForwardDeclarations.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" +#include "Array.h" +#include "BaseVolume.h" //For wrap modes... should move these? +#include "DefaultIsQuadNeeded.h" +#include "Mesh.h" +#include "Vertex.h" namespace PolyVox { @@ -299,6 +299,6 @@ namespace PolyVox } } -#include "PolyVox/CubicSurfaceExtractor.inl" +#include "CubicSurfaceExtractor.inl" #endif diff --git a/include/PolyVox/CubicSurfaceExtractor.inl b/include/PolyVox/CubicSurfaceExtractor.inl index 0444c2d3..b7285be2 100644 --- a/include/PolyVox/CubicSurfaceExtractor.inl +++ b/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 { diff --git a/include/PolyVox/DefaultIsQuadNeeded.h b/include/PolyVox/DefaultIsQuadNeeded.h index 8a47e463..678984b9 100644 --- a/include/PolyVox/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 "PolyVox/Impl/PlatformDefinitions.h" +#include "Impl/PlatformDefinitions.h" #include diff --git a/include/PolyVox/DefaultMarchingCubesController.h b/include/PolyVox/DefaultMarchingCubesController.h index 5e99f3ae..90751f13 100644 --- a/include/PolyVox/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 "PolyVox/BaseVolume.h" +#include "BaseVolume.h" #include diff --git a/include/PolyVox/Density.h b/include/PolyVox/Density.h index ea2da8eb..d84f94da 100644 --- a/include/PolyVox/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 "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" diff --git a/include/PolyVox/FilePager.h b/include/PolyVox/FilePager.h index e85d4b25..c7333b79 100644 --- a/include/PolyVox/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 "PolyVox/Impl/PlatformDefinitions.h" +#include "Impl/PlatformDefinitions.h" -#include "PolyVox/PagedVolume.h" -#include "PolyVox/Region.h" +#include "PagedVolume.h" +#include "Region.h" #include #include diff --git a/include/PolyVox/IteratorController.h b/include/PolyVox/IteratorController.h index a03ffc75..63b49deb 100644 --- a/include/PolyVox/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 "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__ diff --git a/include/PolyVox/LowPassFilter.h b/include/PolyVox/LowPassFilter.h index 75fcbb37..bf92f5c6 100644 --- a/include/PolyVox/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 "PolyVox/IteratorController.h" -#include "PolyVox/RawVolume.h" //Is this desirable? -#include "PolyVox/Region.h" +#include "IteratorController.h" +#include "RawVolume.h" //Is this desirable? +#include "Region.h" namespace PolyVox { @@ -54,7 +54,7 @@ namespace PolyVox }//namespace PolyVox -#include "PolyVox/LowPassFilter.inl" +#include "LowPassFilter.inl" #endif //__PolyVox_LowPassFilter_H__ diff --git a/include/PolyVox/MarchingCubesSurfaceExtractor.h b/include/PolyVox/MarchingCubesSurfaceExtractor.h index 0bd2df59..b19fa8da 100644 --- a/include/PolyVox/MarchingCubesSurfaceExtractor.h +++ b/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 "PolyVox/BaseVolume.h" //For wrap modes... should move these? -#include "PolyVox/Mesh.h" -#include "PolyVox/DefaultMarchingCubesController.h" -#include "PolyVox/Vertex.h" +#include "Array.h" +#include "BaseVolume.h" //For wrap modes... should move these? +#include "Mesh.h" +#include "DefaultMarchingCubesController.h" +#include "Vertex.h" namespace PolyVox { @@ -173,6 +173,6 @@ namespace PolyVox } } -#include "PolyVox/MarchingCubesSurfaceExtractor.inl" +#include "MarchingCubesSurfaceExtractor.inl" #endif diff --git a/include/PolyVox/MarchingCubesSurfaceExtractor.inl b/include/PolyVox/MarchingCubesSurfaceExtractor.inl index 2f2eeb57..62a7cd8e 100644 --- a/include/PolyVox/MarchingCubesSurfaceExtractor.inl +++ b/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 { diff --git a/include/PolyVox/Material.h b/include/PolyVox/Material.h index a3023bab..de5f1880 100644 --- a/include/PolyVox/Material.h +++ b/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 { diff --git a/include/PolyVox/MaterialDensityPair.h b/include/PolyVox/MaterialDensityPair.h index 5df95d7e..63b0a1d5 100644 --- a/include/PolyVox/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 "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 "DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type +#include "DefaultMarchingCubesController.h" //We'll specialise the controller contained in here #include "Impl/PlatformDefinitions.h" diff --git a/include/PolyVox/Mesh.h b/include/PolyVox/Mesh.h index d4135299..12a8470e 100644 --- a/include/PolyVox/Mesh.h +++ b/include/PolyVox/Mesh.h @@ -26,9 +26,9 @@ freely, subject to the following restrictions: #include "Impl/PlatformDefinitions.h" -#include "PolyVox/PolyVoxForwardDeclarations.h" -#include "PolyVox/Region.h" -#include "PolyVox/Vertex.h" //Should probably do away with this on in the future... +#include "PolyVoxForwardDeclarations.h" +#include "Region.h" +#include "Vertex.h" //Should probably do away with this on in the future... #include #include @@ -98,6 +98,6 @@ namespace PolyVox } } -#include "PolyVox/Mesh.inl" +#include "Mesh.inl" #endif /* __Mesh_H__ */ diff --git a/include/PolyVox/PagedVolume.h b/include/PolyVox/PagedVolume.h index 38f19b3a..d9f949b4 100644 --- a/include/PolyVox/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 "PolyVox/BaseVolume.h" -#include "PolyVox/Region.h" -#include "PolyVox/Vector.h" +#include "BaseVolume.h" +#include "Region.h" +#include "Vector.h" #include #include //For abort() @@ -326,8 +326,8 @@ namespace PolyVox }; } -#include "PolyVox/PagedVolume.inl" -#include "PolyVox/PagedVolumeChunk.inl" -#include "PolyVox/PagedVolumeSampler.inl" +#include "PagedVolume.inl" +#include "PagedVolumeChunk.inl" +#include "PagedVolumeSampler.inl" #endif //__PolyVox_PagedVolume_H__ diff --git a/include/PolyVox/PagedVolume.inl b/include/PolyVox/PagedVolume.inl index 8894b90a..faf355bc 100644 --- a/include/PolyVox/PagedVolume.inl +++ b/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 #include diff --git a/include/PolyVox/PagedVolumeChunk.inl b/include/PolyVox/PagedVolumeChunk.inl index 9419593c..90665f2b 100644 --- a/include/PolyVox/PagedVolumeChunk.inl +++ b/include/PolyVox/PagedVolumeChunk.inl @@ -21,8 +21,8 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVox/Impl/Morton.h" -#include "PolyVox/Impl/Utility.h" +#include "Impl/Morton.h" +#include "Impl/Utility.h" namespace PolyVox { diff --git a/include/PolyVox/Picking.h b/include/PolyVox/Picking.h index 49b026ca..e7927fcf 100644 --- a/include/PolyVox/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 "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__ diff --git a/include/PolyVox/Picking.inl b/include/PolyVox/Picking.inl index c5829f09..d0f18904 100644 --- a/include/PolyVox/Picking.inl +++ b/include/PolyVox/Picking.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVox/Raycast.h" +#include "Raycast.h" namespace PolyVox { diff --git a/include/PolyVox/RawVolume.h b/include/PolyVox/RawVolume.h index b98fb2d1..59389577 100644 --- a/include/PolyVox/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 "PolyVox/BaseVolume.h" -#include "PolyVox/Region.h" -#include "PolyVox/Vector.h" +#include "BaseVolume.h" +#include "Region.h" +#include "Vector.h" #include //For abort() #include @@ -171,7 +171,7 @@ namespace PolyVox }; } -#include "PolyVox/RawVolume.inl" -#include "PolyVox/RawVolumeSampler.inl" +#include "RawVolume.inl" +#include "RawVolumeSampler.inl" #endif //__PolyVox_RawVolume_H__ diff --git a/include/PolyVox/Raycast.h b/include/PolyVox/Raycast.h index 4d4888b8..402cf40c 100644 --- a/include/PolyVox/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 "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__ diff --git a/include/PolyVox/Region.h b/include/PolyVox/Region.h index 092644fb..855d4227 100644 --- a/include/PolyVox/Region.h +++ b/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 diff --git a/include/PolyVox/Vector.h b/include/PolyVox/Vector.h index 2182e049..e7c86b19 100644 --- a/include/PolyVox/Vector.h +++ b/include/PolyVox/Vector.h @@ -242,7 +242,7 @@ namespace std } -#include "PolyVox/Vector.inl" +#include "Vector.inl" #endif diff --git a/include/PolyVox/Vertex.h b/include/PolyVox/Vertex.h index ebdb8074..94b454a1 100644 --- a/include/PolyVox/Vertex.h +++ b/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 #include diff --git a/include/PolyVox/VolumeResampler.h b/include/PolyVox/VolumeResampler.h index c2869262..ec07de7d 100644 --- a/include/PolyVox/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 "PolyVox/Region.h" +#include "Region.h" namespace PolyVox { @@ -51,7 +51,7 @@ namespace PolyVox }//namespace PolyVox -#include "PolyVox/VolumeResampler.inl" +#include "VolumeResampler.inl" #endif diff --git a/include/PolyVox/VolumeResampler.inl b/include/PolyVox/VolumeResampler.inl index 2170f8b9..019f4fe8 100644 --- a/include/PolyVox/VolumeResampler.inl +++ b/include/PolyVox/VolumeResampler.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVox/Interpolation.h" +#include "Interpolation.h" #include