From 403189f357a4eba45c1ecd0452f62f86ab3f5cc9 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 20 Dec 2015 21:19:20 +0000 Subject: [PATCH] Removed PolyVoxForwardDeclarations.h. It was a source of confusion because the forward declarations often got out of sync with the real definitions, resulting in confusing template error messages. Furthermore, it does not appear to have actually hurt compile times so I guess it wasn't that useful (or wasn't being used to it's fullest potential). Overall I think PolyVox is not large enough to really benefit from this. --- include/CMakeLists.txt | 1 - include/PolyVox/CubicSurfaceExtractor.h | 2 - include/PolyVox/LargeVolume.h | 1 - include/PolyVox/Mesh.h | 4 +- include/PolyVox/PolyVoxForwardDeclarations.h | 190 ------------------- include/PolyVox/SimpleVolume.h | 1 - include/PolyVox/Vector.h | 4 +- tests/testvolume.h | 3 +- 8 files changed, 5 insertions(+), 201 deletions(-) delete mode 100644 include/PolyVox/PolyVoxForwardDeclarations.h diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index f9515570..cde62476 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -57,7 +57,6 @@ SET(CORE_INC_FILES PolyVox/PagedVolume.inl PolyVox/PagedVolumeChunk.inl PolyVox/PagedVolumeSampler.inl - PolyVox/PolyVoxForwardDeclarations.h PolyVox/Picking.h PolyVox/Picking.inl PolyVox/RawVolume.h diff --git a/include/PolyVox/CubicSurfaceExtractor.h b/include/PolyVox/CubicSurfaceExtractor.h index 81d3120b..f2d07e28 100644 --- a/include/PolyVox/CubicSurfaceExtractor.h +++ b/include/PolyVox/CubicSurfaceExtractor.h @@ -26,8 +26,6 @@ freely, subject to the following restrictions: #include "Impl/PlatformDefinitions.h" -#include "PolyVoxForwardDeclarations.h" - #include "Array.h" #include "BaseVolume.h" //For wrap modes... should move these? #include "DefaultIsQuadNeeded.h" diff --git a/include/PolyVox/LargeVolume.h b/include/PolyVox/LargeVolume.h index 5dacf48a..6c137b37 100644 --- a/include/PolyVox/LargeVolume.h +++ b/include/PolyVox/LargeVolume.h @@ -4,6 +4,5 @@ #pragma message("WARNING - The LargeVolume class has been replaced by PagedVolume. Please use that instead.") #include "PagedVolume.h" -#include "PolyVoxForwardDeclarations.h" #endif //__PolyVox_LargeVolume_H__ \ No newline at end of file diff --git a/include/PolyVox/Mesh.h b/include/PolyVox/Mesh.h index 12a8470e..42f7c356 100644 --- a/include/PolyVox/Mesh.h +++ b/include/PolyVox/Mesh.h @@ -26,7 +26,6 @@ freely, subject to the following restrictions: #include "Impl/PlatformDefinitions.h" -#include "PolyVoxForwardDeclarations.h" #include "Region.h" #include "Vertex.h" //Should probably do away with this on in the future... @@ -39,7 +38,8 @@ freely, subject to the following restrictions: namespace PolyVox { - template + typedef uint32_t DefaultIndexType; + template class Mesh { public: diff --git a/include/PolyVox/PolyVoxForwardDeclarations.h b/include/PolyVox/PolyVoxForwardDeclarations.h deleted file mode 100644 index c0c1f872..00000000 --- a/include/PolyVox/PolyVoxForwardDeclarations.h +++ /dev/null @@ -1,190 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#ifndef __PolyVox_ForwardDeclarations_H__ -#define __PolyVox_ForwardDeclarations_H__ - -#include "Impl/PlatformDefinitions.h" - -#include - -namespace PolyVox -{ - //////////////////////////////////////////////////////////////////////////////// - // Array - //////////////////////////////////////////////////////////////////////////////// - /*template class Array; - - typedef Array<1,float> Array1DFloat; - typedef Array<1,double> Array1DDouble; - typedef Array<1,int8_t> Array1DInt8; - typedef Array<1,uint8_t> Array1DUint8; - typedef Array<1,int16_t> Array1DInt16; - typedef Array<1,uint16_t> Array1DUint16; - typedef Array<1,int32_t> Array1DInt32; - typedef Array<1,uint32_t> Array1DUint32;*/ - - /*typedef Array<2,float> Array2DFloat; - typedef Array<2,double> Array2DDouble; - typedef Array<2,int8_t> Array2DInt8; - typedef Array<2,uint8_t> Array2DUint8; - typedef Array<2,int16_t> Array2DInt16; - typedef Array<2,uint16_t> Array2DUint16; - typedef Array<2,int32_t> Array2DInt32; - typedef Array<2,uint32_t> Array2DUint32;*/ - - /*typedef Array<3,float> Array3DFloat; - typedef Array<3,double> Array3DDouble; - typedef Array<3,int8_t> Array3DInt8; - typedef Array<3,uint8_t> Array3DUint8; - typedef Array<3,int16_t> Array3DInt16; - typedef Array<3,uint16_t> Array3DUint16; - typedef Array<3,int32_t> Array3DInt32; - typedef Array<3,uint32_t> Array3DUint32;*/ - - //////////////////////////////////////////////////////////////////////////////// - // Compressor - //////////////////////////////////////////////////////////////////////////////// - class Compressor; - - //////////////////////////////////////////////////////////////////////////////// - // CubicSurfaceExtractor - //////////////////////////////////////////////////////////////////////////////// - template class DefaultIsQuadNeeded; - template > class CubicSurfaceExtractor; - - //////////////////////////////////////////////////////////////////////////////// - // CubicVertex - //////////////////////////////////////////////////////////////////////////////// - template struct CubicVertex; - - //////////////////////////////////////////////////////////////////////////////// - // Density - //////////////////////////////////////////////////////////////////////////////// - template class Density; - - typedef Density DensityI8; - typedef Density DensityU8; - typedef Density DensityI16; - typedef Density DensityU16; - typedef Density DensityFloat; - typedef Density DensityDouble; - - typedef DensityU8 Density8; //Backwards compatibility - typedef DensityU16 Density16; //Backwards compatibility - - //////////////////////////////////////////////////////////////////////////////// - // FilePager - //////////////////////////////////////////////////////////////////////////////// - template class FilePager; - - //////////////////////////////////////////////////////////////////////////////// - // MarchingCubesVertex - //////////////////////////////////////////////////////////////////////////////// - template struct MarchingCubesVertex; - - //////////////////////////////////////////////////////////////////////////////// - // Material - //////////////////////////////////////////////////////////////////////////////// - template class Material; - - typedef Material MaterialU8; - typedef Material MaterialU16; - typedef Material MaterialU32; - - typedef MaterialU8 Material8; - typedef MaterialU16 Material16; - typedef MaterialU32 Material32; - - //////////////////////////////////////////////////////////////////////////////// - // MaterialDensityPair - //////////////////////////////////////////////////////////////////////////////// - template class MaterialDensityPair; - - typedef MaterialDensityPair MaterialDensityPair44; - typedef MaterialDensityPair MaterialDensityPair88; - - //////////////////////////////////////////////////////////////////////////////// - // Mesh - //////////////////////////////////////////////////////////////////////////////// - typedef uint32_t DefaultIndexType; - template class Mesh; - - //////////////////////////////////////////////////////////////////////////////// - // PagedVolume - //////////////////////////////////////////////////////////////////////////////// - template class PagedVolume; - template - using LargeVolume = PagedVolume; - template - using SimpleVolume = PagedVolume; - - //////////////////////////////////////////////////////////////////////////////// - // Pager - //////////////////////////////////////////////////////////////////////////////// - template class Pager; - - //////////////////////////////////////////////////////////////////////////////// - // RawVolume - //////////////////////////////////////////////////////////////////////////////// - template class RawVolume; - - //////////////////////////////////////////////////////////////////////////////// - // Region - //////////////////////////////////////////////////////////////////////////////// - class Region; - - //////////////////////////////////////////////////////////////////////////////// - // Vector - //////////////////////////////////////////////////////////////////////////////// - template class Vector; - - typedef Vector<2,float,float> Vector2DFloat; - typedef Vector<2,double,double> Vector2DDouble; - typedef Vector<2,int8_t,int32_t> Vector2DInt8; - typedef Vector<2,uint8_t,int32_t> Vector2DUint8; - typedef Vector<2,int16_t,int32_t> Vector2DInt16; - typedef Vector<2,uint16_t,int32_t> Vector2DUint16; - typedef Vector<2,int32_t,int32_t> Vector2DInt32; - typedef Vector<2,uint32_t,int32_t> Vector2DUint32; - - typedef Vector<3,float,float> Vector3DFloat; - typedef Vector<3,double,double> Vector3DDouble; - typedef Vector<3,int8_t,int32_t> Vector3DInt8; - typedef Vector<3,uint8_t,int32_t> Vector3DUint8; - typedef Vector<3,int16_t,int32_t> Vector3DInt16; - typedef Vector<3,uint16_t,int32_t> Vector3DUint16; - typedef Vector<3,int32_t,int32_t> Vector3DInt32; - typedef Vector<3,uint32_t,int32_t> Vector3DUint32; - - typedef Vector<4,float,float> Vector4DFloat; - typedef Vector<4,double,double> Vector4DDouble; - typedef Vector<4,int8_t,int32_t> Vector4DInt8; - typedef Vector<4,uint8_t,int32_t> Vector4DUint8; - typedef Vector<4,int16_t,int32_t> Vector4DInt16; - typedef Vector<4,uint16_t,int32_t> Vector4DUint16; - typedef Vector<4,int32_t,int32_t> Vector4DInt32; - typedef Vector<4,uint32_t,int32_t> Vector4DUint32; -} - -#endif diff --git a/include/PolyVox/SimpleVolume.h b/include/PolyVox/SimpleVolume.h index 359ff6a7..b53902b9 100644 --- a/include/PolyVox/SimpleVolume.h +++ b/include/PolyVox/SimpleVolume.h @@ -4,6 +4,5 @@ #pragma message("WARNING - The SimpleVolume class has been replaced by PagedVolume. Please use that instead.") #include "PagedVolume.h" -#include "PolyVoxForwardDeclarations.h" #endif //__PolyVox_SimpleVolume_H__ \ No newline at end of file diff --git a/include/PolyVox/Vector.h b/include/PolyVox/Vector.h index e7c86b19..c09a5adc 100644 --- a/include/PolyVox/Vector.h +++ b/include/PolyVox/Vector.h @@ -27,8 +27,6 @@ freely, subject to the following restrictions: #include "Impl/ErrorHandling.h" #include "Impl/PlatformDefinitions.h" -#include "PolyVoxForwardDeclarations.h" - #include #include #include @@ -64,7 +62,7 @@ namespace PolyVox * Vector2DInt32 test(1,2); //Declares a 2 dimensional Vector of type int32_t. * \endcode */ - template + template class Vector { public: diff --git a/tests/testvolume.h b/tests/testvolume.h index 624c155c..3d7409b1 100644 --- a/tests/testvolume.h +++ b/tests/testvolume.h @@ -24,8 +24,9 @@ freely, subject to the following restrictions: #ifndef __PolyVox_TestVolume_H__ #define __PolyVox_TestVolume_H__ -#include "PolyVox/PolyVoxForwardDeclarations.h" +#include "PolyVox/FilePager.h" #include "PolyVox/PagedVolume.h" +#include "PolyVox/RawVolume.h" #include "PolyVox/Region.h" #include