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

Made Block copy constructor private.

Browse Source
This commit is contained in:
David Williams
2011-02-09 22:21:44 +00:00
parent b1eab6c6a3
commit 7f831fb97a
4 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
library/PolyVoxCore/include/PolyVoxImpl/Block.inl
View File

@@ -50,7 +50,7 @@ namespace PolyVox
template <typename VoxelType>
Block<VoxelType>::Block(const Block<VoxelType>& rhs)
{
*this = rhs;
assert(false);
}
template <typename VoxelType>
@@ -63,33 +63,8 @@ namespace PolyVox
template <typename VoxelType>
Block<VoxelType>& Block<VoxelType>::operator=(const Block<VoxelType>& rhs)
{
//We don't often need to assign blocks as they should be passed around by pointer.
//And I'm pretty sure we don't want to be passing around uncompressed ones becauses
//it means duplicating the uncompressed data which is expensive. This assert is to
//make sure that uncompressed blocks don't get assigned by accident.
assert(rhs.m_bIsCompressed == true);
if (this == &rhs)
{
return *this;
}
//Copy the data
m_uSideLength = rhs.m_uSideLength;
m_uSideLengthPower = rhs.m_uSideLengthPower;
m_bIsCompressed = rhs.m_bIsCompressed;
m_bIsUncompressedDataModified = rhs.m_bIsUncompressedDataModified;
m_uTimestamp = rhs.m_uTimestamp;
runlengths = rhs.runlengths;
values = rhs.values;
if(m_bIsCompressed == false)
{
m_tUncompressedData = new VoxelType[rhs.m_uSideLength * rhs.m_uSideLength * rhs.m_uSideLength];
memcpy(m_tUncompressedData, rhs.m_tUncompressedData, m_uSideLength * m_uSideLength * m_uSideLength * sizeof(VoxelType));
}
return *this;
assert(false);
return 0;
}
template <typename VoxelType>
@@ -194,7 +169,7 @@ namespace PolyVox
template <typename VoxelType>
uint32_t Block<VoxelType>::sizeInChars(void)
{
uint32_t uSizeInChars = sizeof(Block<VoxelType>);
uint32_t uSizeInChars = 0; //sizeof(Block<VoxelType>);
if(m_tUncompressedData != 0)
{
@@ -202,6 +177,9 @@ namespace PolyVox
uSizeInChars += uNoOfVoxels * sizeof(VoxelType);
}
uSizeInChars += values.size() * sizeof(VoxelType);
uSizeInChars += runlengths.size() * sizeof(uint16_t);
return uSizeInChars;
}