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

Avoid setting the sampler position every iteration.

Browse Source
This commit is contained in:
David Williams 2015-05-23 17:45:16 +02:00
parent 5b84c5a9a5
commit cee15a145f
1 changed files with 184 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/PolyVox/MarchingCubesSurfaceExtractor.inl
View File

@ -81,12 +81,12 @@ namespace PolyVox
{ {
const uint32_t uYRegSpace = iYVolSpace - m_regSizeInVoxels.getLowerY(); const uint32_t uYRegSpace = iYVolSpace - m_regSizeInVoxels.getLowerY();
m_sampVolume.setPosition(m_regSizeInVoxels.getLowerX(), iYVolSpace, iZVolSpace);
for (int32_t iXVolSpace = m_regSizeInVoxels.getLowerX(); iXVolSpace <= m_regSizeInVoxels.getUpperX(); iXVolSpace++) for (int32_t iXVolSpace = m_regSizeInVoxels.getLowerX(); iXVolSpace <= m_regSizeInVoxels.getUpperX(); iXVolSpace++)
{ {
const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX(); const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX();
m_sampVolume.setPosition(iXVolSpace, iYVolSpace, iZVolSpace);
typename VolumeType::VoxelType v000; typename VolumeType::VoxelType v000;
typename VolumeType::VoxelType v100; typename VolumeType::VoxelType v100;
typename VolumeType::VoxelType v010; typename VolumeType::VoxelType v010;
@ -286,10 +286,8 @@ namespace PolyVox
} }
/* Cube is entirely in/out of the surface */ /* Cube is entirely in/out of the surface */
if (edgeTable[iCubeIndex] == 0) if (edgeTable[iCubeIndex] != 0)
{ {
continue;
}
// These three might not have been sampled, as v111 is the only one we sample every iteration. // These three might not have been sampled, as v111 is the only one we sample every iteration.
v110 = m_sampVolume.peekVoxel0px0py1nz(); v110 = m_sampVolume.peekVoxel0px0py1nz();
@ -400,20 +398,16 @@ namespace PolyVox
// Now output the indices. For the first row, column or slice there aren't // Now output the indices. For the first row, column or slice there aren't
// any (the region size in cells is one less than the region size in voxels) // any (the region size in cells is one less than the region size in voxels)
if ((!isPrevXAvail) || (!isPrevYAvail) || (!isPrevZAvail)) if ((isPrevXAvail) && (isPrevYAvail) && (isPrevZAvail))
{ {
continue;
}
int32_t indlist[12]; int32_t indlist[12];
m_sampVolume.setPosition(iXVolSpace, iYVolSpace, iZVolSpace); m_sampVolume.setPosition(iXVolSpace, iYVolSpace, iZVolSpace);
/* Cube is entirely in/out of the surface */ /* Cube is entirely in/out of the surface */
if (edgeTable[iCubeIndex] == 0) if (edgeTable[iCubeIndex] != 0)
{ {
continue;
}
/* Find the vertices where the surface intersects the cube */ /* Find the vertices where the surface intersects the cube */
if (edgeTable[iCubeIndex] & 1) if (edgeTable[iCubeIndex] & 1)
@ -476,7 +470,11 @@ namespace PolyVox
m_meshCurrent->addTriangle(ind0, ind1, ind2); m_meshCurrent->addTriangle(ind0, ind1, ind2);
} }
}//For each triangle }//For each triangle
}
}
}//For each cell }//For each cell
m_sampVolume.movePositiveX();
}
} }
pPreviousBitmask.swap(pCurrentBitmask); pPreviousBitmask.swap(pCurrentBitmask);