From 77db90ac300b2122253c6bff58e38f71efa2f4a2 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 4 Apr 2015 09:42:46 +0200 Subject: [PATCH] Removed unneeded variable. --- include/PolyVox/PagedVolume.h | 1 - include/PolyVox/PagedVolumeSampler.inl | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/PolyVox/PagedVolume.h b/include/PolyVox/PagedVolume.h index f7b59a58..f9423373 100644 --- a/include/PolyVox/PagedVolume.h +++ b/include/PolyVox/PagedVolume.h @@ -243,7 +243,6 @@ namespace PolyVox private: //Other current position information VoxelType* mCurrentVoxel; - VoxelType* m_CurrentChunkData; uint16_t m_uXPosInChunk; uint16_t m_uYPosInChunk; diff --git a/include/PolyVox/PagedVolumeSampler.inl b/include/PolyVox/PagedVolumeSampler.inl index 325bedb6..68197bd5 100644 --- a/include/PolyVox/PagedVolumeSampler.inl +++ b/include/PolyVox/PagedVolumeSampler.inl @@ -119,17 +119,12 @@ namespace PolyVox m_uYPosInChunk = static_cast(this->mYPosInVolume - (uYChunk << this->mVolume->m_uChunkSideLengthPower)); m_uZPosInChunk = static_cast(this->mZPosInVolume - (uZChunk << this->mVolume->m_uChunkSideLengthPower)); - /*const uint32_t uVoxelIndexInChunk = m_uXPosInChunk + - m_uYPosInChunk * this->mVolume->m_uChunkSideLength + - m_uZPosInChunk * this->mVolume->m_uChunkSideLength * this->mVolume->m_uChunkSideLength;*/ - uint32_t uVoxelIndexInChunk = morton256_x[m_uXPosInChunk] | morton256_y[m_uYPosInChunk] | morton256_z[m_uZPosInChunk]; auto pCurrentChunk = this->mVolume->canReuseLastAccessedChunk(uXChunk, uYChunk, uZChunk) ? this->mVolume->m_pLastAccessedChunk : this->mVolume->getChunk(uXChunk, uYChunk, uZChunk); - m_CurrentChunkData = pCurrentChunk->m_tData; - mCurrentVoxel = m_CurrentChunkData + uVoxelIndexInChunk; + mCurrentVoxel = pCurrentChunk->m_tData + uVoxelIndexInChunk; } template