Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

This commit is contained in:
David Williams
2012-04-09 11:01:02 +02:00
84 changed files with 1086 additions and 873 deletions

View File

@ -57,7 +57,7 @@ namespace PolyVox
:BaseVolume<VoxelType>(regValid)
{
//Create a volume of the right size.
resize(regValid,uBlockSideLength);
initialise(regValid,uBlockSideLength);
}
////////////////////////////////////////////////////////////////////////////////
@ -174,7 +174,7 @@ namespace PolyVox
/// This function should probably be made internal...
////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType>
void SimpleVolume<VoxelType>::resize(const Region& regValidRegion, uint16_t uBlockSideLength)
void SimpleVolume<VoxelType>::initialise(const Region& regValidRegion, uint16_t uBlockSideLength)
{
//Debug mode validation
assert(uBlockSideLength >= 8);