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

Replaced separate arrays with arrays of vectors.

Browse Source
This commit is contained in:
David Williams 2015-05-27 22:55:36 +02:00
parent baf5cf2cab
commit ccedb0e294
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/PolyVox/MarchingCubesSurfaceExtractor.inl
View File

@ -63,9 +63,8 @@ namespace PolyVox
const uint32_t uArrayDepth = region.getUpperZ() - region.getLowerZ() + 2; const uint32_t uArrayDepth = region.getUpperZ() - region.getLowerZ() + 2;
// No need to clear memory because we only read from elements we have written to. // No need to clear memory because we only read from elements we have written to.
Array3DInt32 pIndicesX(uArrayWidth, uArrayHeight, uArrayDepth); Array<2, Vector3DInt32> pIndices(uArrayWidth, uArrayHeight);
Array3DInt32 pIndicesY(uArrayWidth, uArrayHeight, uArrayDepth); Array<2, Vector3DInt32> pPreviousIndices(uArrayWidth, uArrayHeight);
Array3DInt32 pIndicesZ(uArrayWidth, uArrayHeight, uArrayDepth);
Array2DUint8 pPreviousSliceBitmask(uArrayWidth, uArrayHeight); Array2DUint8 pPreviousSliceBitmask(uArrayWidth, uArrayHeight);
Array1DUint8 pPreviousRowBitmask(uArrayWidth); Array1DUint8 pPreviousRowBitmask(uArrayWidth);
@ -163,7 +162,7 @@ namespace PolyVox
surfaceVertex.data = uMaterial; surfaceVertex.data = uMaterial;
const uint32_t uLastVertexIndex = result->addVertex(surfaceVertex); const uint32_t uLastVertexIndex = result->addVertex(surfaceVertex);
pIndicesX(uXRegSpace, uYRegSpace, uZRegSpace) = uLastVertexIndex; pIndices(uXRegSpace, uYRegSpace).setX(uLastVertexIndex);
sampler.movePositiveX(); sampler.movePositiveX();
} }
@ -198,7 +197,7 @@ namespace PolyVox
surfaceVertex.data = uMaterial; surfaceVertex.data = uMaterial;
uint32_t uLastVertexIndex = result->addVertex(surfaceVertex); uint32_t uLastVertexIndex = result->addVertex(surfaceVertex);
pIndicesY(uXRegSpace, uYRegSpace, uZRegSpace) = uLastVertexIndex; pIndices(uXRegSpace, uYRegSpace).setY(uLastVertexIndex);
sampler.movePositiveY(); sampler.movePositiveY();
} }
@ -233,7 +232,7 @@ namespace PolyVox
surfaceVertex.data = uMaterial; surfaceVertex.data = uMaterial;
const uint32_t uLastVertexIndex = result->addVertex(surfaceVertex); const uint32_t uLastVertexIndex = result->addVertex(surfaceVertex);
pIndicesZ(uXRegSpace, uYRegSpace, uZRegSpace) = uLastVertexIndex; pIndices(uXRegSpace, uYRegSpace).setZ(uLastVertexIndex);
sampler.movePositiveZ(); sampler.movePositiveZ();
} }
@ -254,51 +253,51 @@ namespace PolyVox
/* 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)
{ {
indlist[0] = pIndicesX(uXRegSpace, uYRegSpace - 1, uZRegSpace - 1); indlist[0] = pPreviousIndices(uXRegSpace, uYRegSpace - 1).getX();
} }
if (edgeTable[iCubeIndex] & 2) if (edgeTable[iCubeIndex] & 2)
{ {
indlist[1] = pIndicesY(uXRegSpace, uYRegSpace, uZRegSpace - 1); indlist[1] = pPreviousIndices(uXRegSpace, uYRegSpace).getY();
} }
if (edgeTable[iCubeIndex] & 4) if (edgeTable[iCubeIndex] & 4)
{ {
indlist[2] = pIndicesX(uXRegSpace, uYRegSpace, uZRegSpace - 1); indlist[2] = pPreviousIndices(uXRegSpace, uYRegSpace).getX();
} }
if (edgeTable[iCubeIndex] & 8) if (edgeTable[iCubeIndex] & 8)
{ {
indlist[3] = pIndicesY(uXRegSpace - 1, uYRegSpace, uZRegSpace - 1); indlist[3] = pPreviousIndices(uXRegSpace - 1, uYRegSpace).getY();
} }
if (edgeTable[iCubeIndex] & 16) if (edgeTable[iCubeIndex] & 16)
{ {
indlist[4] = pIndicesX(uXRegSpace, uYRegSpace - 1, uZRegSpace); indlist[4] = pIndices(uXRegSpace, uYRegSpace - 1).getX();
} }
if (edgeTable[iCubeIndex] & 32) if (edgeTable[iCubeIndex] & 32)
{ {
indlist[5] = pIndicesY(uXRegSpace, uYRegSpace, uZRegSpace); indlist[5] = pIndices(uXRegSpace, uYRegSpace).getY();
} }
if (edgeTable[iCubeIndex] & 64) if (edgeTable[iCubeIndex] & 64)
{ {
indlist[6] = pIndicesX(uXRegSpace, uYRegSpace, uZRegSpace); indlist[6] = pIndices(uXRegSpace, uYRegSpace).getX();
} }
if (edgeTable[iCubeIndex] & 128) if (edgeTable[iCubeIndex] & 128)
{ {
indlist[7] = pIndicesY(uXRegSpace - 1, uYRegSpace, uZRegSpace); indlist[7] = pIndices(uXRegSpace - 1, uYRegSpace).getY();
} }
if (edgeTable[iCubeIndex] & 256) if (edgeTable[iCubeIndex] & 256)
{ {
indlist[8] = pIndicesZ(uXRegSpace - 1, uYRegSpace - 1, uZRegSpace); indlist[8] = pIndices(uXRegSpace - 1, uYRegSpace - 1).getZ();
} }
if (edgeTable[iCubeIndex] & 512) if (edgeTable[iCubeIndex] & 512)
{ {
indlist[9] = pIndicesZ(uXRegSpace, uYRegSpace - 1, uZRegSpace); indlist[9] = pIndices(uXRegSpace, uYRegSpace - 1).getZ();
} }
if (edgeTable[iCubeIndex] & 1024) if (edgeTable[iCubeIndex] & 1024)
{ {
indlist[10] = pIndicesZ(uXRegSpace, uYRegSpace, uZRegSpace); indlist[10] = pIndices(uXRegSpace, uYRegSpace).getZ();
} }
if (edgeTable[iCubeIndex] & 2048) if (edgeTable[iCubeIndex] & 2048)
{ {
indlist[11] = pIndicesZ(uXRegSpace - 1, uYRegSpace, uZRegSpace); indlist[11] = pIndices(uXRegSpace - 1, uYRegSpace).getZ();
} }
for (int i = 0; triTable[iCubeIndex][i] != -1; i += 3) for (int i = 0; triTable[iCubeIndex][i] != -1; i += 3)
@ -320,6 +319,8 @@ namespace PolyVox
startOfRow.movePositiveY(); startOfRow.movePositiveY();
} // For Y } // For Y
startOfSlice.movePositiveZ(); startOfSlice.movePositiveZ();
pIndices.swap(pPreviousIndices);
} // For Z } // For Z
result->setOffset(region.getLowerCorner()); result->setOffset(region.getLowerCorner());