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

Work on supporting no pager being attached.

Browse Source
This commit is contained in:
David Williams
2014-09-16 17:02:53 +02:00
parent 47ace554cc
commit 704eeaf948
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
View File

@ -334,13 +334,6 @@ namespace PolyVox
uint8_t m_uBlockSideLengthPower; uint8_t m_uBlockSideLengthPower;
Pager<VoxelType>* m_pPager; Pager<VoxelType>* m_pPager;
// Compressed data for an empty block (sometimes needed for initialisation).
//CompressedBlock<VoxelType>* m_pCompressedEmptyBlock;
// Whether we created the compressor or whether it was provided
// by the user. This controls whether we delete it on destruction.
//bool m_bIsOurCompressor;
}; };
} }

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

@ -24,6 +24,7 @@ freely, subject to the following restrictions:
#include "PolyVoxCore/Impl/ErrorHandling.h" #include "PolyVoxCore/Impl/ErrorHandling.h"
#include <algorithm> #include <algorithm>
#include <limits>
namespace PolyVox namespace PolyVox
{ {
@ -46,9 +47,20 @@ namespace PolyVox
:BaseVolume<VoxelType>(regValid) :BaseVolume<VoxelType>(regValid)
{ {
m_uBlockSideLength = uBlockSideLength; m_uBlockSideLength = uBlockSideLength;
m_pPager = pPager; m_pPager = pPager;
if (m_pPager)
{
// If a pager is available then we can set a sensible limit on our memory usage.
m_uMaxNumberOfUncompressedBlocks = 256;
}
else
{
// If there is no pager provided then we set the block limit to the maximum
// value to ensure the system never attempts to page blocks out of memory.
m_uMaxNumberOfUncompressedBlocks = (std::numeric_limits<uint32_t>::max)();
}
initialise(); initialise();
} }
@ -215,6 +227,8 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void LargeVolume<VoxelType>::setMaxNumberOfUncompressedBlocks(uint32_t uMaxNumberOfUncompressedBlocks) void LargeVolume<VoxelType>::setMaxNumberOfUncompressedBlocks(uint32_t uMaxNumberOfUncompressedBlocks)
{ {
POLYVOX_THROW_IF(!m_pPager, invalid_operation, "You cannot limit the memory usage of the volume because it was created without a pager attached.");
//clearBlockCache(); //clearBlockCache();
/*if (m_pBlocks.size() > uMaxNumberOfBlocksInMemory) /*if (m_pBlocks.size() > uMaxNumberOfBlocksInMemory)
@ -386,6 +400,8 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void LargeVolume<VoxelType>::flushAll() void LargeVolume<VoxelType>::flushAll()
{ {
POLYVOX_THROW_IF(!m_pPager, invalid_operation, "You cannot flush data out of the volume because it was created without a pager attached.");
// Flushing will remove the most accessed block, so invalidate the pointer. // Flushing will remove the most accessed block, so invalidate the pointer.
m_pLastAccessedBlock = 0; m_pLastAccessedBlock = 0;
@ -403,6 +419,8 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void LargeVolume<VoxelType>::flush(Region regFlush) void LargeVolume<VoxelType>::flush(Region regFlush)
{ {
POLYVOX_THROW_IF(!m_pPager, invalid_operation, "You cannot flush data out of the volume because it was created without a pager attached.");
Vector3DInt32 v3dStart; Vector3DInt32 v3dStart;
for(int i = 0; i < 3; i++) for(int i = 0; i < 3; i++)
{ {
@ -486,6 +504,8 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void LargeVolume<VoxelType>::eraseBlock(typename UncompressedBlockMap::iterator itUncompressedBlock) const void LargeVolume<VoxelType>::eraseBlock(typename UncompressedBlockMap::iterator itUncompressedBlock) const
{ {
POLYVOX_ASSERT(m_pPager, "A block should never be erased if there is no pager attached to handle it");
std::shared_ptr< UncompressedBlock<VoxelType> > pUncompressedBlock = itUncompressedBlock->second; std::shared_ptr< UncompressedBlock<VoxelType> > pUncompressedBlock = itUncompressedBlock->second;
// This should never happen as blocks are deleted based on being least recently used. // This should never happen as blocks are deleted based on being least recently used.
@ -549,16 +569,6 @@ namespace PolyVox
//pUncompressedBlock = new UncompressedBlock<VoxelType>(m_uBlockSideLength); //pUncompressedBlock = new UncompressedBlock<VoxelType>(m_uBlockSideLength);
pUncompressedBlock = std::make_shared< UncompressedBlock<VoxelType> >(m_uBlockSideLength); pUncompressedBlock = std::make_shared< UncompressedBlock<VoxelType> >(m_uBlockSideLength);
// An uncompressed bock is always backed by a compressed one, and this is created by getCompressedBlock() if it doesn't
// already exist. If it does already exist and has data then we bring this across into the ucompressed version.
/*if(getCompressedBlock(uBlockX, uBlockY, uBlockZ)->getData() != 0)
{
// FIXME - multiple getCompressedBlock() calls (including the one above)
CompressedBlock<VoxelType>* pBlock = getCompressedBlock(uBlockX, uBlockY, );
m_pBlockCompressor->decompress(pBlock, pUncompressedBlock);
}*/
// Pass the block to the Pager to give it a chance to initialise it with any data // Pass the block to the Pager to give it a chance to initialise it with any data
Vector3DInt32 v3dLower(uBlockX << m_uBlockSideLengthPower, uBlockY << m_uBlockSideLengthPower, uBlockZ << m_uBlockSideLengthPower); Vector3DInt32 v3dLower(uBlockX << m_uBlockSideLengthPower, uBlockY << m_uBlockSideLengthPower, uBlockZ << m_uBlockSideLengthPower);
Vector3DInt32 v3dUpper = v3dLower + Vector3DInt32(m_uBlockSideLength - 1, m_uBlockSideLength - 1, m_uBlockSideLength - 1); Vector3DInt32 v3dUpper = v3dLower + Vector3DInt32(m_uBlockSideLength - 1, m_uBlockSideLength - 1, m_uBlockSideLength - 1);