From 2c31a7455a58ebc935010ad3a46b26be83f297fe Mon Sep 17 00:00:00 2001 From: David Williams Date: Mon, 6 Jun 2011 20:14:42 +0100 Subject: [PATCH] Changed max no of blocks in memory and max no of compressed blocks to be 32 bit values. --- library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h | 4 ++-- library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h index e9355b0e..b9ba2909 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h @@ -279,9 +279,9 @@ namespace PolyVox //Sets whether or not blocks are compressed in memory void setCompressionEnabled(bool bCompressionEnabled); /// Sets the number of blocks for which uncompressed data is stored - void setMaxNumberOfUncompressedBlocks(uint16_t uMaxNumberOfUncompressedBlocks); + void setMaxNumberOfUncompressedBlocks(uint32_t uMaxNumberOfUncompressedBlocks); /// Sets the number of blocks which can be in memory before the paging system starts unloading them - void setMaxNumberOfBlocksInMemory(uint16_t uMaxNumberOfBlocksInMemory); + void setMaxNumberOfBlocksInMemory(uint32_t uMaxNumberOfBlocksInMemory); /// Sets the value used for voxels which are outside the volume void setBorderValue(const VoxelType& tBorder); /// Sets the voxel at the position given by x,y,z coordinates diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl index 0c1b7678..a6f4e0ec 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl @@ -267,7 +267,7 @@ namespace PolyVox /// \param uBlockCacheSize The number of blocks for which uncompressed data can be cached. //////////////////////////////////////////////////////////////////////////////// template - void LargeVolume::setMaxNumberOfUncompressedBlocks(uint16_t uMaxNumberOfUncompressedBlocks) + void LargeVolume::setMaxNumberOfUncompressedBlocks(uint32_t uMaxNumberOfUncompressedBlocks) { clearBlockCache(); @@ -279,7 +279,7 @@ namespace PolyVox /// \param uMaxBlocks The number of blocks //////////////////////////////////////////////////////////////////////////////// template - void LargeVolume::setMaxNumberOfBlocksInMemory(uint16_t uMaxNumberOfBlocksInMemory) + void LargeVolume::setMaxNumberOfBlocksInMemory(uint32_t uMaxNumberOfBlocksInMemory) { if(m_pBlocks.size() > uMaxNumberOfBlocksInMemory) {