From 80832f49c0d5dc41ad2774602b3f79f607641706 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 24 Jul 2011 20:45:23 +0100 Subject: [PATCH] Compile fixes for G++ --- .../include/PolyVoxCore/LargeVolume.inl | 16 ++++++++-------- .../include/PolyVoxCore/SimpleVolume.inl | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl index a3d8c500..ea060ddb 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl @@ -135,7 +135,7 @@ namespace PolyVox template VoxelType LargeVolume::getVoxelAt(int32_t uXPos, int32_t uYPos, int32_t uZPos) const { - if(m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))) + if(Volume::m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))) { const int32_t blockX = uXPos >> m_uBlockSideLengthPower; const int32_t blockY = uYPos >> m_uBlockSideLengthPower; @@ -238,7 +238,7 @@ namespace PolyVox template bool LargeVolume::setVoxelAt(int32_t uXPos, int32_t uYPos, int32_t uZPos, VoxelType tValue) { - assert(m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))); + assert(Volume::m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))); const int32_t blockX = uXPos >> m_uBlockSideLengthPower; const int32_t blockY = uYPos >> m_uBlockSideLengthPower; @@ -424,10 +424,10 @@ namespace PolyVox m_pLastAccessedBlock = 0; m_bCompressionEnabled = true; - m_regValidRegion = regValidRegion; + Volume::m_regValidRegion = regValidRegion; - m_regValidRegionInBlocks.setLowerCorner(m_regValidRegion.getLowerCorner() / static_cast(uBlockSideLength)); - m_regValidRegionInBlocks.setUpperCorner(m_regValidRegion.getUpperCorner() / static_cast(uBlockSideLength)); + m_regValidRegionInBlocks.setLowerCorner(Volume::m_regValidRegion.getLowerCorner() / static_cast(uBlockSideLength)); + m_regValidRegionInBlocks.setUpperCorner(Volume::m_regValidRegion.getUpperCorner() / static_cast(uBlockSideLength)); setMaxNumberOfUncompressedBlocks(m_uMaxNumberOfUncompressedBlocks); @@ -446,9 +446,9 @@ namespace PolyVox std::fill(m_pUncompressedBorderData, m_pUncompressedBorderData + m_uBlockSideLength * m_uBlockSideLength * m_uBlockSideLength, VoxelType()); //Other properties we might find useful later - m_uLongestSideLength = (std::max)((std::max)(getWidth(),getHeight()),getDepth()); - m_uShortestSideLength = (std::min)((std::min)(getWidth(),getHeight()),getDepth()); - m_fDiagonalLength = sqrtf(static_cast(getWidth() * getWidth() + getHeight() * getHeight() + getDepth() * getDepth())); + Volume::m_uLongestSideLength = (std::max)((std::max)(Volume::getWidth(),Volume::getHeight()),Volume::getDepth()); + Volume::m_uShortestSideLength = (std::min)((std::min)(Volume::getWidth(),Volume::getHeight()),Volume::getDepth()); + Volume::m_fDiagonalLength = sqrtf(static_cast(Volume::getWidth() * Volume::getWidth() + Volume::getHeight() * Volume::getHeight() + Volume::getDepth() * Volume::getDepth())); } template diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl index 96466a58..0ba7d854 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl @@ -105,7 +105,7 @@ namespace PolyVox template VoxelType SimpleVolume::getVoxelAt(int32_t uXPos, int32_t uYPos, int32_t uZPos) const { - if(m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))) + if(Volume::m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))) { const int32_t blockX = uXPos >> m_uBlockSideLengthPower; const int32_t blockY = uYPos >> m_uBlockSideLengthPower; @@ -156,7 +156,7 @@ namespace PolyVox template bool SimpleVolume::setVoxelAt(int32_t uXPos, int32_t uYPos, int32_t uZPos, VoxelType tValue) { - assert(m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))); + assert(Volume::m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos))); const int32_t blockX = uXPos >> m_uBlockSideLengthPower; const int32_t blockY = uYPos >> m_uBlockSideLengthPower; @@ -207,10 +207,10 @@ namespace PolyVox m_uBlockSideLength = uBlockSideLength; m_pUncompressedBorderData = 0; - m_regValidRegion = regValidRegion; + Volume::m_regValidRegion = regValidRegion; - m_regValidRegionInBlocks.setLowerCorner(m_regValidRegion.getLowerCorner() / static_cast(uBlockSideLength)); - m_regValidRegionInBlocks.setUpperCorner(m_regValidRegion.getUpperCorner() / static_cast(uBlockSideLength)); + m_regValidRegionInBlocks.setLowerCorner(Volume::m_regValidRegion.getLowerCorner() / static_cast(uBlockSideLength)); + m_regValidRegionInBlocks.setUpperCorner(Volume::m_regValidRegion.getUpperCorner() / static_cast(uBlockSideLength)); //Compute the block side length m_uBlockSideLength = uBlockSideLength; @@ -234,9 +234,9 @@ namespace PolyVox std::fill(m_pUncompressedBorderData, m_pUncompressedBorderData + m_uBlockSideLength * m_uBlockSideLength * m_uBlockSideLength, VoxelType()); //Other properties we might find useful later - m_uLongestSideLength = (std::max)((std::max)(getWidth(),getHeight()),getDepth()); - m_uShortestSideLength = (std::min)((std::min)(getWidth(),getHeight()),getDepth()); - m_fDiagonalLength = sqrtf(static_cast(getWidth() * getWidth() + getHeight() * getHeight() + getDepth() * getDepth())); + Volume::m_uLongestSideLength = (std::max)((std::max)(Volume::getWidth(),Volume::getHeight()),Volume::getDepth()); + Volume::m_uShortestSideLength = (std::min)((std::min)(Volume::getWidth(),Volume::getHeight()),Volume::getDepth()); + Volume::m_fDiagonalLength = sqrtf(static_cast(Volume::getWidth() * Volume::getWidth() + Volume::getHeight() * Volume::getHeight() + Volume::getDepth() * Volume::getDepth())); } template