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

Doing some tidying in the Block class.

Browse Source
This commit is contained in:
Daviw Williams
2013-06-25 16:20:58 +02:00
parent 59505d47e9
commit c346d19d77
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
View File

@ -37,17 +37,6 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
class Block class Block
{ {
template <typename LengthType>
struct RunlengthEntry
{
LengthType length;
VoxelType value;
//We can parametise the length on anything up to uint32_t.
//This lets us experiment with the optimal size in the future.
static uint32_t maxRunlength(void) {return (std::numeric_limits<LengthType>::max)();}
};
public: public:
Block(uint16_t uSideLength = 0); Block(uint16_t uSideLength = 0);

41
library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
View File

@ -45,10 +45,25 @@ namespace PolyVox
,m_bIsCompressed(false) ,m_bIsCompressed(false)
,m_bIsUncompressedDataModified(true) ,m_bIsUncompressedDataModified(true)
{ {
if(uSideLength != 0) if(uSideLength == 0)
{ {
initialise(uSideLength); POLYVOX_THROW(std::invalid_argument, "Block side cannot be zero.");
} }
if(!isPowerOf2(uSideLength))
{
POLYVOX_THROW(std::invalid_argument, "Block side length must be a power of two.");
}
//Compute the side length
m_uSideLength = uSideLength;
m_uSideLengthPower = logBase2(uSideLength);
//Create the block data
const uint32_t uNoOfVoxels = m_uSideLength * m_uSideLength * m_uSideLength;
m_tUncompressedData = new VoxelType[uNoOfVoxels];
std::fill(m_tUncompressedData, m_tUncompressedData + uNoOfVoxels, VoxelType());
m_bIsUncompressedDataModified = true;
} }
template <typename VoxelType> template <typename VoxelType>
@ -145,28 +160,6 @@ namespace PolyVox
setVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ(), tValue); setVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ(), tValue);
} }
template <typename VoxelType>
void Block<VoxelType>::initialise(uint16_t uSideLength)
{
//Release mode validation
if(!isPowerOf2(uSideLength))
{
POLYVOX_THROW(std::invalid_argument, "Block side length must be a power of two.");
}
//Compute the side length
m_uSideLength = uSideLength;
m_uSideLengthPower = logBase2(uSideLength);
//Create the block data
m_tUncompressedData = new VoxelType[m_uSideLength * m_uSideLength * m_uSideLength];
//Clear it (should we bother?)
const uint32_t uNoOfVoxels = m_uSideLength * m_uSideLength * m_uSideLength;
std::fill(m_tUncompressedData, m_tUncompressedData + uNoOfVoxels, VoxelType());
m_bIsUncompressedDataModified = true;
}
template <typename VoxelType> template <typename VoxelType>
uint32_t Block<VoxelType>::calculateSizeInBytes(void) uint32_t Block<VoxelType>::calculateSizeInBytes(void)
{ {