Changed max no of blocks in memory and max no of compressed blocks to be 32 bit values.
This commit is contained in:
		| @@ -279,9 +279,9 @@ namespace PolyVox | |||||||
| 		//Sets whether or not blocks are compressed in memory | 		//Sets whether or not blocks are compressed in memory | ||||||
| 		void setCompressionEnabled(bool bCompressionEnabled); | 		void setCompressionEnabled(bool bCompressionEnabled); | ||||||
| 		/// Sets the number of blocks for which uncompressed data is stored | 		/// 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 | 		/// 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 | 		/// Sets the value used for voxels which are outside the volume | ||||||
| 		void setBorderValue(const VoxelType& tBorder); | 		void setBorderValue(const VoxelType& tBorder); | ||||||
| 		/// Sets the voxel at the position given by <tt>x,y,z</tt> coordinates | 		/// Sets the voxel at the position given by <tt>x,y,z</tt> coordinates | ||||||
|   | |||||||
| @@ -267,7 +267,7 @@ namespace PolyVox | |||||||
| 	/// \param uBlockCacheSize The number of blocks for which uncompressed data can be cached. | 	/// \param uBlockCacheSize The number of blocks for which uncompressed data can be cached. | ||||||
| 	//////////////////////////////////////////////////////////////////////////////// | 	//////////////////////////////////////////////////////////////////////////////// | ||||||
| 	template <typename VoxelType> | 	template <typename VoxelType> | ||||||
| 	void LargeVolume<VoxelType>::setMaxNumberOfUncompressedBlocks(uint16_t uMaxNumberOfUncompressedBlocks) | 	void LargeVolume<VoxelType>::setMaxNumberOfUncompressedBlocks(uint32_t uMaxNumberOfUncompressedBlocks) | ||||||
| 	{ | 	{ | ||||||
| 		clearBlockCache(); | 		clearBlockCache(); | ||||||
|  |  | ||||||
| @@ -279,7 +279,7 @@ namespace PolyVox | |||||||
| 	/// \param uMaxBlocks The number of blocks | 	/// \param uMaxBlocks The number of blocks | ||||||
| 	//////////////////////////////////////////////////////////////////////////////// | 	//////////////////////////////////////////////////////////////////////////////// | ||||||
| 	template <typename VoxelType> | 	template <typename VoxelType> | ||||||
| 	void LargeVolume<VoxelType>::setMaxNumberOfBlocksInMemory(uint16_t uMaxNumberOfBlocksInMemory) | 	void LargeVolume<VoxelType>::setMaxNumberOfBlocksInMemory(uint32_t uMaxNumberOfBlocksInMemory) | ||||||
| 	{ | 	{ | ||||||
| 		if(m_pBlocks.size() > uMaxNumberOfBlocksInMemory) | 		if(m_pBlocks.size() > uMaxNumberOfBlocksInMemory) | ||||||
| 		{ | 		{ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user