diff --git a/CMakeLists.txt b/CMakeLists.txt index fcf0439b..cafc79d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,8 @@ SET(INC_FILES include/Block.inl include/BlockVolume.h include/BlockVolume.inl + include/BlockVolumeIterator.h + include/BlockVolumeIterator.inl include/Constants.h include/Enums.h include/GradientEstimators.h @@ -41,8 +43,6 @@ SET(INC_FILES include/Vector.h include/Vector.inl include/VolumeChangeTracker.h - include/VolumeIterator.h - include/VolumeIterator.inl ) FIND_PACKAGE(Boost REQUIRED) diff --git a/include/Block.h b/include/Block.h index 0f876f17..57dff6f2 100644 --- a/include/Block.h +++ b/include/Block.h @@ -33,8 +33,8 @@ namespace PolyVox template class Block { - //Make VolumeIterator a friend - friend class VolumeIterator; + //Make BlockVolumeIterator a friend + friend class BlockVolumeIterator; public: Block(boost::uint8_t uSideLengthPower); Block(const Block& rhs); diff --git a/include/BlockVolume.h b/include/BlockVolume.h index 5f47e370..6d494b08 100644 --- a/include/BlockVolume.h +++ b/include/BlockVolume.h @@ -35,8 +35,8 @@ namespace PolyVox template class BlockVolume { - //Make VolumeIterator a friend - friend class VolumeIterator; + //Make BlockVolumeIterator a friend + friend class BlockVolumeIterator; public: BlockVolume(boost::uint8_t uSideLengthPower, boost::uint8_t uBlockSideLengthPower = 5); @@ -52,9 +52,9 @@ namespace PolyVox bool containsPoint(const Vector3DFloat& pos, float boundary) const; bool containsPoint(const Vector3DInt32& pos, boost::uint16_t boundary) const; - VolumeIterator firstVoxel(void); + BlockVolumeIterator firstVoxel(void); void idle(boost::uint32_t uAmount); - VolumeIterator lastVoxel(void); + BlockVolumeIterator lastVoxel(void); private: Block* getHomogenousBlock(VoxelType tHomogenousValue) const; diff --git a/include/BlockVolume.inl b/include/BlockVolume.inl index a87768a7..61a40fe2 100644 --- a/include/BlockVolume.inl +++ b/include/BlockVolume.inl @@ -192,9 +192,9 @@ namespace PolyVox } template - VolumeIterator BlockVolume::firstVoxel(void) + BlockVolumeIterator BlockVolume::firstVoxel(void) { - VolumeIterator iter(*this); + BlockVolumeIterator iter(*this); iter.setPosition(0,0,0); return iter; } @@ -205,9 +205,9 @@ namespace PolyVox } template - VolumeIterator BlockVolume::lastVoxel(void) + BlockVolumeIterator BlockVolume::lastVoxel(void) { - VolumeIterator iter(*this); + BlockVolumeIterator iter(*this); iter.setPosition(m_uSideLength-1,m_uSideLength-1,m_uSideLength-1); return iter; } diff --git a/include/VolumeIterator.h b/include/BlockVolumeIterator.h similarity index 88% rename from include/VolumeIterator.h rename to include/BlockVolumeIterator.h index 8a74ca65..378a51ac 100644 --- a/include/VolumeIterator.h +++ b/include/BlockVolumeIterator.h @@ -31,17 +31,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. namespace PolyVox { template - class VolumeIterator + class BlockVolumeIterator { public: - VolumeIterator(BlockVolume& volume); - ~VolumeIterator(); + BlockVolumeIterator(BlockVolume& volume); + ~BlockVolumeIterator(); - bool operator==(const VolumeIterator& rhs); - bool operator<(const VolumeIterator& rhs); - bool operator>(const VolumeIterator& rhs); - bool operator<=(const VolumeIterator& rhs); - bool operator>=(const VolumeIterator& rhs); + bool operator==(const BlockVolumeIterator& rhs); + bool operator<(const BlockVolumeIterator& rhs); + bool operator>(const BlockVolumeIterator& rhs); + bool operator<=(const BlockVolumeIterator& rhs); + bool operator>=(const BlockVolumeIterator& rhs); float getAveragedVoxel(boost::uint16_t size) const; boost::uint16_t getPosX(void) const; @@ -130,6 +130,6 @@ namespace PolyVox }; } -#include "VolumeIterator.inl" +#include "BlockVolumeIterator.inl" #endif diff --git a/include/VolumeIterator.inl b/include/BlockVolumeIterator.inl similarity index 82% rename from include/VolumeIterator.inl rename to include/BlockVolumeIterator.inl index 5eca640e..f6d063d3 100644 --- a/include/VolumeIterator.inl +++ b/include/BlockVolumeIterator.inl @@ -29,20 +29,20 @@ namespace PolyVox { #pragma region Constructors/Destructors template - VolumeIterator::VolumeIterator(BlockVolume& volume) + BlockVolumeIterator::BlockVolumeIterator(BlockVolume& volume) :mVolume(volume) { } template - VolumeIterator::~VolumeIterator() + BlockVolumeIterator::~BlockVolumeIterator() { } #pragma endregion #pragma region Operators template - bool VolumeIterator::operator==(const VolumeIterator& rhs) + bool BlockVolumeIterator::operator==(const BlockVolumeIterator& rhs) { //We could just check whether the two mCurrentVoxel pointers are equal, but this may not //be safe in the future if we decide to allow blocks to be shared between volumes @@ -59,7 +59,7 @@ namespace PolyVox } template - bool VolumeIterator::operator<(const VolumeIterator& rhs) + bool BlockVolumeIterator::operator<(const BlockVolumeIterator& rhs) { assert(&mVolume == &rhs.mVolume); @@ -82,21 +82,21 @@ namespace PolyVox } template - bool VolumeIterator::operator>(const VolumeIterator& rhs) + bool BlockVolumeIterator::operator>(const BlockVolumeIterator& rhs) { assert(&mVolume == &rhs.mVolume); return (rhs < *this); } template - bool VolumeIterator::operator<=(const VolumeIterator& rhs) + bool BlockVolumeIterator::operator<=(const BlockVolumeIterator& rhs) { assert(&mVolume == &rhs.mVolume); return (rhs > *this); } template - bool VolumeIterator::operator>=(const VolumeIterator& rhs) + bool BlockVolumeIterator::operator>=(const BlockVolumeIterator& rhs) { assert(&mVolume == &rhs.mVolume); return (rhs < *this); @@ -105,7 +105,7 @@ namespace PolyVox #pragma region Getters template - float VolumeIterator::getAveragedVoxel(boost::uint16_t size) const + float BlockVolumeIterator::getAveragedVoxel(boost::uint16_t size) const { assert(mXPosInVolume >= size); assert(mYPosInVolume >= size); @@ -137,25 +137,25 @@ namespace PolyVox } template - boost::uint16_t VolumeIterator::getPosX(void) const + boost::uint16_t BlockVolumeIterator::getPosX(void) const { return mXPosInVolume; } template - boost::uint16_t VolumeIterator::getPosY(void) const + boost::uint16_t BlockVolumeIterator::getPosY(void) const { return mYPosInVolume; } template - boost::uint16_t VolumeIterator::getPosZ(void) const + boost::uint16_t BlockVolumeIterator::getPosZ(void) const { return mZPosInVolume; } template - VoxelType VolumeIterator::getVoxel(void) const + VoxelType BlockVolumeIterator::getVoxel(void) const { return *mCurrentVoxel; } @@ -163,7 +163,7 @@ namespace PolyVox #pragma region Setters template - void VolumeIterator::setPosition(boost::uint16_t xPos, boost::uint16_t yPos, boost::uint16_t zPos) + void BlockVolumeIterator::setPosition(boost::uint16_t xPos, boost::uint16_t yPos, boost::uint16_t zPos) { mXPosInVolume = xPos; mYPosInVolume = yPos; @@ -190,13 +190,13 @@ namespace PolyVox } template - void VolumeIterator::setValidRegion(const Region& region) + void BlockVolumeIterator::setValidRegion(const Region& region) { setValidRegion(region.getLowerCorner().getX(),region.getLowerCorner().getY(),region.getLowerCorner().getZ(),region.getUpperCorner().getX(),region.getUpperCorner().getY(),region.getUpperCorner().getZ()); } template - void VolumeIterator::setValidRegion(boost::uint16_t xFirst, boost::uint16_t yFirst, boost::uint16_t zFirst, boost::uint16_t xLast, boost::uint16_t yLast, boost::uint16_t zLast) + void BlockVolumeIterator::setValidRegion(boost::uint16_t xFirst, boost::uint16_t yFirst, boost::uint16_t zFirst, boost::uint16_t xLast, boost::uint16_t yLast, boost::uint16_t zLast) { mXRegionFirst = xFirst; mYRegionFirst = yFirst; @@ -216,7 +216,7 @@ namespace PolyVox } template - void VolumeIterator::setVoxel(VoxelType tValue) + void BlockVolumeIterator::setVoxel(VoxelType tValue) { const boost::uint32_t uBlockIndex = mXBlock + @@ -247,13 +247,13 @@ namespace PolyVox #pragma region Other template - bool VolumeIterator::isValidForRegion(void) const + bool BlockVolumeIterator::isValidForRegion(void) const { return mIsValidForRegion; } template - void VolumeIterator::moveForwardInRegion(void) + void BlockVolumeIterator::moveForwardInRegion(void) { mXPosInBlock++; mCurrentVoxel++; @@ -341,7 +341,7 @@ namespace PolyVox #pragma region Peekers template - VoxelType VolumeIterator::peekVoxel1nx1ny1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx1ny1nz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -351,7 +351,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx1ny0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx1ny0pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -361,7 +361,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx1ny1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx1ny1pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -371,7 +371,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx0py1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx0py1nz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -381,7 +381,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx0py0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx0py0pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -391,7 +391,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx0py1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx0py1pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -401,7 +401,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx1py1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx1py1nz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -411,7 +411,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx1py0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx1py0pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -421,7 +421,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1nx1py1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1nx1py1pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -433,7 +433,7 @@ namespace PolyVox ////////////////////////////////////////////////////////////////////////// template - VoxelType VolumeIterator::peekVoxel0px1ny1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px1ny1nz(void) const { if((mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -443,7 +443,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel0px1ny0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px1ny0pz(void) const { if((mYPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -453,7 +453,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel0px1ny1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px1ny1pz(void) const { if((mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -463,7 +463,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel0px0py1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px0py1nz(void) const { if((mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -473,13 +473,13 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel0px0py0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px0py0pz(void) const { return *mCurrentVoxel; } template - VoxelType VolumeIterator::peekVoxel0px0py1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px0py1pz(void) const { if((mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -489,7 +489,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel0px1py1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px1py1nz(void) const { if((mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -499,7 +499,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel0px1py0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px1py0pz(void) const { if((mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -509,7 +509,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel0px1py1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel0px1py1pz(void) const { if((mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -521,7 +521,7 @@ namespace PolyVox ////////////////////////////////////////////////////////////////////////// template - VoxelType VolumeIterator::peekVoxel1px1ny1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px1ny1nz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -531,7 +531,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px1ny0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px1ny0pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -541,7 +541,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px1ny1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px1ny1pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -551,7 +551,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px0py1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px0py1nz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -561,7 +561,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px0py0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px0py0pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -571,7 +571,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px0py1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px0py1pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -581,7 +581,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px1py1nz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px1py1nz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) { @@ -591,7 +591,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px1py0pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px1py0pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { @@ -601,7 +601,7 @@ namespace PolyVox } template - VoxelType VolumeIterator::peekVoxel1px1py1pz(void) const + VoxelType BlockVolumeIterator::peekVoxel1px1py1pz(void) const { if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) { diff --git a/include/GradientEstimators.h b/include/GradientEstimators.h index 506e93fd..65dec040 100644 --- a/include/GradientEstimators.h +++ b/include/GradientEstimators.h @@ -22,18 +22,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef __PolyVox_GradientEstimators_H__ #define __PolyVox_GradientEstimators_H__ -#include "VolumeIterator.h" +#include "BlockVolumeIterator.h" namespace PolyVox { template - Vector3DFloat computeCentralDifferenceGradient(const VolumeIterator& volIter); + Vector3DFloat computeCentralDifferenceGradient(const BlockVolumeIterator& volIter); template - Vector3DFloat computeSmoothCentralDifferenceGradient(VolumeIterator& volIter); + Vector3DFloat computeSmoothCentralDifferenceGradient(BlockVolumeIterator& volIter); template - Vector3DFloat computeSobelGradient(const VolumeIterator& volIter); + Vector3DFloat computeSobelGradient(const BlockVolumeIterator& volIter); } #include "GradientEstimators.inl" diff --git a/include/GradientEstimators.inl b/include/GradientEstimators.inl index 35c8d220..b26c25c2 100644 --- a/include/GradientEstimators.inl +++ b/include/GradientEstimators.inl @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. namespace PolyVox { template - Vector3DFloat computeCentralDifferenceGradient(const VolumeIterator& volIter) + Vector3DFloat computeCentralDifferenceGradient(const BlockVolumeIterator& volIter) { //FIXME - bitwise way of doing this? VoxelType voxel1nx = volIter.peekVoxel1nx0py0pz() > 0 ? 1: 0; @@ -43,7 +43,7 @@ namespace PolyVox } template - Vector3DFloat computeSmoothCentralDifferenceGradient(VolumeIterator& volIter) + Vector3DFloat computeSmoothCentralDifferenceGradient(BlockVolumeIterator& volIter) { boost::uint16_t initialX = volIter.getPosX(); boost::uint16_t initialY = volIter.getPosY(); @@ -74,7 +74,7 @@ namespace PolyVox } template - Vector3DFloat computeSobelGradient(const VolumeIterator& volIter) + Vector3DFloat computeSobelGradient(const BlockVolumeIterator& volIter) { static const int weights[3][3][3] = { { {2,3,2}, {3,6,3}, {2,3,2} }, { {3,6,3}, {6,0,6}, {3,6,3} }, { {2,3,2}, {3,6,3}, {2,3,2} } }; diff --git a/include/PolyVoxForwardDeclarations.h b/include/PolyVoxForwardDeclarations.h index 4a36b2cf..4ddf88f6 100644 --- a/include/PolyVoxForwardDeclarations.h +++ b/include/PolyVoxForwardDeclarations.h @@ -57,7 +57,7 @@ namespace PolyVox //---------------------------- class VolumeChangeTracker; - template class VolumeIterator; + template class BlockVolumeIterator; } #endif diff --git a/source/SurfaceExtractors.cpp b/source/SurfaceExtractors.cpp index 89ce0d3d..376ecaf7 100644 --- a/source/SurfaceExtractors.cpp +++ b/source/SurfaceExtractors.cpp @@ -7,7 +7,7 @@ #include "Region.h" #include "RegionGeometry.h" #include "VolumeChangeTracker.h" -#include "VolumeIterator.h" +#include "BlockVolumeIterator.h" using namespace boost; @@ -52,7 +52,7 @@ namespace PolyVox Vector3DFloat vertlist[12]; uint8_t vertMaterials[12]; - VolumeIterator volIter(*volumeData); + BlockVolumeIterator volIter(*volumeData); volIter.setValidRegion(region); ////////////////////////////////////////////////////////////////////////// @@ -363,7 +363,7 @@ namespace PolyVox Vector3DFloat result; - VolumeIterator volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create? + BlockVolumeIterator volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create? if(normalGenerationMethod == SOBEL) @@ -450,7 +450,7 @@ namespace PolyVox Vector3DFloat vertlist[12]; uint8_t vertMaterials[12]; - VolumeIterator volIter(*volumeData); + BlockVolumeIterator volIter(*volumeData); volIter.setValidRegion(region); const float threshold = 0.5f; @@ -468,7 +468,7 @@ namespace PolyVox const uint16_t z = volIter.getPosZ(); //Voxels values - VolumeIterator tempVolIter(*volumeData); + BlockVolumeIterator tempVolIter(*volumeData); tempVolIter.setPosition(x,y,z); const float v000 = tempVolIter.getAveragedVoxel(1); tempVolIter.setPosition(x+1,y,z); @@ -765,7 +765,7 @@ namespace PolyVox Vector3DFloat result; - VolumeIterator volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create? + BlockVolumeIterator volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create? if(normalGenerationMethod == SOBEL) diff --git a/source/VolumeChangeTracker.cpp b/source/VolumeChangeTracker.cpp index 86cfab94..88676498 100644 --- a/source/VolumeChangeTracker.cpp +++ b/source/VolumeChangeTracker.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "Utility.h" #include "Vector.h" #include "BlockVolume.h" -#include "VolumeIterator.h" +#include "BlockVolumeIterator.h" using namespace boost; @@ -124,7 +124,7 @@ namespace PolyVox assert(uY < volumeData->getSideLength()); assert(uZ < volumeData->getSideLength()); - VolumeIterator volIter(*volumeData); + BlockVolumeIterator volIter(*volumeData); volIter.setPosition(uX,uY,uZ); return volIter.getVoxel(); } @@ -137,7 +137,7 @@ namespace PolyVox void VolumeChangeTracker::setVoxelAt(boost::uint16_t x, boost::uint16_t y, boost::uint16_t z, boost::uint8_t value) { //FIXME - rather than creating a iterator each time we should have one stored - VolumeIterator iterVol(*volumeData); + BlockVolumeIterator iterVol(*volumeData); iterVol.setPosition(x,y,z); iterVol.setVoxel(value); @@ -183,7 +183,7 @@ namespace PolyVox assert(m_bIsLocked); //FIXME - rather than creating a iterator each time we should have one stored - VolumeIterator iterVol(*volumeData); + BlockVolumeIterator iterVol(*volumeData); iterVol.setPosition(x,y,z); iterVol.setVoxel(value); }