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

Tidying up.

Browse Source
This commit is contained in:
David Williams 2015-05-24 21:01:01 +02:00
parent eb3727de30
commit 69349d95cd
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/PolyVox/MarchingCubesSurfaceExtractor.inl
View File

@ -87,22 +87,15 @@ namespace PolyVox
{ {
const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX(); const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX();
uint8_t iCubeIndex = 0;
typename VolumeType::VoxelType v111 = m_sampVolume.peekVoxel0px0py0pz();
uint8_t iPreviousCubeIndexX = 0; uint8_t iPreviousCubeIndexX = 0;
uint8_t iPreviousCubeIndexY = 0;
uint8_t iPreviousCubeIndexZ = 0;
if (uXRegSpace != 0) // Previous X is available if (uXRegSpace != 0) // Previous X is available
{ {
//x
iPreviousCubeIndexX = pCurrentBitmask(uXRegSpace - 1, uYRegSpace); iPreviousCubeIndexX = pCurrentBitmask(uXRegSpace - 1, uYRegSpace);
iPreviousCubeIndexX &= 170; //170 = 128+32+8+2 iPreviousCubeIndexX &= 170; //170 = 128+32+8+2
iPreviousCubeIndexX >>= 1; iPreviousCubeIndexX >>= 1;
} }
uint8_t iPreviousCubeIndexY = 0;
if (uYRegSpace != 0) // Previous Y is available if (uYRegSpace != 0) // Previous Y is available
{ {
iPreviousCubeIndexY = pCurrentBitmask(uXRegSpace, uYRegSpace - 1); iPreviousCubeIndexY = pCurrentBitmask(uXRegSpace, uYRegSpace - 1);
@ -110,14 +103,16 @@ namespace PolyVox
iPreviousCubeIndexY >>= 2; iPreviousCubeIndexY >>= 2;
} }
uint8_t iPreviousCubeIndexZ = 0;
if (uZRegSpace != 0) // Previous Z is available if (uZRegSpace != 0) // Previous Z is available
{ {
iPreviousCubeIndexZ = pPreviousBitmask(uXRegSpace, uYRegSpace); iPreviousCubeIndexZ = pPreviousBitmask(uXRegSpace, uYRegSpace);
iPreviousCubeIndexZ >>= 4; iPreviousCubeIndexZ >>= 4;
} }
uint8_t iCubeIndex = iPreviousCubeIndexX | iPreviousCubeIndexY | iPreviousCubeIndexZ;
iCubeIndex = iPreviousCubeIndexX | iPreviousCubeIndexY | iPreviousCubeIndexZ; typename VolumeType::VoxelType v111 = m_sampVolume.peekVoxel0px0py0pz();
if (m_controller.convertToDensity(v111) < m_tThreshold) iCubeIndex |= 128; if (m_controller.convertToDensity(v111) < m_tThreshold) iCubeIndex |= 128;
if (iCubeIndex != 0) if (iCubeIndex != 0)