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

Replaced 2D pPreviousBitmask and pCurrentBitmask with 3D pBitmask.

Browse Source
This commit is contained in:
David Williams 2015-05-14 07:15:36 +02:00
parent 2b22213bec
commit c4ce66dec5
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/PolyVox/MarchingCubesSurfaceExtractor.h
View File

@ -160,14 +160,10 @@ namespace PolyVox
private: private:
//Compute the cell bitmask for a particular slice in z. //Compute the cell bitmask for a particular slice in z.
template<bool isPrevZAvail> template<bool isPrevZAvail>
uint32_t computeBitmaskForSlice(const Array2DUint8& pPreviousBitmask, Array2DUint8& pCurrentBitmask); uint32_t computeBitmaskForSlice(Array3DUint8& pBitmask);
//Compute the cell bitmask for a given cell.
template<bool isPrevXAvail, bool isPrevYAvail, bool isPrevZAvail>
void computeBitmaskForCell(const Array2DUint8& pPreviousBitmask, Array2DUint8& pCurrentBitmask, uint32_t uXRegSpace, uint32_t uYRegSpace);
//Use the cell bitmasks to generate all the vertices needed for that slice //Use the cell bitmasks to generate all the vertices needed for that slice
void generateVerticesForSlice(const Array2DUint8& pCurrentBitmask, void generateVerticesForSlice(const Array3DUint8& pBitmask,
Array3DInt32& pIndicesX, Array3DInt32& pIndicesX,
Array3DInt32& pIndicesY, Array3DInt32& pIndicesY,
Array3DInt32& pIndicesZ); Array3DInt32& pIndicesZ);
@ -287,7 +283,7 @@ namespace PolyVox
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
//Use the cell bitmasks to generate all the indices needed for that slice //Use the cell bitmasks to generate all the indices needed for that slice
void generateIndicesForSlice(const Array2DUint8& pPreviousBitmask, void generateIndicesForSlice(const Array3DUint8& pBitmask,
const Array3DInt32& pIndicesX, const Array3DInt32& pIndicesX,
const Array3DInt32& pIndicesY, const Array3DInt32& pIndicesY,
const Array3DInt32& pIndicesZ); const Array3DInt32& pIndicesZ);

39
include/PolyVox/MarchingCubesSurfaceExtractor.inl
View File

@ -48,7 +48,7 @@ namespace PolyVox
const uint32_t uArrayWidth = m_regSizeInVoxels.getUpperX() - m_regSizeInVoxels.getLowerX() + 1; const uint32_t uArrayWidth = m_regSizeInVoxels.getUpperX() - m_regSizeInVoxels.getLowerX() + 1;
const uint32_t uArrayHeight = m_regSizeInVoxels.getUpperY() - m_regSizeInVoxels.getLowerY() + 1; const uint32_t uArrayHeight = m_regSizeInVoxels.getUpperY() - m_regSizeInVoxels.getLowerY() + 1;
const uint32_t uArrayDepth = m_regSizeInVoxels.getUpperY() - m_regSizeInVoxels.getLowerZ() + 1; const uint32_t uArrayDepth = m_regSizeInVoxels.getUpperZ() - m_regSizeInVoxels.getLowerZ() + 1;
//For edge indices //For edge indices
//Array3DInt32 m_pPreviousVertexIndicesX(uArrayWidth, uArrayHeight, uArrayDepth); //Array3DInt32 m_pPreviousVertexIndicesX(uArrayWidth, uArrayHeight, uArrayDepth);
@ -62,8 +62,9 @@ namespace PolyVox
memset(pIndicesY.getRawData(), 0xff, pIndicesY.getNoOfElements() * 4); memset(pIndicesY.getRawData(), 0xff, pIndicesY.getNoOfElements() * 4);
memset(pIndicesZ.getRawData(), 0xff, pIndicesZ.getNoOfElements() * 4); memset(pIndicesZ.getRawData(), 0xff, pIndicesZ.getNoOfElements() * 4);
Array2DUint8 pPreviousBitmask(uArrayWidth, uArrayHeight); //Array2DUint8 pPreviousBitmask(uArrayWidth, uArrayHeight);
Array2DUint8 pCurrentBitmask(uArrayWidth, uArrayHeight); //Array2DUint8 pCurrentBitmask(uArrayWidth, uArrayHeight);
Array3DUint8 pBitmask(uArrayWidth, uArrayHeight, uArrayDepth);
//Create a region corresponding to the first slice //Create a region corresponding to the first slice
m_regSlicePrevious = m_regSizeInVoxels; m_regSlicePrevious = m_regSizeInVoxels;
@ -76,16 +77,16 @@ namespace PolyVox
uint32_t uNoOfNonEmptyCellsForSlice1 = 0; uint32_t uNoOfNonEmptyCellsForSlice1 = 0;
//Process the first slice (previous slice not available) //Process the first slice (previous slice not available)
computeBitmaskForSlice<false>(pPreviousBitmask, pCurrentBitmask); computeBitmaskForSlice<false>(pBitmask);
uNoOfNonEmptyCellsForSlice1 = m_uNoOfOccupiedCells; uNoOfNonEmptyCellsForSlice1 = m_uNoOfOccupiedCells;
if(uNoOfNonEmptyCellsForSlice1 != 0) if(uNoOfNonEmptyCellsForSlice1 != 0)
{ {
generateVerticesForSlice(pCurrentBitmask, pIndicesX, pIndicesY, pIndicesZ); generateVerticesForSlice(pBitmask, pIndicesX, pIndicesY, pIndicesZ);
} }
std::swap(uNoOfNonEmptyCellsForSlice0, uNoOfNonEmptyCellsForSlice1); std::swap(uNoOfNonEmptyCellsForSlice0, uNoOfNonEmptyCellsForSlice1);
pPreviousBitmask.swap(pCurrentBitmask); //pPreviousBitmask.swap(pCurrentBitmask);
m_regSlicePrevious = m_regSliceCurrent; m_regSlicePrevious = m_regSliceCurrent;
m_regSliceCurrent.shift(Vector3DInt32(0,0,1)); m_regSliceCurrent.shift(Vector3DInt32(0,0,1));
@ -93,21 +94,21 @@ namespace PolyVox
//Process the other slices (previous slice is available) //Process the other slices (previous slice is available)
for(int32_t uSlice = 1; uSlice <= m_regSizeInVoxels.getUpperZ() - m_regSizeInVoxels.getLowerZ(); uSlice++) for(int32_t uSlice = 1; uSlice <= m_regSizeInVoxels.getUpperZ() - m_regSizeInVoxels.getLowerZ(); uSlice++)
{ {
computeBitmaskForSlice<true>(pPreviousBitmask, pCurrentBitmask); computeBitmaskForSlice<true>(pBitmask);
uNoOfNonEmptyCellsForSlice1 = m_uNoOfOccupiedCells; uNoOfNonEmptyCellsForSlice1 = m_uNoOfOccupiedCells;
if(uNoOfNonEmptyCellsForSlice1 != 0) if(uNoOfNonEmptyCellsForSlice1 != 0)
{ {
generateVerticesForSlice(pCurrentBitmask, pIndicesX, pIndicesY, pIndicesZ); generateVerticesForSlice(pBitmask, pIndicesX, pIndicesY, pIndicesZ);
} }
if((uNoOfNonEmptyCellsForSlice0 != 0) || (uNoOfNonEmptyCellsForSlice1 != 0)) if((uNoOfNonEmptyCellsForSlice0 != 0) || (uNoOfNonEmptyCellsForSlice1 != 0))
{ {
generateIndicesForSlice(pPreviousBitmask, pIndicesX, pIndicesY, pIndicesZ); generateIndicesForSlice(pBitmask, pIndicesX, pIndicesY, pIndicesZ);
} }
std::swap(uNoOfNonEmptyCellsForSlice0, uNoOfNonEmptyCellsForSlice1); std::swap(uNoOfNonEmptyCellsForSlice0, uNoOfNonEmptyCellsForSlice1);
pPreviousBitmask.swap(pCurrentBitmask); //pPreviousBitmask.swap(pCurrentBitmask);
m_regSlicePrevious = m_regSliceCurrent; m_regSlicePrevious = m_regSliceCurrent;
m_regSliceCurrent.shift(Vector3DInt32(0,0,1)); m_regSliceCurrent.shift(Vector3DInt32(0,0,1));
@ -122,21 +123,21 @@ namespace PolyVox
template<typename VolumeType, typename MeshType, typename ControllerType> template<typename VolumeType, typename MeshType, typename ControllerType>
template<bool isPrevZAvail> template<bool isPrevZAvail>
uint32_t MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::computeBitmaskForSlice(const Array2DUint8& pPreviousBitmask, Array2DUint8& pCurrentBitmask) uint32_t MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::computeBitmaskForSlice(Array3DUint8& pBitmask)
{ {
m_uNoOfOccupiedCells = 0; m_uNoOfOccupiedCells = 0;
const int32_t iMaxXVolSpace = m_regSliceCurrent.getUpperX(); const int32_t iMaxXVolSpace = m_regSliceCurrent.getUpperX();
const int32_t iMaxYVolSpace = m_regSliceCurrent.getUpperY(); const int32_t iMaxYVolSpace = m_regSliceCurrent.getUpperY();
const int32_t iZVolSpace = m_regSliceCurrent.getLowerZ();
//Process the lower left corner //Process the lower left corner
int32_t iYVolSpace = m_regSliceCurrent.getLowerY(); int32_t iYVolSpace = m_regSliceCurrent.getLowerY();
int32_t iXVolSpace = m_regSliceCurrent.getLowerX(); int32_t iXVolSpace = m_regSliceCurrent.getLowerX();
int32_t iZVolSpace = m_regSliceCurrent.getLowerZ();
uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX(); uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX();
uint32_t uYRegSpace = iYVolSpace - m_regSizeInVoxels.getLowerY(); uint32_t uYRegSpace = iYVolSpace - m_regSizeInVoxels.getLowerY();
uint32_t uZRegSpace = iZVolSpace - m_regSizeInVoxels.getLowerZ();
//Process all remaining elemnents of the slice. In this case, previous x and y values are always available //Process all remaining elemnents of the slice. In this case, previous x and y values are always available
for(iYVolSpace = m_regSliceCurrent.getLowerY(); iYVolSpace <= iMaxYVolSpace; iYVolSpace++) for(iYVolSpace = m_regSliceCurrent.getLowerY(); iYVolSpace <= iMaxYVolSpace; iYVolSpace++)
@ -183,7 +184,7 @@ namespace PolyVox
if (m_controller.convertToDensity(v111) < m_tThreshold) iCubeIndex |= 128; if (m_controller.convertToDensity(v111) < m_tThreshold) iCubeIndex |= 128;
//Save the bitmask //Save the bitmask
pCurrentBitmask(uXRegSpace, uYRegSpace) = iCubeIndex; pBitmask(uXRegSpace, uYRegSpace, uZRegSpace) = iCubeIndex;
if (edgeTable[iCubeIndex] != 0) if (edgeTable[iCubeIndex] != 0)
{ {
@ -196,13 +197,15 @@ namespace PolyVox
} }
template<typename VolumeType, typename MeshType, typename ControllerType> template<typename VolumeType, typename MeshType, typename ControllerType>
void MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::generateVerticesForSlice(const Array2DUint8& pCurrentBitmask, void MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::generateVerticesForSlice(const Array3DUint8& pBitmask,
Array3DInt32& pIndicesX, Array3DInt32& pIndicesX,
Array3DInt32& pIndicesY, Array3DInt32& pIndicesY,
Array3DInt32& pIndicesZ) Array3DInt32& pIndicesZ)
{ {
const int32_t iZVolSpace = m_regSliceCurrent.getLowerZ(); const int32_t iZVolSpace = m_regSliceCurrent.getLowerZ();
const uint32_t uZRegSpace = iZVolSpace - m_regSizeInVoxels.getLowerZ();
//Iterate over each cell in the region //Iterate over each cell in the region
for(int32_t iYVolSpace = m_regSliceCurrent.getLowerY(); iYVolSpace <= m_regSliceCurrent.getUpperY(); iYVolSpace++) for(int32_t iYVolSpace = m_regSliceCurrent.getLowerY(); iYVolSpace <= m_regSliceCurrent.getUpperY(); iYVolSpace++)
{ {
@ -214,7 +217,7 @@ namespace PolyVox
const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX(); const uint32_t uXRegSpace = iXVolSpace - m_regSizeInVoxels.getLowerX();
//Determine the index into the edge table which tells us which vertices are inside of the surface //Determine the index into the edge table which tells us which vertices are inside of the surface
const uint8_t iCubeIndex = pCurrentBitmask(uXRegSpace, uYRegSpace); const uint8_t iCubeIndex = pBitmask(uXRegSpace, uYRegSpace, uZRegSpace);
/* Cube is entirely in/out of the surface */ /* Cube is entirely in/out of the surface */
if (edgeTable[iCubeIndex] == 0) if (edgeTable[iCubeIndex] == 0)
@ -336,7 +339,7 @@ namespace PolyVox
} }
template<typename VolumeType, typename MeshType, typename ControllerType> template<typename VolumeType, typename MeshType, typename ControllerType>
void MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::generateIndicesForSlice(const Array2DUint8& pPreviousBitmask, void MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::generateIndicesForSlice(const Array3DUint8& pBitmask,
const Array3DInt32& pIndicesX, const Array3DInt32& pIndicesX,
const Array3DInt32& pIndicesY, const Array3DInt32& pIndicesY,
const Array3DInt32& pIndicesZ) const Array3DInt32& pIndicesZ)
@ -361,7 +364,7 @@ namespace PolyVox
const uint32_t uZRegSpace = m_sampVolume.getPosition().getZ() - m_regSizeInVoxels.getLowerZ(); const uint32_t uZRegSpace = m_sampVolume.getPosition().getZ() - m_regSizeInVoxels.getLowerZ();
//Determine the index into the edge table which tells us which vertices are inside of the surface //Determine the index into the edge table which tells us which vertices are inside of the surface
const uint8_t iCubeIndex = pPreviousBitmask(uXRegSpace, uYRegSpace); const uint8_t iCubeIndex = pBitmask(uXRegSpace, uYRegSpace, uZRegSpace);
/* Cube is entirely in/out of the surface */ /* Cube is entirely in/out of the surface */
if (edgeTable[iCubeIndex] == 0) if (edgeTable[iCubeIndex] == 0)