Renamed VolumeIterator to BlockVolumeIterator
This commit is contained in:
@ -7,7 +7,7 @@
|
||||
#include "Region.h"
|
||||
#include "RegionGeometry.h"
|
||||
#include "VolumeChangeTracker.h"
|
||||
#include "VolumeIterator.h"
|
||||
#include "BlockVolumeIterator.h"
|
||||
|
||||
using namespace boost;
|
||||
|
||||
@ -52,7 +52,7 @@ namespace PolyVox
|
||||
|
||||
Vector3DFloat vertlist[12];
|
||||
uint8_t vertMaterials[12];
|
||||
VolumeIterator<boost::uint8_t> volIter(*volumeData);
|
||||
BlockVolumeIterator<boost::uint8_t> volIter(*volumeData);
|
||||
volIter.setValidRegion(region);
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
@ -363,7 +363,7 @@ namespace PolyVox
|
||||
|
||||
Vector3DFloat result;
|
||||
|
||||
VolumeIterator<boost::uint8_t> volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create?
|
||||
BlockVolumeIterator<boost::uint8_t> volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create?
|
||||
|
||||
|
||||
if(normalGenerationMethod == SOBEL)
|
||||
@ -450,7 +450,7 @@ namespace PolyVox
|
||||
|
||||
Vector3DFloat vertlist[12];
|
||||
uint8_t vertMaterials[12];
|
||||
VolumeIterator<boost::uint8_t> volIter(*volumeData);
|
||||
BlockVolumeIterator<boost::uint8_t> volIter(*volumeData);
|
||||
volIter.setValidRegion(region);
|
||||
|
||||
const float threshold = 0.5f;
|
||||
@ -468,7 +468,7 @@ namespace PolyVox
|
||||
const uint16_t z = volIter.getPosZ();
|
||||
|
||||
//Voxels values
|
||||
VolumeIterator<boost::uint8_t> tempVolIter(*volumeData);
|
||||
BlockVolumeIterator<boost::uint8_t> tempVolIter(*volumeData);
|
||||
tempVolIter.setPosition(x,y,z);
|
||||
const float v000 = tempVolIter.getAveragedVoxel(1);
|
||||
tempVolIter.setPosition(x+1,y,z);
|
||||
@ -765,7 +765,7 @@ namespace PolyVox
|
||||
|
||||
Vector3DFloat result;
|
||||
|
||||
VolumeIterator<boost::uint8_t> volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create?
|
||||
BlockVolumeIterator<boost::uint8_t> volIter(*volumeData); //FIXME - save this somewhere - could be expensive to create?
|
||||
|
||||
|
||||
if(normalGenerationMethod == SOBEL)
|
||||
|
@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#include "Utility.h"
|
||||
#include "Vector.h"
|
||||
#include "BlockVolume.h"
|
||||
#include "VolumeIterator.h"
|
||||
#include "BlockVolumeIterator.h"
|
||||
|
||||
using namespace boost;
|
||||
|
||||
@ -124,7 +124,7 @@ namespace PolyVox
|
||||
assert(uY < volumeData->getSideLength());
|
||||
assert(uZ < volumeData->getSideLength());
|
||||
|
||||
VolumeIterator<boost::uint8_t> volIter(*volumeData);
|
||||
BlockVolumeIterator<boost::uint8_t> volIter(*volumeData);
|
||||
volIter.setPosition(uX,uY,uZ);
|
||||
return volIter.getVoxel();
|
||||
}
|
||||
@ -137,7 +137,7 @@ namespace PolyVox
|
||||
void VolumeChangeTracker::setVoxelAt(boost::uint16_t x, boost::uint16_t y, boost::uint16_t z, boost::uint8_t value)
|
||||
{
|
||||
//FIXME - rather than creating a iterator each time we should have one stored
|
||||
VolumeIterator<boost::uint8_t> iterVol(*volumeData);
|
||||
BlockVolumeIterator<boost::uint8_t> iterVol(*volumeData);
|
||||
iterVol.setPosition(x,y,z);
|
||||
iterVol.setVoxel(value);
|
||||
|
||||
@ -183,7 +183,7 @@ namespace PolyVox
|
||||
assert(m_bIsLocked);
|
||||
|
||||
//FIXME - rather than creating a iterator each time we should have one stored
|
||||
VolumeIterator<boost::uint8_t> iterVol(*volumeData);
|
||||
BlockVolumeIterator<boost::uint8_t> iterVol(*volumeData);
|
||||
iterVol.setPosition(x,y,z);
|
||||
iterVol.setVoxel(value);
|
||||
}
|
||||
|
Reference in New Issue
Block a user