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

Moved VolumeSampler into Volume class.

Browse Source
This commit is contained in:
David Williams
2011-04-28 20:30:16 +01:00
parent 7d76a1bb69
commit 6f1ddb7d5f
23 changed files with 164 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/PolyVoxUtil/include/Serialization.inl
View File

@ -22,7 +22,6 @@ freely, subject to the following restrictions:
*******************************************************************************/
#include "Volume.h"
#include "VolumeSampler.h"
#include "PolyVoxImpl/Utility.h"
namespace PolyVox
@ -99,7 +98,7 @@ namespace PolyVox
stream.write(reinterpret_cast<char*>(&volumeDepthPower), sizeof(volumeDepthPower));
//Write data
VolumeSampler<VoxelType> volIter(&volume);
Volume<VoxelType>::VolumeSampler volIter(&volume);
for(uint16_t z = 0; z < volumeDepth; ++z)
{
//Update progress once per slice.
@ -213,7 +212,7 @@ namespace PolyVox
stream.write(reinterpret_cast<char*>(&volumeDepthPower), sizeof(volumeDepthPower));
//Write data
VolumeSampler<VoxelType> volIter(&volume);
Volume<VoxelType>::VolumeSampler volIter(&volume);
VoxelType current;
uint32_t runLength = 0;
bool firstTime = true;
@ -381,7 +380,7 @@ namespace PolyVox
stream.write(reinterpret_cast<char*>(&volumeDepth), sizeof(volumeDepth));
//Write data
VolumeSampler<VoxelType> volIter(&volume);
Volume<VoxelType>::VolumeSampler volIter(&volume);
VoxelType current;
uint32_t runLength = 0;
bool firstTime = true;

1
library/PolyVoxUtil/include/VolumeChangeTracker.inl
View File

@ -30,7 +30,6 @@ freely, subject to the following restrictions:
#include "PolyVoxImpl/Utility.h"
#include "Vector.h"
#include "Volume.h"
#include "VolumeSampler.h"
namespace PolyVox
{