Removed all the #pragma region/endregions as these were causing compile warnings from GCC and weren't that useful anyway...

This commit is contained in:
David Williams 2010-10-12 22:22:38 +00:00
parent 059ca90f08
commit 56ec37f5e2
45 changed files with 0 additions and 177 deletions

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Array_H__ #ifndef __PolyVox_Array_H__
#define __PolyVox_Array_H__ #define __PolyVox_Array_H__
#pragma region Headers
#include "ArraySizes.h" //Not strictly required, but convienient #include "ArraySizes.h" //Not strictly required, but convienient
#include "PolyVoxImpl/SubArray.h" #include "PolyVoxImpl/SubArray.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_ArraySizes_H__ #ifndef __PolyVox_ArraySizes_H__
#define __PolyVox_ArraySizes_H__ #define __PolyVox_ArraySizes_H__
#pragma region Headers
#include "PolyVoxImpl/ArraySizesImpl.h" #include "PolyVoxImpl/ArraySizesImpl.h"
#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/TypeDef.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_CubicSurfaceExtractor_H__ #ifndef __PolyVox_CubicSurfaceExtractor_H__
#define __PolyVox_CubicSurfaceExtractor_H__ #define __PolyVox_CubicSurfaceExtractor_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#include "VolumeSampler.h" #include "VolumeSampler.h"
#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/TypeDef.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Filters_H__ #ifndef __PolyVox_Filters_H__
#define __PolyVox_Filters_H__ #define __PolyVox_Filters_H__
#pragma region Headers
#include "Array.h" #include "Array.h"
#include "Region.h" #include "Region.h"
#include "Volume.h" #include "Volume.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "VoxelFilters.h" #include "VoxelFilters.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_MaterialDensityPair_H__ #ifndef __PolyVox_MaterialDensityPair_H__
#define __PolyVox_MaterialDensityPair_H__ #define __PolyVox_MaterialDensityPair_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/TypeDef.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#pragma region Headers
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Mesh_H__ #ifndef __PolyVox_Mesh_H__
#define __PolyVox_Mesh_H__ #define __PolyVox_Mesh_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_MeshEdge_H__ #ifndef __PolyVox_MeshEdge_H__
#define __PolyVox_MeshEdge_H__ #define __PolyVox_MeshEdge_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_MeshFace_H__ #ifndef __PolyVox_MeshFace_H__
#define __PolyVox_MeshFace_H__ #define __PolyVox_MeshFace_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_MeshVertex_H__ #ifndef __PolyVox_MeshVertex_H__
#define __PolyVox_MeshVertex_H__ #define __PolyVox_MeshVertex_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_ForwardDeclarations_H__ #ifndef __PolyVox_ForwardDeclarations_H__
#define __PolyVox_ForwardDeclarations_H__ #define __PolyVox_ForwardDeclarations_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_ArraySizesImpl_H__ #ifndef __PolyVox_ArraySizesImpl_H__
#define __PolyVox_ArraySizesImpl_H__ #define __PolyVox_ArraySizesImpl_H__
#pragma region Headers
#include "TypeDef.h" #include "TypeDef.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include <algorithm> #include <algorithm>

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Block_H__ #ifndef __PolyVox_Block_H__
#define __PolyVox_Block_H__ #define __PolyVox_Block_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#pragma region Headers
#include "PolyVoxImpl/Utility.h" #include "PolyVoxImpl/Utility.h"
#include "Vector.h" #include "Vector.h"
#include "Volume.h" #include "Volume.h"
@ -31,11 +28,9 @@ freely, subject to the following restrictions:
#include <cassert> #include <cassert>
#include <cstring> //For memcpy #include <cstring> //For memcpy
#include <stdexcept> //for std::invalid_argument #include <stdexcept> //for std::invalid_argument
#pragma endregion
namespace PolyVox namespace PolyVox
{ {
#pragma region Constructors/Destructors
template <typename VoxelType> template <typename VoxelType>
Block<VoxelType>::Block(uint16_t uSideLength) Block<VoxelType>::Block(uint16_t uSideLength)
:m_tData(0) :m_tData(0)
@ -70,9 +65,7 @@ namespace PolyVox
delete[] m_tData; delete[] m_tData;
m_tData = 0; m_tData = 0;
} }
#pragma endregion
#pragma region Operators
template <typename VoxelType> template <typename VoxelType>
Block<VoxelType>& Block<VoxelType>::operator=(const Block<VoxelType>& rhs) Block<VoxelType>& Block<VoxelType>::operator=(const Block<VoxelType>& rhs)
{ {
@ -92,9 +85,7 @@ namespace PolyVox
return *this; return *this;
} }
#pragma endregion
#pragma region Getters
template <typename VoxelType> template <typename VoxelType>
uint16_t Block<VoxelType>::getSideLength(void) const uint16_t Block<VoxelType>::getSideLength(void) const
{ {
@ -121,9 +112,7 @@ namespace PolyVox
{ {
return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ()); return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
} }
#pragma endregion
#pragma region Setters
template <typename VoxelType> template <typename VoxelType>
void Block<VoxelType>::setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue) void Block<VoxelType>::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); setVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ(), tValue);
} }
#pragma endregion
#pragma region Other
template <typename VoxelType> template <typename VoxelType>
void Block<VoxelType>::fill(VoxelType tValue) void Block<VoxelType>::fill(VoxelType tValue)
{ {
@ -187,5 +174,4 @@ namespace PolyVox
return uSizeInChars; return uSizeInChars;
} }
#pragma endregion
} }

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_MarchingCubeTables_H__ #ifndef __PolyVox_MarchingCubeTables_H__
#define __PolyVox_MarchingCubeTables_H__ #define __PolyVox_MarchingCubeTables_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_SubArray_H__ #ifndef __PolyVox_SubArray_H__
#define __PolyVox_SubArray_H__ #define __PolyVox_SubArray_H__
#pragma region Headers
#pragma endregion
namespace PolyVox namespace PolyVox
{ {
template <uint32_t noOfDims, typename ElementType> class Array; template <uint32_t noOfDims, typename ElementType> class Array;

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include <cassert> #include <cassert>

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_TypeDef_H__ #ifndef __PolyVox_TypeDef_H__
#define __PolyVox_TypeDef_H__ #define __PolyVox_TypeDef_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Utility_H__ #ifndef __PolyVox_Utility_H__
#define __PolyVox_Utility_H__ #define __PolyVox_Utility_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Region_H__ #ifndef __PolyVox_Region_H__
#define __PolyVox_Region_H__ #define __PolyVox_Region_H__
#pragma region Headers
#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/TypeDef.h"
#include "Vector.h" #include "Vector.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_SurfaceExtractor_H__ #ifndef __PolyVox_SurfaceExtractor_H__
#define __PolyVox_SurfaceExtractor_H__ #define __PolyVox_SurfaceExtractor_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#include "VolumeSampler.h" #include "VolumeSampler.h"
#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/TypeDef.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_SurfaceMesh_H__ #ifndef __PolyVox_SurfaceMesh_H__
#define __PolyVox_SurfaceMesh_H__ #define __PolyVox_SurfaceMesh_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_SurfaceVertex_H__ #ifndef __PolyVox_SurfaceVertex_H__
#define __PolyVox_SurfaceVertex_H__ #define __PolyVox_SurfaceVertex_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Vector_H__ #ifndef __PolyVox_Vector_H__
#define __PolyVox_Vector_H__ #define __PolyVox_Vector_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#include <iostream> #include <iostream>
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
@ -30,7 +28,6 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
#pragma region Constructors/Destructors
//-------------------------- Constructors, etc --------------------------------- //-------------------------- Constructors, etc ---------------------------------
/** /**
Creates a Vector object and initialises it with given values. Creates a Vector object and initialises it with given values.
@ -120,9 +117,7 @@ namespace PolyVox
Vector<Size, Type>::~Vector(void) throw() Vector<Size, Type>::~Vector(void) throw()
{ {
} }
#pragma endregion
#pragma region Operators
/** /**
Assignment operator copies each element of first Vector to the second. Assignment operator copies each element of first Vector to the second.
\param rhs Vector to assign to. \param rhs Vector to assign to.
@ -317,9 +312,7 @@ namespace PolyVox
os << ")"; os << ")";
return os; return os;
} }
#pragma endregion
#pragma region Getters
/** /**
Returns the element at the given position. Returns the element at the given position.
\param index The index of the element to return. \param index The index of the element to return.
@ -366,9 +359,7 @@ namespace PolyVox
{ {
return m_tElements[3]; return m_tElements[3];
} }
#pragma endregion
#pragma region Setters
/** /**
\param index The index of the element to set. \param index The index of the element to set.
\param tValue The new value for the element. \param tValue The new value for the element.
@ -458,9 +449,7 @@ namespace PolyVox
{ {
m_tElements[3] = tW; m_tElements[3] = tW;
} }
#pragma endregion
#pragma region Others
/** /**
NOTE: This function does not make much sense on integer Vectors. NOTE: This function does not make much sense on integer Vectors.
\return Length of the Vector. \return Length of the Vector.
@ -559,5 +548,4 @@ namespace PolyVox
m_tElements[ct] /= static_cast<Type>(length); m_tElements[ct] /= static_cast<Type>(length);
} }
} }
#pragma endregion
}//namespace PolyVox }//namespace PolyVox

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Volume_H__ #ifndef __PolyVox_Volume_H__
#define __PolyVox_Volume_H__ #define __PolyVox_Volume_H__
#pragma region Headers
#include "PolyVoxImpl/Block.h" #include "PolyVoxImpl/Block.h"
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
@ -35,8 +32,6 @@ freely, subject to the following restrictions:
#include <memory> #include <memory>
#include <vector> #include <vector>
#pragma endregion
namespace PolyVox namespace PolyVox
{ {
///The Volume class provides a memory efficient method of storing voxel data while also allowing fast access and modification. ///The Volume class provides a memory efficient method of storing voxel data while also allowing fast access and modification.

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#pragma region Headers
#include "PolyVoxImpl/Block.h" #include "PolyVoxImpl/Block.h"
#include "Log.h" #include "Log.h"
#include "VolumeSampler.h" #include "VolumeSampler.h"
@ -34,11 +31,9 @@ freely, subject to the following restrictions:
#include <cstring> //For memcpy #include <cstring> //For memcpy
#include <list> #include <list>
#include <stdexcept> //For invalid_argument #include <stdexcept> //For invalid_argument
#pragma endregion
namespace PolyVox namespace PolyVox
{ {
#pragma region Constructors/Destructors
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// Builds a volume of the desired dimensions /// Builds a volume of the desired dimensions
/// \param uWidth The desired width in voxels. This must be a power of two. /// \param uWidth The desired width in voxels. This must be a power of two.
@ -70,12 +65,6 @@ namespace PolyVox
Volume<VoxelType>::~Volume() Volume<VoxelType>::~Volume()
{ {
} }
#pragma endregion
#pragma region Operators
#pragma endregion
#pragma region Getters
template <typename VoxelType> template <typename VoxelType>
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -209,9 +198,7 @@ namespace PolyVox
{ {
return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ()); return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
} }
#pragma endregion
#pragma region Setters
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \param tBorder The value to use for voxels outside the volume. /// \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); 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. /// 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 <typename VoxelType> template <typename VoxelType>
polyvox_shared_ptr< Block<VoxelType> > Volume<VoxelType>::getHomogenousBlock(VoxelType tHomogenousValue) polyvox_shared_ptr< Block<VoxelType> > Volume<VoxelType>::getHomogenousBlock(VoxelType tHomogenousValue)
{ {
@ -461,5 +443,4 @@ namespace PolyVox
return iterResult->second; return iterResult->second;
} }
} }
#pragma endregion
} }

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __VolumeSampler_H__ #ifndef __VolumeSampler_H__
#define __VolumeSampler_H__ #define __VolumeSampler_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#pragma region Headers
#include "PolyVoxImpl/Block.h" #include "PolyVoxImpl/Block.h"
#include "Volume.h" #include "Volume.h"
#include "Vector.h" #include "Vector.h"
#include "Region.h" #include "Region.h"
#include <limits> #include <limits>
#pragma endregion
namespace PolyVox namespace PolyVox
{ {
#pragma region Constructors/Destructors
template <typename VoxelType> template <typename VoxelType>
VolumeSampler<VoxelType>::VolumeSampler(Volume<VoxelType>* volume) VolumeSampler<VoxelType>::VolumeSampler(Volume<VoxelType>* volume)
:mVolume(volume) :mVolume(volume)
@ -45,9 +39,7 @@ namespace PolyVox
VolumeSampler<VoxelType>::~VolumeSampler() VolumeSampler<VoxelType>::~VolumeSampler()
{ {
} }
#pragma endregion
#pragma region Operators
template <typename VoxelType> template <typename VoxelType>
VolumeSampler<VoxelType>& VolumeSampler<VoxelType>::operator=(const VolumeSampler<VoxelType>& rhs) throw() VolumeSampler<VoxelType>& VolumeSampler<VoxelType>::operator=(const VolumeSampler<VoxelType>& rhs) throw()
{ {
@ -62,9 +54,7 @@ namespace PolyVox
mCurrentVoxel = rhs.mCurrentVoxel; mCurrentVoxel = rhs.mCurrentVoxel;
return *this; return *this;
} }
#pragma endregion
#pragma region Getters
template <typename VoxelType> template <typename VoxelType>
uint16_t VolumeSampler<VoxelType>::getPosX(void) const uint16_t VolumeSampler<VoxelType>::getPosX(void) const
{ {
@ -132,9 +122,7 @@ namespace PolyVox
{ {
return *mCurrentVoxel; return *mCurrentVoxel;
} }
#pragma endregion
#pragma region Setters
template <typename VoxelType> template <typename VoxelType>
void VolumeSampler<VoxelType>::setPosition(const Vector3DInt16& v3dNewPos) void VolumeSampler<VoxelType>::setPosition(const Vector3DInt16& v3dNewPos)
{ {
@ -174,9 +162,7 @@ namespace PolyVox
mCurrentVoxel = mVolume->m_pBorderBlock->m_tData + uVoxelIndexInBlock; mCurrentVoxel = mVolume->m_pBorderBlock->m_tData + uVoxelIndexInBlock;
} }
} }
#pragma endregion
#pragma region Other
template <typename VoxelType> template <typename VoxelType>
void VolumeSampler<VoxelType>::movePositiveX(void) void VolumeSampler<VoxelType>::movePositiveX(void)
{ {
@ -272,9 +258,7 @@ namespace PolyVox
setPosition(mXPosInVolume, mYPosInVolume, mZPosInVolume); setPosition(mXPosInVolume, mYPosInVolume, mZPosInVolume);
} }
} }
#pragma endregion
#pragma region Peekers
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny1nz(void) const
{ {
@ -544,5 +528,4 @@ namespace PolyVox
} }
return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume+1);
} }
#pragma endregion
} }

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_VoxelFilters_H__ #ifndef __PolyVox_VoxelFilters_H__
#define __PolyVox_VoxelFilters_H__ #define __PolyVox_VoxelFilters_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/TypeDef.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "ArraySizes.h" #include "ArraySizes.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "Mesh.h" #include "Mesh.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "MeshEdge.h" #include "MeshEdge.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "MeshFace.h" #include "MeshFace.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "MeshVertex.h" #include "MeshVertex.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
//These tables were based on the article "Polygonising a scalar field". //These tables were based on the article "Polygonising a scalar field".
//They have been optimised to allow a more efficient algorithm via bitwise operations. //They have been optimised to allow a more efficient algorithm via bitwise operations.

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "PolyVoxImpl/Utility.h" #include "PolyVoxImpl/Utility.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "SurfaceMesh.h" #include "SurfaceMesh.h"

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include <sstream> #include <sstream>

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVoxUtil_Export_H__ #ifndef __PolyVoxUtil_Export_H__
#define __PolyVoxUtil_Export_H__ #define __PolyVoxUtil_Export_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Serialization_H__ #ifndef __PolyVox_Serialization_H__
#define __PolyVox_Serialization_H__ #define __PolyVox_Serialization_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#ifndef __PolyVox_VolumeChangeTracker_H__ #ifndef __PolyVox_VolumeChangeTracker_H__
#define __PolyVox_VolumeChangeTracker_H__ #define __PolyVox_VolumeChangeTracker_H__

View File

@ -1,4 +1,3 @@
#pragma region License
/******************************************************************************* /*******************************************************************************
Copyright (c) 2005-2009 David Williams 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 3. This notice may not be removed or altered from any source
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion
#include "VolumeChangeTracker.h" #include "VolumeChangeTracker.h"