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

Replaced double for loop with cleaner do-while loop.

Browse Source
This commit is contained in:
David Williams
2015-04-12 09:55:30 +02:00
parent f35581506c
commit c4cccf9043
1 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/PolyVox/PagedVolume.inl
View File

@ -271,48 +271,24 @@ namespace PolyVox
typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(int32_t uChunkX, int32_t uChunkY, int32_t uChunkZ) const typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(int32_t uChunkX, int32_t uChunkY, int32_t uChunkZ) const
{ {
// The chunk was not the same as last time, but we can now hope it is in the set of most recently used chunks. // The chunk was not the same as last time, but we can now hope it is in the set of most recently used chunks.
/*Chunk* pChunk = nullptr;
auto itChunk = m_mapChunks.find(v3dChunkPos);
// Check whether the chunk was found.
if ((itChunk) != m_mapChunks.end())
{
// The chunk was found so we can use it.
pChunk = itChunk->second.get();
POLYVOX_ASSERT(pChunk, "Recent chunk list shold never contain a null pointer.");
pChunk->m_uChunkLastAccessed = ++m_uTimestamper;
}*/
Chunk* pChunk = nullptr; Chunk* pChunk = nullptr;
const int32_t startIndex = (((uChunkX & 0xFF)) | ((uChunkY & 0x0F) << 4) | ((uChunkZ & 0x0F) << 8) << 2 ); const int32_t iStartIndex = (((uChunkX & 0xFF)) | ((uChunkY & 0x0F) << 4) | ((uChunkZ & 0x0F) << 8) << 2 );
for (uint32_t ct = startIndex; ct < 16384; ct++) int32_t iIndex = iStartIndex;
do
{ {
if (m_arrayChunks[ct]) if (m_arrayChunks[iIndex])
{ {
Vector3DInt32& entryPos = m_arrayChunks[ct]->m_v3dChunkSpacePosition; Vector3DInt32& entryPos = m_arrayChunks[iIndex]->m_v3dChunkSpacePosition;
if (entryPos.getX() == uChunkX && entryPos.getY() == uChunkY && entryPos.getZ() == uChunkZ) if (entryPos.getX() == uChunkX && entryPos.getY() == uChunkY && entryPos.getZ() == uChunkZ)
{ {
pChunk = m_arrayChunks[ct].get(); pChunk = m_arrayChunks[iIndex].get();
break; break;
} }
} }
}
if (pChunk == nullptr) iIndex++;
{ iIndex %= 16384;
for (uint32_t ct = 0; ct < startIndex; ct++) } while (iIndex != iStartIndex);
{
if (m_arrayChunks[ct])
{
Vector3DInt32& entryPos = m_arrayChunks[ct]->m_v3dChunkSpacePosition;
if (entryPos.getX() == uChunkX && entryPos.getY() == uChunkY && entryPos.getZ() == uChunkZ)
{
pChunk = m_arrayChunks[ct].get();
break;
}
}
}
}
// Check whether the chunk was found. // Check whether the chunk was found.
if (pChunk) if (pChunk)
@ -331,7 +307,7 @@ namespace PolyVox
pChunk->m_uChunkLastAccessed = ++m_uTimestamper; // Important, as we may soon delete the oldest chunk pChunk->m_uChunkLastAccessed = ++m_uTimestamper; // Important, as we may soon delete the oldest chunk
//m_mapChunks.insert(std::make_pair(v3dChunkPos, std::unique_ptr<Chunk>(pChunk))); //m_mapChunks.insert(std::make_pair(v3dChunkPos, std::unique_ptr<Chunk>(pChunk)));
for (uint32_t ct = startIndex; ct < 16384; ct++) for (uint32_t ct = iStartIndex; ct < 16384; ct++)
{ {
if (m_arrayChunks[ct] == nullptr) if (m_arrayChunks[ct] == nullptr)
{ {