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

Work on volume unit test.

Browse Source
This commit is contained in:
Daviw Williams
2012-12-07 13:54:00 +01:00
parent d0c9b7ba3d
commit e7e1f80e74
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/testvolume.cpp
View File

@ -90,7 +90,7 @@ int32_t complexVolumeTest(void)
} }
//Test the sampler setPosition //Test the sampler setPosition
/*VolumeType::Sampler sampler(&testVolume); VolumeType::Sampler sampler(&testVolume);
sampler.setWrapMode(WrapModes::Border, 1); sampler.setWrapMode(WrapModes::Border, 1);
for(int z = testVolume.getEnclosingRegion().getLowerZ() - 2; z <= testVolume.getEnclosingRegion().getUpperZ() + 1; z++) for(int z = testVolume.getEnclosingRegion().getLowerZ() - 2; z <= testVolume.getEnclosingRegion().getUpperZ() + 1; z++)
@ -103,35 +103,26 @@ int32_t complexVolumeTest(void)
result += sampler.getVoxel(); result += sampler.getVoxel();
} }
} }
}*/ }
//Test the sampler move functions //Test the sampler move functions
typename VolumeType::Sampler xSampler(&testVolume); typename VolumeType::Sampler xSampler(&testVolume);
typename VolumeType::Sampler ySampler(&testVolume); typename VolumeType::Sampler ySampler(&testVolume);
typename VolumeType::Sampler zSampler(&testVolume); typename VolumeType::Sampler zSampler(&testVolume);
typename VolumeType::Sampler sampler(&testVolume);
xSampler.setWrapMode(WrapModes::Border, 1); xSampler.setWrapMode(WrapModes::Border, 1);
ySampler.setWrapMode(WrapModes::Border, 1); ySampler.setWrapMode(WrapModes::Clamp, 1);
zSampler.setWrapMode(WrapModes::Border, 1); zSampler.setWrapMode(WrapModes::Border, -3);
sampler.setWrapMode(WrapModes::Border, 1);
zSampler.setPosition(testVolume.getEnclosingRegion().getLowerX() - 4, testVolume.getEnclosingRegion().getLowerY() - 1, testVolume.getEnclosingRegion().getLowerZ() - 2); zSampler.setPosition(testVolume.getEnclosingRegion().getLowerX() - 4, testVolume.getEnclosingRegion().getLowerY() - 1, testVolume.getEnclosingRegion().getLowerZ() - 2);
for(int z = testVolume.getEnclosingRegion().getLowerZ() - 2; z <= testVolume.getEnclosingRegion().getUpperZ() + 1; z++) for(int z = testVolume.getEnclosingRegion().getLowerZ() - 2; z <= testVolume.getEnclosingRegion().getUpperZ() + 1; z++)
{ {
ySampler = zSampler; ySampler = zSampler;
//ySampler.setPosition(testVolume.getEnclosingRegion().getLowerX() - 4, testVolume.getEnclosingRegion().getLowerY() - 1, z);
for(int y = testVolume.getEnclosingRegion().getLowerY() - 1; y <= testVolume.getEnclosingRegion().getUpperY() + 3; y++) for(int y = testVolume.getEnclosingRegion().getLowerY() - 1; y <= testVolume.getEnclosingRegion().getUpperY() + 3; y++)
{ {
xSampler = ySampler; xSampler = ySampler;
for(int x = testVolume.getEnclosingRegion().getLowerX() - 4; x <= testVolume.getEnclosingRegion().getUpperX() + 2; x++) for(int x = testVolume.getEnclosingRegion().getLowerX() - 4; x <= testVolume.getEnclosingRegion().getUpperX() + 2; x++)
{ {
sampler.setPosition(x,y,z);
int32_t sample = sampler.isCurrentPositionValid();
int32_t xSample = xSampler.isCurrentPositionValid();
assert(sample == xSample);
result += xSampler.getVoxel(); result += xSampler.getVoxel();
xSampler.movePositiveX(); xSampler.movePositiveX();
} }
@ -146,19 +137,19 @@ int32_t complexVolumeTest(void)
void TestVolume::testLargeVolume() void TestVolume::testLargeVolume()
{ {
int32_t result = complexVolumeTest< LargeVolume<int32_t> >(); int32_t result = complexVolumeTest< LargeVolume<int32_t> >();
QCOMPARE(result, static_cast<int32_t>(818107008)); QCOMPARE(result, static_cast<int32_t>(1018940544));
} }
void TestVolume::testRawVolume() void TestVolume::testRawVolume()
{ {
int32_t result = complexVolumeTest< RawVolume<int32_t> >(); int32_t result = complexVolumeTest< RawVolume<int32_t> >();
QCOMPARE(result, static_cast<int32_t>(818107008)); QCOMPARE(result, static_cast<int32_t>(1018940544));
} }
void TestVolume::testSimpleVolume() void TestVolume::testSimpleVolume()
{ {
int32_t result = complexVolumeTest< SimpleVolume<int32_t> >(); int32_t result = complexVolumeTest< SimpleVolume<int32_t> >();
QCOMPARE(result, static_cast<int32_t>(818107008)); QCOMPARE(result, static_cast<int32_t>(1018940544));
} }
QTEST_MAIN(TestVolume) QTEST_MAIN(TestVolume)