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

Initial version of IteratorController and making LowPassFilter use iterators.

Browse Source
This commit is contained in:
David Williams 2011-08-15 21:31:52 +01:00
parent 90063354bd
commit e8b3fd16e2
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/CMakeLists.txt
View File

@ -31,6 +31,8 @@ SET(CORE_INC_FILES
include/PolyVoxCore/Density.h include/PolyVoxCore/Density.h
include/PolyVoxCore/GradientEstimators.h include/PolyVoxCore/GradientEstimators.h
include/PolyVoxCore/GradientEstimators.inl include/PolyVoxCore/GradientEstimators.inl
include/PolyVoxCore/IteratorController.h
include/PolyVoxCore/IteratorController.inl
include/PolyVoxCore/LargeVolume.h include/PolyVoxCore/LargeVolume.h
include/PolyVoxCore/LargeVolume.inl include/PolyVoxCore/LargeVolume.inl
include/PolyVoxCore/LargeVolumeSampler.inl include/PolyVoxCore/LargeVolumeSampler.inl

31
library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl
View File

@ -21,6 +21,7 @@ freely, subject to the following restrictions:
distribution. distribution.
*******************************************************************************/ *******************************************************************************/
#include "PolyVoxCore/IteratorController.h"
#include "PolyVoxCore/RawVolume.h" #include "PolyVoxCore/RawVolume.h"
namespace PolyVox namespace PolyVox
@ -139,8 +140,34 @@ namespace PolyVox
} }
} }
RawVolume<uint32_t>::Sampler satVolumeIter(&satVolume);
IteratorController<RawVolume<uint32_t>::Sampler> satIterCont;
satIterCont.m_regValid = Region(satLowerCorner, satUpperCorner);
satIterCont.m_Iter = &satVolumeIter;
satIterCont.reset();
SrcVolumeType<VoxelType>::Sampler srcVolumeIter(m_pVolSrc);
IteratorController<SrcVolumeType<VoxelType>::Sampler> srcIterCont;
srcIterCont.m_regValid = Region(satLowerCorner, satUpperCorner);
srcIterCont.m_Iter = &srcVolumeIter;
srcIterCont.reset();
do
{
uint32_t previousSum = satVolumeIter.peekVoxel1nx0py0pz();
uint32_t currentVal = srcVolumeIter.getVoxel().getDensity();
satVolumeIter.setVoxel(previousSum + currentVal);
srcIterCont.moveForward();
}while(satIterCont.moveForward());
//Build SAT in three passes //Build SAT in three passes
for(int32_t z = satLowerCorner.getZ(); z <= satUpperCorner.getZ(); z++) /*for(int32_t z = satLowerCorner.getZ(); z <= satUpperCorner.getZ(); z++)
{ {
for(int32_t y = satLowerCorner.getY(); y <= satUpperCorner.getY(); y++) for(int32_t y = satLowerCorner.getY(); y <= satUpperCorner.getY(); y++)
{ {
@ -152,7 +179,7 @@ namespace PolyVox
satVolume.setVoxelAt(x,y,z,previousSum + currentVal); satVolume.setVoxelAt(x,y,z,previousSum + currentVal);
} }
} }
} }*/
for(int32_t z = satLowerCorner.getZ(); z <= satUpperCorner.getZ(); z++) for(int32_t z = satLowerCorner.getZ(); z <= satUpperCorner.getZ(); z++)
{ {

4
tests/TestLowPassFilter.cpp
View File

@ -61,6 +61,10 @@ void TestLowPassFilter::testExecute()
LowPassFilter<RawVolume, RawVolume, Density8> pass1(&volData, reg, &resultVolume, reg, 5); LowPassFilter<RawVolume, RawVolume, Density8> pass1(&volData, reg, &resultVolume, reg, 5);
pass1.executeSAT(); pass1.executeSAT();
std::cout << "Voxel = " << static_cast<int>(resultVolume.getVoxelAt(1,2,3).getDensity()) << std::endl; // 7
std::cout << "Voxel = " << static_cast<int>(resultVolume.getVoxelAt(10,6,7).getDensity()) << std::endl; // 17
std::cout << "Voxel = " << static_cast<int>(resultVolume.getVoxelAt(15,2,12).getDensity()) << std::endl; // 4
} }
QTEST_MAIN(TestLowPassFilter) QTEST_MAIN(TestLowPassFilter)