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

Starting some refactoring of the LargeVolume such that the uncompressed blocks are the 'main' representation, rather than the compressed block being the main version and the uncompressed blocks simply being a cached version. I hope this simplifies and improves the code.

Browse Source
This commit is contained in:
David Williams 2013-07-25 15:51:30 +02:00
parent cf9b54e5ab
commit f4f85551c6
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
View File

@ -713,13 +713,39 @@ namespace PolyVox
//the time stamp. If we updated it everytime then that would be every time we touched //the time stamp. If we updated it everytime then that would be every time we touched
//a voxel, which would overflow a uint32_t and require us to use a uint64_t instead. //a voxel, which would overflow a uint32_t and require us to use a uint64_t instead.
//This check should also provide a significant speed boost as usually it is true. //This check should also provide a significant speed boost as usually it is true.
if((v3dBlockPos == m_v3dLastAccessedBlockPos) && (m_pLastAccessedBlock != 0)) /*if((v3dBlockPos == m_v3dLastAccessedBlockPos) && (m_pLastAccessedBlock != 0))
{ {
return m_pLastAccessedBlock; return m_pLastAccessedBlock;
}*/
UncompressedBlock<VoxelType>* pUncompressedBlock = 0;
typename UncompressedBlockMap::iterator itUncompressedBlock = m_pUncompressedBlockCache.find(v3dBlockPos);
// check whether the block is already loaded
if(itUncompressedBlock != m_pUncompressedBlockCache.end())
{
pUncompressedBlock = itUncompressedBlock->second;
}
//else if(check compressed list...)
//{
//}
else
{
// At this point we just create a new block.
pUncompressedBlock = new UncompressedBlock<VoxelType>(m_uBlockSideLength);
m_pUncompressedBlockCache.insert(std::make_pair(v3dBlockPos, pUncompressedBlock));
// Our block cache may now have grown too large. Flush some entries is necessary.
// FIXME - Watch out for flushing the block we just created!
//flushExcessiveCacheEntries();
} }
pUncompressedBlock->m_uBlockLastAccessed = ++m_uTimestamper;
//Gets the block and marks that we accessed it //Gets the block and marks that we accessed it
CompressedBlock<VoxelType>* block = getCompressedBlock(uBlockX, uBlockY, uBlockZ); /*CompressedBlock<VoxelType>* block = getCompressedBlock(uBlockX, uBlockY, uBlockZ);
typename UncompressedBlockMap::iterator itUncompressedBlock = m_pUncompressedBlockCache.find(v3dBlockPos); typename UncompressedBlockMap::iterator itUncompressedBlock = m_pUncompressedBlockCache.find(v3dBlockPos);
// check whether the block is already loaded // check whether the block is already loaded
@ -743,9 +769,9 @@ namespace PolyVox
// Our block cache may now have grown too large. Fluch some entries is necessary. // Our block cache may now have grown too large. Fluch some entries is necessary.
flushExcessiveCacheEntries(); flushExcessiveCacheEntries();
} }*/
m_pLastAccessedBlock = (*itUncompressedBlock).second; m_pLastAccessedBlock = pUncompressedBlock;
m_v3dLastAccessedBlockPos = v3dBlockPos; m_v3dLastAccessedBlockPos = v3dBlockPos;
return m_pLastAccessedBlock; return m_pLastAccessedBlock;