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

Removed unneeded conditions.

Browse Source
This commit is contained in:
David Williams 2015-05-25 16:39:30 +02:00
parent ecc06ba986
commit b353cd1ce8
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/PolyVox/MarchingCubesSurfaceExtractor.inl
View File

@ -96,31 +96,20 @@ namespace PolyVox
const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX(); const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX();
uint8_t iCubeIndex = 0; uint8_t iCubeIndex = 0;
uint8_t iPreviousCubeIndexX = 0;
if (uXRegSpace != 0) // Previous X is available uint8_t iPreviousCubeIndexX = uPreviousCell;
{
iPreviousCubeIndexX = uPreviousCell;
iPreviousCubeIndexX &= 170; //170 = 128+32+8+2 iPreviousCubeIndexX &= 170; //170 = 128+32+8+2
iPreviousCubeIndexX >>= 1; iPreviousCubeIndexX >>= 1;
iCubeIndex |= iPreviousCubeIndexX; iCubeIndex |= iPreviousCubeIndexX;
}
uint8_t iPreviousCubeIndexY = 0; uint8_t iPreviousCubeIndexY = pPreviousRowBitmask(uXRegSpace);
if (uYRegSpace != 0) // Previous Y is available
{
iPreviousCubeIndexY = pPreviousRowBitmask(uXRegSpace);
iPreviousCubeIndexY &= 204; //204 = 128+64+8+4 iPreviousCubeIndexY &= 204; //204 = 128+64+8+4
iPreviousCubeIndexY >>= 2; iPreviousCubeIndexY >>= 2;
iCubeIndex |= iPreviousCubeIndexY; iCubeIndex |= iPreviousCubeIndexY;
}
uint8_t iPreviousCubeIndexZ = 0; uint8_t iPreviousCubeIndexZ = pPreviousSliceBitmask(uXRegSpace, uYRegSpace);
if (uZRegSpace != 0) // Previous Z is available
{
iPreviousCubeIndexZ = pPreviousSliceBitmask(uXRegSpace, uYRegSpace);
iPreviousCubeIndexZ >>= 4; iPreviousCubeIndexZ >>= 4;
iCubeIndex |= iPreviousCubeIndexZ; iCubeIndex |= iPreviousCubeIndexZ;
}
typename VolumeType::VoxelType v111 = sampler.peekVoxel0px0py0pz(); typename VolumeType::VoxelType v111 = sampler.peekVoxel0px0py0pz();
if (m_controller.convertToDensity(v111) < m_tThreshold) iCubeIndex |= 128; if (m_controller.convertToDensity(v111) < m_tThreshold) iCubeIndex |= 128;