AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Making use of sampling adjacent voxels. General optimisations and improvements.

Browse Source
This commit is contained in:
David Williams
2009-06-06 23:08:08 +00:00
parent 41e33b1f59
commit 3010eb341d
7 changed files with 174 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/OpenGL/main.cpp
View File

@ -66,6 +66,17 @@ int main(int argc, char *argv[])
cout << "Creating sphere 5" << std::endl; cout << "Creating sphere 5" << std::endl;
createSphereInVolume(volData, 20.0f, 1); createSphereInVolume(volData, 20.0f, 1);
/*cout << "Creating sphere 1" << std::endl;
createSphereInVolume(volData, 120.0f, 5);
cout << "Creating sphere 2" << std::endl;
createSphereInVolume(volData, 100.0f, 4);
cout << "Creating sphere 3" << std::endl;
createSphereInVolume(volData, 80.0f, 3);
cout << "Creating sphere 4" << std::endl;
createSphereInVolume(volData, 60.0f, 2);
cout << "Creating sphere 5" << std::endl;
createSphereInVolume(volData, 40.0f, 1);*/
cout << "Creating cubes" << std::endl; cout << "Creating cubes" << std::endl;
createCubeInVolume(volData, Vector3DUint16(minPos, minPos, minPos), Vector3DUint16(midPos-1, midPos-1, midPos-1), 0); createCubeInVolume(volData, Vector3DUint16(minPos, minPos, minPos), Vector3DUint16(midPos-1, midPos-1, midPos-1), 0);
createCubeInVolume(volData, Vector3DUint16(midPos+1, midPos+1, minPos), Vector3DUint16(maxPos, maxPos, midPos-1), 0); createCubeInVolume(volData, Vector3DUint16(midPos+1, midPos+1, minPos), Vector3DUint16(maxPos, maxPos, midPos-1), 0);

12
library/PolyVoxCore/include/VolumeSampler.h
View File

@ -34,20 +34,16 @@ namespace PolyVox
class VolumeSampler class VolumeSampler
{ {
public: public:
VolumeSampler(Volume<VoxelType>& volume); VolumeSampler(Volume<VoxelType>* volume);
~VolumeSampler(); ~VolumeSampler();
bool operator==(const VolumeSampler& rhs); VolumeSampler<VoxelType>& operator=(const VolumeSampler<VoxelType>& rhs) throw();
bool operator<(const VolumeSampler& rhs);
bool operator>(const VolumeSampler& rhs);
bool operator<=(const VolumeSampler& rhs);
bool operator>=(const VolumeSampler& rhs);
uint16_t getPosX(void) const; uint16_t getPosX(void) const;
uint16_t getPosY(void) const; uint16_t getPosY(void) const;
uint16_t getPosZ(void) const; uint16_t getPosZ(void) const;
VoxelType getSubSampledVoxel(uint8_t uLevel) const; VoxelType getSubSampledVoxel(uint8_t uLevel) const;
const Volume<VoxelType>& getVolume(void) const; const Volume<VoxelType>* getVolume(void) const;
inline VoxelType getVoxel(void) const; inline VoxelType getVoxel(void) const;
void setPosition(const Vector3DInt16& v3dNewPos); void setPosition(const Vector3DInt16& v3dNewPos);
@ -94,7 +90,7 @@ namespace PolyVox
private: private:
//The current volume //The current volume
Volume<VoxelType>& mVolume; Volume<VoxelType>* mVolume;
//The current position in the volume //The current position in the volume
uint16_t mXPosInVolume; uint16_t mXPosInVolume;

284
library/PolyVoxCore/include/VolumeSampler.inl
View File

@ -32,7 +32,7 @@ namespace PolyVox
{ {
#pragma region Constructors/Destructors #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,64 +45,18 @@ namespace PolyVox
#pragma region Operators #pragma region Operators
template <typename VoxelType> template <typename VoxelType>
bool VolumeSampler<VoxelType>::operator==(const VolumeSampler<VoxelType>& rhs) VolumeSampler<VoxelType>& VolumeSampler<VoxelType>::operator=(const VolumeSampler<VoxelType>& rhs) throw()
{ {
//We could just check whether the two mCurrentVoxel pointers are equal, but this may not if(this == &rhs)
//be safe in the future if we decide to allow blocks to be shared between volumes {
//So we really check whether the positions are the same. return *this;
//NOTE: With all iterator comparisons it is the users job to ensure they at least point
//to the same volume. Otherwise they are not comparible.
assert(&mVolume == &rhs.mVolume);
return
(
(mXPosInVolume == rhs.mXPosInVolume) &&
(mYPosInVolume == rhs.mYPosInVolume) &&
(mZPosInVolume == rhs.mZPosInVolume)
);
} }
mVolume = rhs.mVolume;
template <typename VoxelType> mXPosInVolume = rhs.mXPosInVolume;
bool VolumeSampler<VoxelType>::operator<(const VolumeSampler<VoxelType>& rhs) mYPosInVolume = rhs.mYPosInVolume;
{ mZPosInVolume = rhs.mZPosInVolume;
assert(&mVolume == &rhs.mVolume); mCurrentVoxel = rhs.mCurrentVoxel;
return *this;
if(mZPosInVolume < rhs.mZPosInVolume)
return true;
if(mZPosInVolume > rhs.mZPosInVolume)
return false;
if(mYPosInVolume < rhs.mYPosInVolume)
return true;
if(mYPosInVolume > rhs.mYPosInVolume)
return false;
if(mXPosInVolume < rhs.mXPosInVolume)
return true;
if(mXPosInVolume > rhs.mXPosInVolume)
return false;
return false;
}
template <typename VoxelType>
bool VolumeSampler<VoxelType>::operator>(const VolumeSampler<VoxelType>& rhs)
{
assert(&mVolume == &rhs.mVolume);
return (rhs < *this);
}
template <typename VoxelType>
bool VolumeSampler<VoxelType>::operator<=(const VolumeSampler<VoxelType>& rhs)
{
assert(&mVolume == &rhs.mVolume);
return (rhs > *this);
}
template <typename VoxelType>
bool VolumeSampler<VoxelType>::operator>=(const VolumeSampler<VoxelType>& rhs)
{
assert(&mVolume == &rhs.mVolume);
return (rhs < *this);
} }
#pragma endregion #pragma endregion
@ -155,7 +109,7 @@ namespace PolyVox
{ {
for(uint8_t x = 0; x < uSize; ++x) for(uint8_t x = 0; x < uSize; ++x)
{ {
tValue = (std::min)(tValue, mVolume.getVoxelAt(mXPosInVolume + x, mYPosInVolume + y, mZPosInVolume + z)); tValue = (std::min)(tValue, mVolume->getVoxelAt(mXPosInVolume + x, mYPosInVolume + y, mZPosInVolume + z));
} }
} }
} }
@ -164,7 +118,7 @@ namespace PolyVox
} }
template <typename VoxelType> template <typename VoxelType>
const Volume<VoxelType>& VolumeSampler<VoxelType>::getVolume(void) const const Volume<VoxelType>* VolumeSampler<VoxelType>::getVolume(void) const
{ {
return mVolume; return mVolume;
} }
@ -190,22 +144,22 @@ namespace PolyVox
mYPosInVolume = yPos; mYPosInVolume = yPos;
mZPosInVolume = zPos; mZPosInVolume = zPos;
const uint16_t uXBlock = mXPosInVolume >> mVolume.m_uBlockSideLengthPower; const uint16_t uXBlock = mXPosInVolume >> mVolume->m_uBlockSideLengthPower;
const uint16_t uYBlock = mYPosInVolume >> mVolume.m_uBlockSideLengthPower; const uint16_t uYBlock = mYPosInVolume >> mVolume->m_uBlockSideLengthPower;
const uint16_t uZBlock = mZPosInVolume >> mVolume.m_uBlockSideLengthPower; const uint16_t uZBlock = mZPosInVolume >> mVolume->m_uBlockSideLengthPower;
const uint16_t uXPosInBlock = mXPosInVolume - (uXBlock << mVolume.m_uBlockSideLengthPower); const uint16_t uXPosInBlock = mXPosInVolume - (uXBlock << mVolume->m_uBlockSideLengthPower);
const uint16_t uYPosInBlock = mYPosInVolume - (uYBlock << mVolume.m_uBlockSideLengthPower); const uint16_t uYPosInBlock = mYPosInVolume - (uYBlock << mVolume->m_uBlockSideLengthPower);
const uint16_t uZPosInBlock = mZPosInVolume - (uZBlock << mVolume.m_uBlockSideLengthPower); const uint16_t uZPosInBlock = mZPosInVolume - (uZBlock << mVolume->m_uBlockSideLengthPower);
const uint32_t uBlockIndexInVolume = uXBlock + const uint32_t uBlockIndexInVolume = uXBlock +
uYBlock * mVolume.m_uWidthInBlocks + uYBlock * mVolume->m_uWidthInBlocks +
uZBlock * mVolume.m_uWidthInBlocks * mVolume.m_uHeightInBlocks; uZBlock * mVolume->m_uWidthInBlocks * mVolume->m_uHeightInBlocks;
const POLYVOX_SHARED_PTR< Block<VoxelType> >& currentBlock = mVolume.m_pBlocks[uBlockIndexInVolume]; const POLYVOX_SHARED_PTR< Block<VoxelType> >& currentBlock = mVolume->m_pBlocks[uBlockIndexInVolume];
const uint32_t uVoxelIndexInBlock = uXPosInBlock + const uint32_t uVoxelIndexInBlock = uXPosInBlock +
uYPosInBlock * mVolume.m_uBlockSideLength + uYPosInBlock * mVolume->m_uBlockSideLength +
uZPosInBlock * mVolume.m_uBlockSideLength * mVolume.m_uBlockSideLength; uZPosInBlock * mVolume->m_uBlockSideLength * mVolume->m_uBlockSideLength;
mCurrentVoxel = currentBlock->m_tData + uVoxelIndexInBlock; mCurrentVoxel = currentBlock->m_tData + uVoxelIndexInBlock;
} }
#pragma endregion #pragma endregion
@ -214,10 +168,10 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void VolumeSampler<VoxelType>::movePositiveX(void) void VolumeSampler<VoxelType>::movePositiveX(void)
{ {
assert(mXPosInVolume < mVolume.m_uWidth - 1); assert(mXPosInVolume < mVolume->m_uWidth - 1);
//Note the *post* increament here //Note the *pre* increament here
if((mXPosInVolume++) % mVolume.m_uBlockSideLength == 0) if((++mXPosInVolume) % mVolume->m_uBlockSideLength != 0)
{ {
//No need to compute new block. //No need to compute new block.
++mCurrentVoxel; ++mCurrentVoxel;
@ -232,13 +186,13 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void VolumeSampler<VoxelType>::movePositiveY(void) void VolumeSampler<VoxelType>::movePositiveY(void)
{ {
assert(mYPosInVolume < mVolume.m_uHeight - 1); assert(mYPosInVolume < mVolume->m_uHeight - 1);
//Note the *post* increament here //Note the *pre* increament here
if((mYPosInVolume++) % mVolume.m_uBlockSideLength == 0) if((++mYPosInVolume) % mVolume->m_uBlockSideLength != 0)
{ {
//No need to compute new block. //No need to compute new block.
mCurrentVoxel += mVolume.m_uBlockSideLength; mCurrentVoxel += mVolume->m_uBlockSideLength;
} }
else else
{ {
@ -250,13 +204,13 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void VolumeSampler<VoxelType>::movePositiveZ(void) void VolumeSampler<VoxelType>::movePositiveZ(void)
{ {
assert(mZPosInVolume < mVolume.m_uDepth - 1); assert(mZPosInVolume < mVolume->m_uDepth - 1);
//Note the *post* increament here //Note the *pre* increament here
if((mZPosInVolume++) % mVolume.m_uBlockSideLength == 0) if((++mZPosInVolume) % mVolume->m_uBlockSideLength != 0)
{ {
//No need to compute new block. //No need to compute new block.
mCurrentVoxel += mVolume.m_uBlockSideLength * mVolume.m_uBlockSideLength; mCurrentVoxel += mVolume->m_uBlockSideLength * mVolume->m_uBlockSideLength;
} }
else else
{ {
@ -270,8 +224,8 @@ namespace PolyVox
{ {
assert(mXPosInVolume > 0); assert(mXPosInVolume > 0);
//Note the *pre* increament here //Note the *post* increament here
if((--mXPosInVolume) % mVolume.m_uBlockSideLength == 0) if((mXPosInVolume--) % mVolume->m_uBlockSideLength != 0)
{ {
//No need to compute new block. //No need to compute new block.
++mCurrentVoxel; ++mCurrentVoxel;
@ -288,11 +242,11 @@ namespace PolyVox
{ {
assert(mYPosInVolume > 0); assert(mYPosInVolume > 0);
//Note the *pre* increament here //Note the *post* increament here
if((--mYPosInVolume) % mVolume.m_uBlockSideLength == 0) if((mYPosInVolume--) % mVolume->m_uBlockSideLength != 0)
{ {
//No need to compute new block. //No need to compute new block.
mCurrentVoxel += mVolume.m_uBlockSideLength; mCurrentVoxel += mVolume->m_uBlockSideLength;
} }
else else
{ {
@ -306,11 +260,11 @@ namespace PolyVox
{ {
assert(mZPosInVolume > 0); assert(mZPosInVolume > 0);
//Note the *pre* increament here //Note the *post* increament here
if((--mZPosInVolume) % mVolume.m_uBlockSideLength == 0) if((mZPosInVolume--) % mVolume->m_uBlockSideLength != 0)
{ {
//No need to compute new block. //No need to compute new block.
mCurrentVoxel += mVolume.m_uBlockSideLength * mVolume.m_uBlockSideLength; mCurrentVoxel += mVolume->m_uBlockSideLength * mVolume->m_uBlockSideLength;
} }
else else
{ {
@ -324,91 +278,91 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny1nz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mYPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - 1 - mVolume.m_uBlockSideLength - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 - mVolume->m_uBlockSideLength - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume-1,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume-1,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny0pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mYPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - 1 - mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 - mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume-1,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume-1,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny1pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1ny1pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mYPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel - 1 - mVolume.m_uBlockSideLength + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 - mVolume->m_uBlockSideLength + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume-1,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume-1,mZPosInVolume+1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx0py1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx0py1nz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - 1 - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx0py0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx0py0pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - 1); return *(mCurrentVoxel - 1);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx0py1pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx0py1pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel - 1 + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume,mZPosInVolume+1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1py1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1py1nz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - 1 + mVolume.m_uBlockSideLength - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 + mVolume->m_uBlockSideLength - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume+1,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume+1,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1py0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1py0pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != 0) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel - 1 + mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 + mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume+1,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume+1,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1nx1py1pz(void) const VoxelType VolumeSampler<VoxelType>::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)) if((mXPosInVolume%mVolume->m_uBlockSideLength != 0) && (mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel - 1 + mVolume.m_uBlockSideLength + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - 1 + mVolume->m_uBlockSideLength + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume-1,mYPosInVolume+1,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume-1,mYPosInVolume+1,mZPosInVolume+1);
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -416,41 +370,41 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px1ny1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px1ny1nz(void) const
{ {
if((mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mYPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - mVolume.m_uBlockSideLength - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - mVolume->m_uBlockSideLength - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume-1,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume-1,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px1ny0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px1ny0pz(void) const
{ {
if((mYPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mYPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - mVolume.m_uBlockSideLength); return *(mCurrentVoxel - mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume-1,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume-1,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px1ny1pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px1ny1pz(void) const
{ {
if((mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mYPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel - mVolume.m_uBlockSideLength + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - mVolume->m_uBlockSideLength + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume-1,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume-1,mZPosInVolume+1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px0py1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px0py1nz(void) const
{ {
if((mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
@ -462,41 +416,41 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px0py1pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px0py1pz(void) const
{ {
if((mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume,mZPosInVolume+1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px1py1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px1py1nz(void) const
{ {
if((mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel + mVolume.m_uBlockSideLength - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + mVolume->m_uBlockSideLength - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume+1,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume+1,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px1py0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px1py0pz(void) const
{ {
if((mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel + mVolume.m_uBlockSideLength); return *(mCurrentVoxel + mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume+1,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume+1,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel0px1py1pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel0px1py1pz(void) const
{ {
if((mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel + mVolume.m_uBlockSideLength + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + mVolume->m_uBlockSideLength + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume,mYPosInVolume+1,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume,mYPosInVolume+1,mZPosInVolume+1);
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -504,91 +458,91 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px1ny1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1px1ny1nz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mYPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel + 1 - mVolume.m_uBlockSideLength - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 - mVolume->m_uBlockSideLength - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume-1,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume-1,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px1ny0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1px1ny0pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mYPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel + 1 - mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 - mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume-1,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume-1,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px1ny1pz(void) const VoxelType VolumeSampler<VoxelType>::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)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mYPosInVolume%mVolume->m_uBlockSideLength != 0) && (mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel + 1 - mVolume.m_uBlockSideLength + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 - mVolume->m_uBlockSideLength + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume-1,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume-1,mZPosInVolume+1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px0py1nz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1px0py1nz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != 0)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel + 1 - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px0py0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1px0py0pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel + 1); return *(mCurrentVoxel + 1);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px0py1pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1px0py1pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mZPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mZPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel + 1 + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume,mZPosInVolume+1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px1py1nz(void) const VoxelType VolumeSampler<VoxelType>::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)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mZPosInVolume%mVolume->m_uBlockSideLength != 0))
{ {
return *(mCurrentVoxel + 1 + mVolume.m_uBlockSideLength - mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 + mVolume->m_uBlockSideLength - mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume-1); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume-1);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px1py0pz(void) const VoxelType VolumeSampler<VoxelType>::peekVoxel1px1py0pz(void) const
{ {
if((mXPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1) && (mYPosInVolume%mVolume.m_uBlockSideLength != mVolume.m_uBlockSideLength-1)) if((mXPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1) && (mYPosInVolume%mVolume->m_uBlockSideLength != mVolume->m_uBlockSideLength-1))
{ {
return *(mCurrentVoxel + 1 + mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 + mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume);
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType VolumeSampler<VoxelType>::peekVoxel1px1py1pz(void) const VoxelType VolumeSampler<VoxelType>::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)) 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))
{ {
return *(mCurrentVoxel + 1 + mVolume.m_uBlockSideLength + mVolume.m_uBlockSideLength*mVolume.m_uBlockSideLength); return *(mCurrentVoxel + 1 + mVolume->m_uBlockSideLength + mVolume->m_uBlockSideLength*mVolume->m_uBlockSideLength);
} }
return mVolume.getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume+1); return mVolume->getVoxelAt(mXPosInVolume+1,mYPosInVolume+1,mZPosInVolume+1);
} }
#pragma endregion #pragma endregion
} }

4
library/PolyVoxCore/source/GradientEstimators.cpp
View File

@ -16,7 +16,7 @@ namespace PolyVox
const Vector3DFloat& v3dPos = iterSurfaceVertex->getPosition() + static_cast<Vector3DFloat>(isp.m_Region.getLowerCorner()); const Vector3DFloat& v3dPos = iterSurfaceVertex->getPosition() + static_cast<Vector3DFloat>(isp.m_Region.getLowerCorner());
const Vector3DInt16 v3dFloor = static_cast<Vector3DInt16>(v3dPos); const Vector3DInt16 v3dFloor = static_cast<Vector3DInt16>(v3dPos);
VolumeSampler<uint8_t> volIter(*volumeData); VolumeSampler<uint8_t> volIter(volumeData);
//Check all corners are within the volume, allowing a boundary for gradient estimation //Check all corners are within the volume, allowing a boundary for gradient estimation
bool lowerCornerInside = volumeData->getEnclosingRegion().containsPoint(v3dFloor,2); bool lowerCornerInside = volumeData->getEnclosingRegion().containsPoint(v3dFloor,2);
@ -42,7 +42,7 @@ namespace PolyVox
{ {
Vector3DFloat v3dGradient; //To store the result Vector3DFloat v3dGradient; //To store the result
VolumeSampler<uint8_t> volIter(*volumeData); VolumeSampler<uint8_t> volIter(volumeData);
const Vector3DInt32 v3dFloor = static_cast<Vector3DInt32>(v3dPos); const Vector3DInt32 v3dFloor = static_cast<Vector3DInt32>(v3dPos);

37
library/PolyVoxCore/source/SurfaceExtractor.cpp
View File

@ -9,7 +9,7 @@ namespace PolyVox
SurfaceExtractor::SurfaceExtractor(Volume<uint8_t>& volData) SurfaceExtractor::SurfaceExtractor(Volume<uint8_t>& volData)
:m_uLodLevel(0) :m_uLodLevel(0)
,m_volData(volData) ,m_volData(volData)
,m_sampVolume(volData) ,m_sampVolume(&volData)
{ {
} }
@ -184,35 +184,62 @@ namespace PolyVox
//Process the edge where x is minimal. //Process the edge where x is minimal.
uXVolSpace = m_regSliceCurrent.getLowerCorner().getX(); uXVolSpace = m_regSliceCurrent.getLowerCorner().getX();
m_sampVolume.setPosition(uXVolSpace, m_regSliceCurrent.getLowerCorner().getY(), uZVolSpace);
for(uYVolSpace = m_regSliceCurrent.getLowerCorner().getY() + m_uStepSize; uYVolSpace <= uMaxYVolSpace; uYVolSpace += m_uStepSize) for(uYVolSpace = m_regSliceCurrent.getLowerCorner().getY() + m_uStepSize; uYVolSpace <= uMaxYVolSpace; uYVolSpace += m_uStepSize)
{ {
uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX(); uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX();
uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY(); uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY();
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace); if(uLodLevel == 0)
{
m_sampVolume.movePositiveY();
}
else
{
m_sampVolume.setPosition(uXVolSpace, uYVolSpace, uZVolSpace);
}
computeBitmaskForCell<false, true, isPrevZAvail, uLodLevel>(); computeBitmaskForCell<false, true, isPrevZAvail, uLodLevel>();
} }
//Process the edge where y is minimal. //Process the edge where y is minimal.
uYVolSpace = m_regSliceCurrent.getLowerCorner().getY(); uYVolSpace = m_regSliceCurrent.getLowerCorner().getY();
m_sampVolume.setPosition(m_regSliceCurrent.getLowerCorner().getX(), uYVolSpace, uZVolSpace);
for(uXVolSpace = m_regSliceCurrent.getLowerCorner().getX() + m_uStepSize; uXVolSpace <= uMaxXVolSpace; uXVolSpace += m_uStepSize) for(uXVolSpace = m_regSliceCurrent.getLowerCorner().getX() + m_uStepSize; uXVolSpace <= uMaxXVolSpace; uXVolSpace += m_uStepSize)
{ {
uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX(); uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX();
uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY(); uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY();
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace); if(uLodLevel == 0)
{
m_sampVolume.movePositiveX();
}
else
{
m_sampVolume.setPosition(uXVolSpace, uYVolSpace, uZVolSpace);
}
computeBitmaskForCell<true, false, isPrevZAvail, uLodLevel>(); computeBitmaskForCell<true, false, isPrevZAvail, uLodLevel>();
} }
//Process all remaining elemnents of the slice. In this case, previous x and y values are always available //Process all remaining elemnents of the slice. In this case, previous x and y values are always available
for(uYVolSpace = m_regSliceCurrent.getLowerCorner().getY() + m_uStepSize; uYVolSpace <= uMaxYVolSpace; uYVolSpace += m_uStepSize) for(uYVolSpace = m_regSliceCurrent.getLowerCorner().getY() + m_uStepSize; uYVolSpace <= uMaxYVolSpace; uYVolSpace += m_uStepSize)
{ {
m_sampVolume.setPosition(m_regSliceCurrent.getLowerCorner().getX(), uYVolSpace, uZVolSpace);
for(uXVolSpace = m_regSliceCurrent.getLowerCorner().getX() + m_uStepSize; uXVolSpace <= uMaxXVolSpace; uXVolSpace += m_uStepSize) for(uXVolSpace = m_regSliceCurrent.getLowerCorner().getX() + m_uStepSize; uXVolSpace <= uMaxXVolSpace; uXVolSpace += m_uStepSize)
{ {
uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX(); uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX();
uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY(); uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY();
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace); if(uLodLevel == 0)
{
m_sampVolume.movePositiveX();
}
else
{
m_sampVolume.setPosition(uXVolSpace, uYVolSpace, uZVolSpace);
}
computeBitmaskForCell<true, true, isPrevZAvail, uLodLevel>(); computeBitmaskForCell<true, true, isPrevZAvail, uLodLevel>();
} }
} }
@ -274,7 +301,6 @@ namespace PolyVox
{ {
v011 = m_sampVolume.peekVoxel0px1py1pz(); v011 = m_sampVolume.peekVoxel0px1py1pz();
v111 = m_sampVolume.peekVoxel1px1py1pz(); v111 = m_sampVolume.peekVoxel1px1py1pz();
} }
else else
{ {
@ -307,7 +333,6 @@ namespace PolyVox
{ {
v101 = m_sampVolume.peekVoxel1px0py1pz(); v101 = m_sampVolume.peekVoxel1px0py1pz();
v111 = m_sampVolume.peekVoxel1px1py1pz(); v111 = m_sampVolume.peekVoxel1px1py1pz();
} }
else else
{ {

6
library/PolyVoxCore/source/VoxelFilters.cpp
View File

@ -9,9 +9,9 @@ namespace PolyVox
assert(volIter.getPosX() >= 1); assert(volIter.getPosX() >= 1);
assert(volIter.getPosY() >= 1); assert(volIter.getPosY() >= 1);
assert(volIter.getPosZ() >= 1); assert(volIter.getPosZ() >= 1);
assert(volIter.getPosX() <= volIter.getVolume().getWidth() - 2); assert(volIter.getPosX() <= volIter.getVolume()->getWidth() - 2);
assert(volIter.getPosY() <= volIter.getVolume().getHeight() - 2); assert(volIter.getPosY() <= volIter.getVolume()->getHeight() - 2);
assert(volIter.getPosZ() <= volIter.getVolume().getDepth() - 2); assert(volIter.getPosZ() <= volIter.getVolume()->getDepth() - 2);
float sum = 0.0; float sum = 0.0;

4
library/PolyVoxUtil/source/Serialization.cpp
View File

@ -61,7 +61,7 @@ namespace PolyVox
stream.write(reinterpret_cast<char*>(&volumeDepthPower), sizeof(volumeDepthPower)); stream.write(reinterpret_cast<char*>(&volumeDepthPower), sizeof(volumeDepthPower));
//Write data //Write data
VolumeSampler<uint8_t> volIter(volume); VolumeSampler<uint8_t> volIter(&volume);
for(uint16_t z = 0; z < volumeDepth; ++z) for(uint16_t z = 0; z < volumeDepth; ++z)
{ {
for(uint16_t y = 0; y < volumeHeight; ++y) for(uint16_t y = 0; y < volumeHeight; ++y)
@ -143,7 +143,7 @@ namespace PolyVox
stream.write(reinterpret_cast<char*>(&volumeDepthPower), sizeof(volumeDepthPower)); stream.write(reinterpret_cast<char*>(&volumeDepthPower), sizeof(volumeDepthPower));
//Write data //Write data
VolumeSampler<uint8_t> volIter(volume); VolumeSampler<uint8_t> volIter(&volume);
uint8_t current = 0; uint8_t current = 0;
uint32_t runLength = 0; uint32_t runLength = 0;
bool firstTime = true; bool firstTime = true;