diff --git a/library/PolyVoxCore/include/Array.h b/library/PolyVoxCore/include/Array.h index b9cc5207..80e10f56 100644 --- a/library/PolyVoxCore/include/Array.h +++ b/library/PolyVoxCore/include/Array.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,16 +20,13 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Array_H__ #define __PolyVox_Array_H__ -#pragma region Headers #include "ArraySizes.h" //Not strictly required, but convienient #include "PolyVoxImpl/SubArray.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/ArraySizes.h b/library/PolyVoxCore/include/ArraySizes.h index d3dfcbf2..5d08470d 100644 --- a/library/PolyVoxCore/include/ArraySizes.h +++ b/library/PolyVoxCore/include/ArraySizes.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,15 +20,12 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_ArraySizes_H__ #define __PolyVox_ArraySizes_H__ -#pragma region Headers #include "PolyVoxImpl/ArraySizesImpl.h" #include "PolyVoxImpl/TypeDef.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/CubicSurfaceExtractor.h b/library/PolyVoxCore/include/CubicSurfaceExtractor.h index 007da2ca..516edaca 100644 --- a/library/PolyVoxCore/include/CubicSurfaceExtractor.h +++ b/library/PolyVoxCore/include/CubicSurfaceExtractor.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,17 +20,14 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_CubicSurfaceExtractor_H__ #define __PolyVox_CubicSurfaceExtractor_H__ -#pragma region Headers #include "PolyVoxForwardDeclarations.h" #include "VolumeSampler.h" #include "PolyVoxImpl/TypeDef.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/Filters.h b/library/PolyVoxCore/include/Filters.h index 7104f81c..409f8bee 100644 --- a/library/PolyVoxCore/include/Filters.h +++ b/library/PolyVoxCore/include/Filters.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,16 +20,13 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Filters_H__ #define __PolyVox_Filters_H__ -#pragma region Headers #include "Array.h" #include "Region.h" #include "Volume.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/GradientEstimators.inl b/library/PolyVoxCore/include/GradientEstimators.inl index 4b5e1c0d..976e7540 100644 --- a/library/PolyVoxCore/include/GradientEstimators.inl +++ b/library/PolyVoxCore/include/GradientEstimators.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "VoxelFilters.h" diff --git a/library/PolyVoxCore/include/MaterialDensityPair.h b/library/PolyVoxCore/include/MaterialDensityPair.h index 4377c132..49370f97 100644 --- a/library/PolyVoxCore/include/MaterialDensityPair.h +++ b/library/PolyVoxCore/include/MaterialDensityPair.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,15 +20,12 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_MaterialDensityPair_H__ #define __PolyVox_MaterialDensityPair_H__ -#pragma region Headers #include "PolyVoxForwardDeclarations.h" #include "PolyVoxImpl/TypeDef.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/MaterialDensityPair.inl b/library/PolyVoxCore/include/MaterialDensityPair.inl index 2533595d..d5ffbcf8 100644 --- a/library/PolyVoxCore/include/MaterialDensityPair.inl +++ b/library/PolyVoxCore/include/MaterialDensityPair.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,10 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion - -#pragma region Headers -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/Mesh.h b/library/PolyVoxCore/include/Mesh.h index 5e29fd6c..f3d25848 100644 --- a/library/PolyVoxCore/include/Mesh.h +++ b/library/PolyVoxCore/include/Mesh.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Mesh_H__ #define __PolyVox_Mesh_H__ diff --git a/library/PolyVoxCore/include/MeshEdge.h b/library/PolyVoxCore/include/MeshEdge.h index add607d9..f4619cf8 100644 --- a/library/PolyVoxCore/include/MeshEdge.h +++ b/library/PolyVoxCore/include/MeshEdge.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_MeshEdge_H__ #define __PolyVox_MeshEdge_H__ diff --git a/library/PolyVoxCore/include/MeshFace.h b/library/PolyVoxCore/include/MeshFace.h index 4c7e7a8b..207383da 100644 --- a/library/PolyVoxCore/include/MeshFace.h +++ b/library/PolyVoxCore/include/MeshFace.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_MeshFace_H__ #define __PolyVox_MeshFace_H__ diff --git a/library/PolyVoxCore/include/MeshVertex.h b/library/PolyVoxCore/include/MeshVertex.h index 9cbd26f1..98f2f1dd 100644 --- a/library/PolyVoxCore/include/MeshVertex.h +++ b/library/PolyVoxCore/include/MeshVertex.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_MeshVertex_H__ #define __PolyVox_MeshVertex_H__ diff --git a/library/PolyVoxCore/include/PolyVoxForwardDeclarations.h b/library/PolyVoxCore/include/PolyVoxForwardDeclarations.h index 13fbfad0..1eaa818c 100644 --- a/library/PolyVoxCore/include/PolyVoxForwardDeclarations.h +++ b/library/PolyVoxCore/include/PolyVoxForwardDeclarations.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_ForwardDeclarations_H__ #define __PolyVox_ForwardDeclarations_H__ diff --git a/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h b/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h index 6139f9c9..675c52ab 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h +++ b/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,14 +20,11 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_ArraySizesImpl_H__ #define __PolyVox_ArraySizesImpl_H__ -#pragma region Headers #include "TypeDef.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.inl b/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.inl index 613d3dc0..727a885a 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.inl +++ b/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Block.h b/library/PolyVoxCore/include/PolyVoxImpl/Block.h index bae3cf38..e95c1923 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/Block.h +++ b/library/PolyVoxCore/include/PolyVoxImpl/Block.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,14 +20,11 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Block_H__ #define __PolyVox_Block_H__ -#pragma region Headers #include "PolyVoxForwardDeclarations.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl index b2995d25..c088917f 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl +++ b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,9 +20,7 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion -#pragma region Headers #include "PolyVoxImpl/Utility.h" #include "Vector.h" #include "Volume.h" @@ -31,11 +28,9 @@ freely, subject to the following restrictions: #include #include //For memcpy #include //for std::invalid_argument -#pragma endregion namespace PolyVox { - #pragma region Constructors/Destructors template Block::Block(uint16_t uSideLength) :m_tData(0) @@ -70,9 +65,7 @@ namespace PolyVox delete[] m_tData; m_tData = 0; } - #pragma endregion - #pragma region Operators template Block& Block::operator=(const Block& rhs) { @@ -92,9 +85,7 @@ namespace PolyVox return *this; } - #pragma endregion - #pragma region Getters template uint16_t Block::getSideLength(void) const { @@ -121,9 +112,7 @@ namespace PolyVox { return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ()); } - #pragma endregion - #pragma region Setters template void Block::setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue) { @@ -144,9 +133,7 @@ namespace PolyVox { setVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ(), tValue); } - #pragma endregion - #pragma region Other template void Block::fill(VoxelType tValue) { @@ -187,5 +174,4 @@ namespace PolyVox return uSizeInChars; } - #pragma endregion } diff --git a/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h b/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h index 946bc472..c2c1656e 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h +++ b/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_MarchingCubeTables_H__ #define __PolyVox_MarchingCubeTables_H__ diff --git a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h index 2fa22977..c51363d0 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h +++ b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,14 +20,10 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_SubArray_H__ #define __PolyVox_SubArray_H__ -#pragma region Headers -#pragma endregion - namespace PolyVox { template class Array; diff --git a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl index f41a0f49..7417a1c0 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl +++ b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include diff --git a/library/PolyVoxCore/include/PolyVoxImpl/TypeDef.h b/library/PolyVoxCore/include/PolyVoxImpl/TypeDef.h index 51b8e23c..9c22a42d 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/TypeDef.h +++ b/library/PolyVoxCore/include/PolyVoxImpl/TypeDef.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_TypeDef_H__ #define __PolyVox_TypeDef_H__ diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Utility.h b/library/PolyVoxCore/include/PolyVoxImpl/Utility.h index 023ac0fb..b9ddc22d 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/Utility.h +++ b/library/PolyVoxCore/include/PolyVoxImpl/Utility.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Utility_H__ #define __PolyVox_Utility_H__ diff --git a/library/PolyVoxCore/include/Region.h b/library/PolyVoxCore/include/Region.h index 9f103ab8..fa8b74f2 100644 --- a/library/PolyVoxCore/include/Region.h +++ b/library/PolyVoxCore/include/Region.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,15 +20,12 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Region_H__ #define __PolyVox_Region_H__ -#pragma region Headers #include "PolyVoxImpl/TypeDef.h" #include "Vector.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/SurfaceExtractor.h b/library/PolyVoxCore/include/SurfaceExtractor.h index 3c76f6bb..cc5b08bc 100644 --- a/library/PolyVoxCore/include/SurfaceExtractor.h +++ b/library/PolyVoxCore/include/SurfaceExtractor.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,17 +20,14 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_SurfaceExtractor_H__ #define __PolyVox_SurfaceExtractor_H__ -#pragma region Headers #include "PolyVoxForwardDeclarations.h" #include "VolumeSampler.h" #include "PolyVoxImpl/TypeDef.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/SurfaceMesh.h b/library/PolyVoxCore/include/SurfaceMesh.h index fc716731..e2ae6c91 100644 --- a/library/PolyVoxCore/include/SurfaceMesh.h +++ b/library/PolyVoxCore/include/SurfaceMesh.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_SurfaceMesh_H__ #define __PolyVox_SurfaceMesh_H__ diff --git a/library/PolyVoxCore/include/SurfaceVertex.h b/library/PolyVoxCore/include/SurfaceVertex.h index 1b09b4f3..ee28d7f9 100644 --- a/library/PolyVoxCore/include/SurfaceVertex.h +++ b/library/PolyVoxCore/include/SurfaceVertex.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_SurfaceVertex_H__ #define __PolyVox_SurfaceVertex_H__ diff --git a/library/PolyVoxCore/include/Vector.h b/library/PolyVoxCore/include/Vector.h index d554453c..35358b22 100644 --- a/library/PolyVoxCore/include/Vector.h +++ b/library/PolyVoxCore/include/Vector.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,16 +20,13 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Vector_H__ #define __PolyVox_Vector_H__ -#pragma region Headers #include "PolyVoxForwardDeclarations.h" #include -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/Vector.inl b/library/PolyVoxCore/include/Vector.inl index 1476b0bf..4ea00984 100644 --- a/library/PolyVoxCore/include/Vector.inl +++ b/library/PolyVoxCore/include/Vector.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include #include @@ -30,7 +28,6 @@ freely, subject to the following restrictions: namespace PolyVox { - #pragma region Constructors/Destructors //-------------------------- Constructors, etc --------------------------------- /** Creates a Vector object and initialises it with given values. @@ -120,9 +117,7 @@ namespace PolyVox Vector::~Vector(void) throw() { } - #pragma endregion - #pragma region Operators /** Assignment operator copies each element of first Vector to the second. \param rhs Vector to assign to. @@ -317,9 +312,7 @@ namespace PolyVox os << ")"; return os; } - #pragma endregion - #pragma region Getters /** Returns the element at the given position. \param index The index of the element to return. @@ -366,9 +359,7 @@ namespace PolyVox { return m_tElements[3]; } - #pragma endregion - #pragma region Setters /** \param index The index of the element to set. \param tValue The new value for the element. @@ -458,9 +449,7 @@ namespace PolyVox { m_tElements[3] = tW; } - #pragma endregion - #pragma region Others /** NOTE: This function does not make much sense on integer Vectors. \return Length of the Vector. @@ -559,5 +548,4 @@ namespace PolyVox m_tElements[ct] /= static_cast(length); } } - #pragma endregion }//namespace PolyVox diff --git a/library/PolyVoxCore/include/Volume.h b/library/PolyVoxCore/include/Volume.h index 6f18ec0a..5d02b8a6 100644 --- a/library/PolyVoxCore/include/Volume.h +++ b/library/PolyVoxCore/include/Volume.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,12 +20,10 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Volume_H__ #define __PolyVox_Volume_H__ -#pragma region Headers #include "PolyVoxImpl/Block.h" #include "PolyVoxForwardDeclarations.h" @@ -35,8 +32,6 @@ freely, subject to the following restrictions: #include #include -#pragma endregion - namespace PolyVox { ///The Volume class provides a memory efficient method of storing voxel data while also allowing fast access and modification. diff --git a/library/PolyVoxCore/include/Volume.inl b/library/PolyVoxCore/include/Volume.inl index 64631fc3..bf406a35 100644 --- a/library/PolyVoxCore/include/Volume.inl +++ b/library/PolyVoxCore/include/Volume.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,9 +20,7 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion -#pragma region Headers #include "PolyVoxImpl/Block.h" #include "Log.h" #include "VolumeSampler.h" @@ -34,11 +31,9 @@ freely, subject to the following restrictions: #include //For memcpy #include #include //For invalid_argument -#pragma endregion namespace PolyVox { - #pragma region Constructors/Destructors //////////////////////////////////////////////////////////////////////////////// /// Builds a volume of the desired dimensions /// \param uWidth The desired width in voxels. This must be a power of two. @@ -70,12 +65,6 @@ namespace PolyVox Volume::~Volume() { } - #pragma endregion - - #pragma region Operators - #pragma endregion - - #pragma region Getters template //////////////////////////////////////////////////////////////////////////////// @@ -209,9 +198,7 @@ namespace PolyVox { return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ()); } - #pragma endregion - #pragma region Setters //////////////////////////////////////////////////////////////////////////////// /// \param tBorder The value to use for voxels outside the volume. //////////////////////////////////////////////////////////////////////////////// @@ -290,9 +277,6 @@ namespace PolyVox { return setVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ(), tValue); } - #pragma endregion - - #pragma region Other //////////////////////////////////////////////////////////////////////////////// /// Note: Calling this function will destroy all existing data in the volume. @@ -437,9 +421,7 @@ namespace PolyVox } } } - #pragma endregion - #pragma region Private Implementation template polyvox_shared_ptr< Block > Volume::getHomogenousBlock(VoxelType tHomogenousValue) { @@ -461,5 +443,4 @@ namespace PolyVox return iterResult->second; } } - #pragma endregion } diff --git a/library/PolyVoxCore/include/VolumeSampler.h b/library/PolyVoxCore/include/VolumeSampler.h index 00a8af61..c2831734 100644 --- a/library/PolyVoxCore/include/VolumeSampler.h +++ b/library/PolyVoxCore/include/VolumeSampler.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,14 +20,11 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __VolumeSampler_H__ #define __VolumeSampler_H__ -#pragma region Headers #include "PolyVoxForwardDeclarations.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/include/VolumeSampler.inl b/library/PolyVoxCore/include/VolumeSampler.inl index 1f5b817c..dc15f8a5 100644 --- a/library/PolyVoxCore/include/VolumeSampler.inl +++ b/library/PolyVoxCore/include/VolumeSampler.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,20 +20,15 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion -#pragma region Headers #include "PolyVoxImpl/Block.h" #include "Volume.h" #include "Vector.h" #include "Region.h" #include -#pragma endregion - namespace PolyVox { - #pragma region Constructors/Destructors template VolumeSampler::VolumeSampler(Volume* volume) :mVolume(volume) @@ -45,9 +39,7 @@ namespace PolyVox VolumeSampler::~VolumeSampler() { } - #pragma endregion - #pragma region Operators template VolumeSampler& VolumeSampler::operator=(const VolumeSampler& rhs) throw() { @@ -62,9 +54,7 @@ namespace PolyVox mCurrentVoxel = rhs.mCurrentVoxel; return *this; } - #pragma endregion - #pragma region Getters template uint16_t VolumeSampler::getPosX(void) const { @@ -132,9 +122,7 @@ namespace PolyVox { return *mCurrentVoxel; } - #pragma endregion - #pragma region Setters template void VolumeSampler::setPosition(const Vector3DInt16& v3dNewPos) { @@ -174,9 +162,7 @@ namespace PolyVox mCurrentVoxel = mVolume->m_pBorderBlock->m_tData + uVoxelIndexInBlock; } } - #pragma endregion - #pragma region Other template void VolumeSampler::movePositiveX(void) { @@ -272,9 +258,7 @@ namespace PolyVox setPosition(mXPosInVolume, mYPosInVolume, mZPosInVolume); } } - #pragma endregion - #pragma region Peekers template VoxelType VolumeSampler::peekVoxel1nx1ny1nz(void) const { @@ -544,5 +528,4 @@ namespace PolyVox } return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume+1); } - #pragma endregion } diff --git a/library/PolyVoxCore/include/VoxelFilters.h b/library/PolyVoxCore/include/VoxelFilters.h index 5a1e04e7..ce6b3c2c 100644 --- a/library/PolyVoxCore/include/VoxelFilters.h +++ b/library/PolyVoxCore/include/VoxelFilters.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,15 +20,12 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_VoxelFilters_H__ #define __PolyVox_VoxelFilters_H__ -#pragma region Headers #include "PolyVoxForwardDeclarations.h" #include "PolyVoxImpl/TypeDef.h" -#pragma endregion namespace PolyVox { diff --git a/library/PolyVoxCore/source/ArraySizes.cpp b/library/PolyVoxCore/source/ArraySizes.cpp index 7e902acf..cd2b5410 100644 --- a/library/PolyVoxCore/source/ArraySizes.cpp +++ b/library/PolyVoxCore/source/ArraySizes.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "ArraySizes.h" diff --git a/library/PolyVoxCore/source/Mesh.cpp b/library/PolyVoxCore/source/Mesh.cpp index 6486f9a9..686e7c62 100644 --- a/library/PolyVoxCore/source/Mesh.cpp +++ b/library/PolyVoxCore/source/Mesh.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "Mesh.h" diff --git a/library/PolyVoxCore/source/MeshEdge.cpp b/library/PolyVoxCore/source/MeshEdge.cpp index b6574f06..33af62a3 100644 --- a/library/PolyVoxCore/source/MeshEdge.cpp +++ b/library/PolyVoxCore/source/MeshEdge.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "MeshEdge.h" diff --git a/library/PolyVoxCore/source/MeshFace.cpp b/library/PolyVoxCore/source/MeshFace.cpp index fbfd10a8..a1a0ce1d 100644 --- a/library/PolyVoxCore/source/MeshFace.cpp +++ b/library/PolyVoxCore/source/MeshFace.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "MeshFace.h" diff --git a/library/PolyVoxCore/source/MeshVertex.cpp b/library/PolyVoxCore/source/MeshVertex.cpp index f67c8c64..2fddd5ad 100644 --- a/library/PolyVoxCore/source/MeshVertex.cpp +++ b/library/PolyVoxCore/source/MeshVertex.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "MeshVertex.h" diff --git a/library/PolyVoxCore/source/PolyVoxImpl/MarchingCubesTables.cpp b/library/PolyVoxCore/source/PolyVoxImpl/MarchingCubesTables.cpp index 50c1ee2c..b9175671 100644 --- a/library/PolyVoxCore/source/PolyVoxImpl/MarchingCubesTables.cpp +++ b/library/PolyVoxCore/source/PolyVoxImpl/MarchingCubesTables.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion //These tables were based on the article "Polygonising a scalar field". //They have been optimised to allow a more efficient algorithm via bitwise operations. diff --git a/library/PolyVoxCore/source/PolyVoxImpl/Utility.cpp b/library/PolyVoxCore/source/PolyVoxImpl/Utility.cpp index 499b4e5c..34cf5651 100644 --- a/library/PolyVoxCore/source/PolyVoxImpl/Utility.cpp +++ b/library/PolyVoxCore/source/PolyVoxImpl/Utility.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "PolyVoxImpl/Utility.h" diff --git a/library/PolyVoxCore/source/SurfaceMesh.cpp b/library/PolyVoxCore/source/SurfaceMesh.cpp index 1876f283..a815a19d 100644 --- a/library/PolyVoxCore/source/SurfaceMesh.cpp +++ b/library/PolyVoxCore/source/SurfaceMesh.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "SurfaceMesh.h" diff --git a/library/PolyVoxCore/source/SurfaceVertex.cpp b/library/PolyVoxCore/source/SurfaceVertex.cpp index 6cc1ae1b..db0bf55f 100644 --- a/library/PolyVoxCore/source/SurfaceVertex.cpp +++ b/library/PolyVoxCore/source/SurfaceVertex.cpp @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include diff --git a/library/PolyVoxUtil/include/Export.h b/library/PolyVoxUtil/include/Export.h index 410d35c7..518277ac 100644 --- a/library/PolyVoxUtil/include/Export.h +++ b/library/PolyVoxUtil/include/Export.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVoxUtil_Export_H__ #define __PolyVoxUtil_Export_H__ diff --git a/library/PolyVoxUtil/include/Serialization.h b/library/PolyVoxUtil/include/Serialization.h index 0c8412e5..f7ae55d1 100644 --- a/library/PolyVoxUtil/include/Serialization.h +++ b/library/PolyVoxUtil/include/Serialization.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_Serialization_H__ #define __PolyVox_Serialization_H__ diff --git a/library/PolyVoxUtil/include/VolumeChangeTracker.h b/library/PolyVoxUtil/include/VolumeChangeTracker.h index 303ad367..5a2713e4 100644 --- a/library/PolyVoxUtil/include/VolumeChangeTracker.h +++ b/library/PolyVoxUtil/include/VolumeChangeTracker.h @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #ifndef __PolyVox_VolumeChangeTracker_H__ #define __PolyVox_VolumeChangeTracker_H__ diff --git a/library/PolyVoxUtil/include/VolumeChangeTracker.inl b/library/PolyVoxUtil/include/VolumeChangeTracker.inl index 1a71ce73..1829850d 100644 --- a/library/PolyVoxUtil/include/VolumeChangeTracker.inl +++ b/library/PolyVoxUtil/include/VolumeChangeTracker.inl @@ -1,4 +1,3 @@ -#pragma region License /******************************************************************************* Copyright (c) 2005-2009 David Williams @@ -21,7 +20,6 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. *******************************************************************************/ -#pragma endregion #include "VolumeChangeTracker.h"