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

Removed unneeded variable.

Browse Source
This commit is contained in:
David Williams 2015-04-04 09:42:46 +02:00
parent 0d36c416f2
commit 77db90ac30
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/PolyVox/PagedVolume.h
View File

@ -243,7 +243,6 @@ namespace PolyVox
private: private:
//Other current position information //Other current position information
VoxelType* mCurrentVoxel; VoxelType* mCurrentVoxel;
VoxelType* m_CurrentChunkData;
uint16_t m_uXPosInChunk; uint16_t m_uXPosInChunk;
uint16_t m_uYPosInChunk; uint16_t m_uYPosInChunk;

7
include/PolyVox/PagedVolumeSampler.inl
View File

@ -119,17 +119,12 @@ namespace PolyVox
m_uYPosInChunk = static_cast<uint16_t>(this->mYPosInVolume - (uYChunk << this->mVolume->m_uChunkSideLengthPower)); m_uYPosInChunk = static_cast<uint16_t>(this->mYPosInVolume - (uYChunk << this->mVolume->m_uChunkSideLengthPower));
m_uZPosInChunk = static_cast<uint16_t>(this->mZPosInVolume - (uZChunk << this->mVolume->m_uChunkSideLengthPower)); m_uZPosInChunk = static_cast<uint16_t>(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]; uint32_t uVoxelIndexInChunk = morton256_x[m_uXPosInChunk] | morton256_y[m_uYPosInChunk] | morton256_z[m_uZPosInChunk];
auto pCurrentChunk = this->mVolume->canReuseLastAccessedChunk(uXChunk, uYChunk, uZChunk) ? auto pCurrentChunk = this->mVolume->canReuseLastAccessedChunk(uXChunk, uYChunk, uZChunk) ?
this->mVolume->m_pLastAccessedChunk : this->mVolume->getChunk(uXChunk, uYChunk, uZChunk); this->mVolume->m_pLastAccessedChunk : this->mVolume->getChunk(uXChunk, uYChunk, uZChunk);
m_CurrentChunkData = pCurrentChunk->m_tData; mCurrentVoxel = pCurrentChunk->m_tData + uVoxelIndexInChunk;
mCurrentVoxel = m_CurrentChunkData + uVoxelIndexInChunk;
} }
template <typename VoxelType> template <typename VoxelType>