Compile fixes for GCC.

This commit is contained in:
p265186 2012-12-06 16:49:38 +01:00
parent d19f16ef64
commit 19a1f99723
7 changed files with 50 additions and 50 deletions

View File

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

View File

@ -169,7 +169,7 @@ namespace PolyVox
} }
else else
{ {
return getBorderValue(); return this->getBorderValue();
} }
} }
@ -197,12 +197,12 @@ namespace PolyVox
case WrapModes::Clamp: case WrapModes::Clamp:
{ {
//Perform clamping //Perform clamping
uXPos = (std::max)(uXPos, m_regValidRegion.getLowerX()); uXPos = (std::max)(uXPos, this->m_regValidRegion.getLowerX());
uYPos = (std::max)(uYPos, m_regValidRegion.getLowerY()); uYPos = (std::max)(uYPos, this->m_regValidRegion.getLowerY());
uZPos = (std::max)(uZPos, m_regValidRegion.getLowerZ()); uZPos = (std::max)(uZPos, this->m_regValidRegion.getLowerZ());
uXPos = (std::min)(uXPos, m_regValidRegion.getUpperX()); uXPos = (std::min)(uXPos, this->m_regValidRegion.getUpperX());
uYPos = (std::min)(uYPos, m_regValidRegion.getUpperY()); uYPos = (std::min)(uYPos, this->m_regValidRegion.getUpperY());
uZPos = (std::min)(uZPos, m_regValidRegion.getUpperZ()); uZPos = (std::min)(uZPos, this->m_regValidRegion.getUpperZ());
//Get the voxel value //Get the voxel value
return getVoxel(uXPos, uYPos, uZPos); return getVoxel(uXPos, uYPos, uZPos);
@ -210,7 +210,7 @@ namespace PolyVox
} }
case WrapModes::Border: case WrapModes::Border:
{ {
if(m_regValidRegion.containsPoint(uXPos, uYPos, uZPos)) if(this->m_regValidRegion.containsPoint(uXPos, uYPos, uZPos))
{ {
return getVoxel(uXPos, uYPos, uZPos); return getVoxel(uXPos, uYPos, uZPos);
} }

View File

@ -95,7 +95,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType LargeVolume<VoxelType>::Sampler::getVoxel(void) const VoxelType LargeVolume<VoxelType>::Sampler::getVoxel(void) const
{ {
if(isCurrentPositionValid()) if(this->isCurrentPositionValid())
{ {
return *mCurrentVoxel; return *mCurrentVoxel;
} }
@ -115,7 +115,7 @@ namespace PolyVox
void LargeVolume<VoxelType>::Sampler::setPosition(int32_t xPos, int32_t yPos, int32_t zPos) void LargeVolume<VoxelType>::Sampler::setPosition(int32_t xPos, int32_t yPos, int32_t zPos)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< LargeVolume<VoxelType> >::setPosition(xPos, yPos, zPos); BaseVolume<VoxelType>::template Sampler< LargeVolume<VoxelType> >::setPosition(xPos, yPos, zPos);
// Then we update the voxel pointer // Then we update the voxel pointer
const int32_t uXBlock = this->mXPosInVolume >> this->mVolume->m_uBlockSideLengthPower; const int32_t uXBlock = this->mXPosInVolume >> this->mVolume->m_uBlockSideLengthPower;
@ -157,7 +157,7 @@ namespace PolyVox
void LargeVolume<VoxelType>::Sampler::movePositiveX(void) void LargeVolume<VoxelType>::Sampler::movePositiveX(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< LargeVolume<VoxelType> >::movePositiveX(); BaseVolume<VoxelType>::template Sampler< LargeVolume<VoxelType> >::movePositiveX();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mXPosInVolume) % this->mVolume->m_uBlockSideLength != 0) if((this->mXPosInVolume) % this->mVolume->m_uBlockSideLength != 0)
@ -176,7 +176,7 @@ namespace PolyVox
void LargeVolume<VoxelType>::Sampler::movePositiveY(void) void LargeVolume<VoxelType>::Sampler::movePositiveY(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< LargeVolume<VoxelType> >::movePositiveY(); BaseVolume<VoxelType>::template Sampler< LargeVolume<VoxelType> >::movePositiveY();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mYPosInVolume) % this->mVolume->m_uBlockSideLength != 0) if((this->mYPosInVolume) % this->mVolume->m_uBlockSideLength != 0)
@ -195,7 +195,7 @@ namespace PolyVox
void LargeVolume<VoxelType>::Sampler::movePositiveZ(void) void LargeVolume<VoxelType>::Sampler::movePositiveZ(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< LargeVolume<VoxelType> >::movePositiveZ(); BaseVolume<VoxelType>::template Sampler< LargeVolume<VoxelType> >::movePositiveZ();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mZPosInVolume) % this->mVolume->m_uBlockSideLength != 0) if((this->mZPosInVolume) % this->mVolume->m_uBlockSideLength != 0)
@ -214,7 +214,7 @@ namespace PolyVox
void LargeVolume<VoxelType>::Sampler::moveNegativeX(void) void LargeVolume<VoxelType>::Sampler::moveNegativeX(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< LargeVolume<VoxelType> >::moveNegativeX(); BaseVolume<VoxelType>::template Sampler< LargeVolume<VoxelType> >::moveNegativeX();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mXPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0) if((this->mXPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0)
@ -233,7 +233,7 @@ namespace PolyVox
void LargeVolume<VoxelType>::Sampler::moveNegativeY(void) void LargeVolume<VoxelType>::Sampler::moveNegativeY(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< LargeVolume<VoxelType> >::moveNegativeY(); BaseVolume<VoxelType>::template Sampler< LargeVolume<VoxelType> >::moveNegativeY();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mYPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0) if((this->mYPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0)
@ -252,7 +252,7 @@ namespace PolyVox
void LargeVolume<VoxelType>::Sampler::moveNegativeZ(void) void LargeVolume<VoxelType>::Sampler::moveNegativeZ(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< LargeVolume<VoxelType> >::moveNegativeZ(); BaseVolume<VoxelType>::template Sampler< LargeVolume<VoxelType> >::moveNegativeZ();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mZPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0) if((this->mZPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0)

View File

@ -160,12 +160,12 @@ namespace PolyVox
case WrapModes::Clamp: case WrapModes::Clamp:
{ {
//Perform clamping //Perform clamping
uXPos = (std::max)(uXPos, m_regValidRegion.getLowerX()); uXPos = (std::max)(uXPos, this->m_regValidRegion.getLowerX());
uYPos = (std::max)(uYPos, m_regValidRegion.getLowerY()); uYPos = (std::max)(uYPos, this->m_regValidRegion.getLowerY());
uZPos = (std::max)(uZPos, m_regValidRegion.getLowerZ()); uZPos = (std::max)(uZPos, this->m_regValidRegion.getLowerZ());
uXPos = (std::min)(uXPos, m_regValidRegion.getUpperX()); uXPos = (std::min)(uXPos, this->m_regValidRegion.getUpperX());
uYPos = (std::min)(uYPos, m_regValidRegion.getUpperY()); uYPos = (std::min)(uYPos, this->m_regValidRegion.getUpperY());
uZPos = (std::min)(uZPos, m_regValidRegion.getUpperZ()); uZPos = (std::min)(uZPos, this->m_regValidRegion.getUpperZ());
//Get the voxel value //Get the voxel value
return getVoxel(uXPos, uYPos, uZPos); return getVoxel(uXPos, uYPos, uZPos);
@ -173,7 +173,7 @@ namespace PolyVox
} }
case WrapModes::Border: case WrapModes::Border:
{ {
if(m_regValidRegion.containsPoint(uXPos, uYPos, uZPos)) if(this->m_regValidRegion.containsPoint(uXPos, uYPos, uZPos))
{ {
return getVoxel(uXPos, uYPos, uZPos); return getVoxel(uXPos, uYPos, uZPos);
} }

View File

@ -45,7 +45,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType RawVolume<VoxelType>::Sampler::getVoxel(void) const VoxelType RawVolume<VoxelType>::Sampler::getVoxel(void) const
{ {
if(isCurrentPositionValid()) if(this->isCurrentPositionValid())
{ {
return *mCurrentVoxel; return *mCurrentVoxel;
} }
@ -65,7 +65,7 @@ namespace PolyVox
void RawVolume<VoxelType>::Sampler::setPosition(int32_t xPos, int32_t yPos, int32_t zPos) void RawVolume<VoxelType>::Sampler::setPosition(int32_t xPos, int32_t yPos, int32_t zPos)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< RawVolume<VoxelType> >::setPosition(xPos, yPos, zPos); BaseVolume<VoxelType>::template Sampler< RawVolume<VoxelType> >::setPosition(xPos, yPos, zPos);
// Then we update the voxel pointer // Then we update the voxel pointer
const Vector3DInt32& v3dLowerCorner = this->mVolume->m_regValidRegion.getLowerCorner(); const Vector3DInt32& v3dLowerCorner = this->mVolume->m_regValidRegion.getLowerCorner();
@ -84,7 +84,7 @@ namespace PolyVox
bool RawVolume<VoxelType>::Sampler::setVoxel(VoxelType tValue) bool RawVolume<VoxelType>::Sampler::setVoxel(VoxelType tValue)
{ {
//return m_bIsCurrentPositionValid ? *mCurrentVoxel : this->mVolume->getBorderValue(); //return m_bIsCurrentPositionValid ? *mCurrentVoxel : this->mVolume->getBorderValue();
if(m_bIsCurrentPositionValidInX && m_bIsCurrentPositionValidInY && m_bIsCurrentPositionValidInZ) if(this->m_bIsCurrentPositionValidInX && this->m_bIsCurrentPositionValidInY && this->m_bIsCurrentPositionValidInZ)
{ {
*mCurrentVoxel = tValue; *mCurrentVoxel = tValue;
return true; return true;
@ -99,7 +99,7 @@ namespace PolyVox
void RawVolume<VoxelType>::Sampler::movePositiveX(void) void RawVolume<VoxelType>::Sampler::movePositiveX(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< RawVolume<VoxelType> >::movePositiveX(); BaseVolume<VoxelType>::template Sampler< RawVolume<VoxelType> >::movePositiveX();
// Then we update the voxel pointer // Then we update the voxel pointer
++mCurrentVoxel; ++mCurrentVoxel;
@ -109,7 +109,7 @@ namespace PolyVox
void RawVolume<VoxelType>::Sampler::movePositiveY(void) void RawVolume<VoxelType>::Sampler::movePositiveY(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< RawVolume<VoxelType> >::movePositiveY(); BaseVolume<VoxelType>::template Sampler< RawVolume<VoxelType> >::movePositiveY();
// Then we update the voxel pointer // Then we update the voxel pointer
mCurrentVoxel += this->mVolume->getWidth(); mCurrentVoxel += this->mVolume->getWidth();
@ -119,7 +119,7 @@ namespace PolyVox
void RawVolume<VoxelType>::Sampler::movePositiveZ(void) void RawVolume<VoxelType>::Sampler::movePositiveZ(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< RawVolume<VoxelType> >::movePositiveZ(); BaseVolume<VoxelType>::template Sampler< RawVolume<VoxelType> >::movePositiveZ();
// Then we update the voxel pointer // Then we update the voxel pointer
mCurrentVoxel += this->mVolume->getWidth() * this->mVolume->getHeight(); mCurrentVoxel += this->mVolume->getWidth() * this->mVolume->getHeight();
@ -129,7 +129,7 @@ namespace PolyVox
void RawVolume<VoxelType>::Sampler::moveNegativeX(void) void RawVolume<VoxelType>::Sampler::moveNegativeX(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< RawVolume<VoxelType> >::moveNegativeX(); BaseVolume<VoxelType>::template Sampler< RawVolume<VoxelType> >::moveNegativeX();
// Then we update the voxel pointer // Then we update the voxel pointer
--mCurrentVoxel; --mCurrentVoxel;
@ -139,7 +139,7 @@ namespace PolyVox
void RawVolume<VoxelType>::Sampler::moveNegativeY(void) void RawVolume<VoxelType>::Sampler::moveNegativeY(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< RawVolume<VoxelType> >::moveNegativeY(); BaseVolume<VoxelType>::template Sampler< RawVolume<VoxelType> >::moveNegativeY();
// Then we update the voxel pointer // Then we update the voxel pointer
mCurrentVoxel -= this->mVolume->getWidth(); mCurrentVoxel -= this->mVolume->getWidth();
@ -149,7 +149,7 @@ namespace PolyVox
void RawVolume<VoxelType>::Sampler::moveNegativeZ(void) void RawVolume<VoxelType>::Sampler::moveNegativeZ(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< RawVolume<VoxelType> >::moveNegativeZ(); BaseVolume<VoxelType>::template Sampler< RawVolume<VoxelType> >::moveNegativeZ();
// Then we update the voxel pointer // Then we update the voxel pointer
mCurrentVoxel -= this->mVolume->getWidth() * this->mVolume->getHeight(); mCurrentVoxel -= this->mVolume->getWidth() * this->mVolume->getHeight();

View File

@ -130,7 +130,7 @@ namespace PolyVox
} }
else else
{ {
return getBorderValue(); return this->getBorderValue();
} }
} }
@ -158,12 +158,12 @@ namespace PolyVox
case WrapModes::Clamp: case WrapModes::Clamp:
{ {
//Perform clamping //Perform clamping
uXPos = (std::max)(uXPos, m_regValidRegion.getLowerX()); uXPos = (std::max)(uXPos, this->m_regValidRegion.getLowerX());
uYPos = (std::max)(uYPos, m_regValidRegion.getLowerY()); uYPos = (std::max)(uYPos, this->m_regValidRegion.getLowerY());
uZPos = (std::max)(uZPos, m_regValidRegion.getLowerZ()); uZPos = (std::max)(uZPos, this->m_regValidRegion.getLowerZ());
uXPos = (std::min)(uXPos, m_regValidRegion.getUpperX()); uXPos = (std::min)(uXPos, this->m_regValidRegion.getUpperX());
uYPos = (std::min)(uYPos, m_regValidRegion.getUpperY()); uYPos = (std::min)(uYPos, this->m_regValidRegion.getUpperY());
uZPos = (std::min)(uZPos, m_regValidRegion.getUpperZ()); uZPos = (std::min)(uZPos, this->m_regValidRegion.getUpperZ());
//Get the voxel value //Get the voxel value
return getVoxel(uXPos, uYPos, uZPos); return getVoxel(uXPos, uYPos, uZPos);
@ -171,7 +171,7 @@ namespace PolyVox
} }
case WrapModes::Border: case WrapModes::Border:
{ {
if(m_regValidRegion.containsPoint(uXPos, uYPos, uZPos)) if(this->m_regValidRegion.containsPoint(uXPos, uYPos, uZPos))
{ {
return getVoxel(uXPos, uYPos, uZPos); return getVoxel(uXPos, uYPos, uZPos);
} }

View File

@ -101,7 +101,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType SimpleVolume<VoxelType>::Sampler::getVoxel(void) const VoxelType SimpleVolume<VoxelType>::Sampler::getVoxel(void) const
{ {
if(isCurrentPositionValid()) if(this->isCurrentPositionValid())
{ {
return *mCurrentVoxel; return *mCurrentVoxel;
} }
@ -129,7 +129,7 @@ namespace PolyVox
void SimpleVolume<VoxelType>::Sampler::setPosition(int32_t xPos, int32_t yPos, int32_t zPos) void SimpleVolume<VoxelType>::Sampler::setPosition(int32_t xPos, int32_t yPos, int32_t zPos)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< SimpleVolume<VoxelType> >::setPosition(xPos, yPos, zPos); BaseVolume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >::setPosition(xPos, yPos, zPos);
// Then we update the voxel pointer // Then we update the voxel pointer
const int32_t uXBlock = this->mXPosInVolume >> this->mVolume->m_uBlockSideLengthPower; const int32_t uXBlock = this->mXPosInVolume >> this->mVolume->m_uBlockSideLengthPower;
@ -161,7 +161,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
bool SimpleVolume<VoxelType>::Sampler::setVoxel(VoxelType tValue) bool SimpleVolume<VoxelType>::Sampler::setVoxel(VoxelType tValue)
{ {
if(m_bIsCurrentPositionValidInX && m_bIsCurrentPositionValidInY && m_bIsCurrentPositionValidInZ) if(this->m_bIsCurrentPositionValidInX && this->m_bIsCurrentPositionValidInY && this->m_bIsCurrentPositionValidInZ)
{ {
*mCurrentVoxel = tValue; *mCurrentVoxel = tValue;
return true; return true;
@ -176,7 +176,7 @@ namespace PolyVox
void SimpleVolume<VoxelType>::Sampler::movePositiveX(void) void SimpleVolume<VoxelType>::Sampler::movePositiveX(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< SimpleVolume<VoxelType> >::movePositiveX(); BaseVolume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >::movePositiveX();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mXPosInVolume) % this->mVolume->m_uBlockSideLength != 0) if((this->mXPosInVolume) % this->mVolume->m_uBlockSideLength != 0)
@ -195,7 +195,7 @@ namespace PolyVox
void SimpleVolume<VoxelType>::Sampler::movePositiveY(void) void SimpleVolume<VoxelType>::Sampler::movePositiveY(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< SimpleVolume<VoxelType> >::movePositiveY(); BaseVolume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >::movePositiveY();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mYPosInVolume) % this->mVolume->m_uBlockSideLength != 0) if((this->mYPosInVolume) % this->mVolume->m_uBlockSideLength != 0)
@ -214,7 +214,7 @@ namespace PolyVox
void SimpleVolume<VoxelType>::Sampler::movePositiveZ(void) void SimpleVolume<VoxelType>::Sampler::movePositiveZ(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< SimpleVolume<VoxelType> >::movePositiveZ(); BaseVolume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >::movePositiveZ();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mZPosInVolume) % this->mVolume->m_uBlockSideLength != 0) if((this->mZPosInVolume) % this->mVolume->m_uBlockSideLength != 0)
@ -233,7 +233,7 @@ namespace PolyVox
void SimpleVolume<VoxelType>::Sampler::moveNegativeX(void) void SimpleVolume<VoxelType>::Sampler::moveNegativeX(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< SimpleVolume<VoxelType> >::moveNegativeX(); BaseVolume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >::moveNegativeX();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mXPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0) if((this->mXPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0)
@ -252,7 +252,7 @@ namespace PolyVox
void SimpleVolume<VoxelType>::Sampler::moveNegativeY(void) void SimpleVolume<VoxelType>::Sampler::moveNegativeY(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< SimpleVolume<VoxelType> >::moveNegativeY(); BaseVolume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >::moveNegativeY();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mYPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0) if((this->mYPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0)
@ -271,7 +271,7 @@ namespace PolyVox
void SimpleVolume<VoxelType>::Sampler::moveNegativeZ(void) void SimpleVolume<VoxelType>::Sampler::moveNegativeZ(void)
{ {
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::Sampler< SimpleVolume<VoxelType> >::moveNegativeZ(); BaseVolume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >::moveNegativeZ();
// Then we update the voxel pointer // Then we update the voxel pointer
if((this->mZPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0) if((this->mZPosInVolume + 1) % this->mVolume->m_uBlockSideLength != 0)