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

Reorganizing code.

Browse Source
This commit is contained in:
David Williams 2015-05-22 16:15:53 +02:00
parent 50a8bebfa9
commit 50cf939e8a
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/PolyVox/MarchingCubesSurfaceExtractor.h
View File

@ -159,11 +159,7 @@ 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> void computeBitmaskForSlice();
void computeBitmaskForSlice(Array3DUint8& pBitmask,
Array3DInt32& pIndicesX,
Array3DInt32& pIndicesY,
Array3DInt32& pIndicesZ);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// NOTE: These two functions are in the .h file rather than the .inl due to an apparent bug in VC2010. // NOTE: These two functions are in the .h file rather than the .inl due to an apparent bug in VC2010.

28
include/PolyVox/MarchingCubesSurfaceExtractor.inl
View File

@ -43,6 +43,18 @@ namespace PolyVox
Timer timer; Timer timer;
m_meshCurrent->clear(); m_meshCurrent->clear();
computeBitmaskForSlice();
m_meshCurrent->setOffset(m_regSizeInVoxels.getLowerCorner());
POLYVOX_LOG_TRACE("Marching cubes surface extraction took ", timer.elapsedTimeInMilliSeconds(),
"ms (Region size = ", m_regSizeInVoxels.getWidthInVoxels(), "x", m_regSizeInVoxels.getHeightInVoxels(),
"x", m_regSizeInVoxels.getDepthInVoxels(), ")");
}
template<typename VolumeType, typename MeshType, typename ControllerType>
void MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::computeBitmaskForSlice()
{
const uint32_t uArrayWidth = m_regSizeInVoxels.getUpperX() - m_regSizeInVoxels.getLowerX() + 2; const uint32_t uArrayWidth = m_regSizeInVoxels.getUpperX() - m_regSizeInVoxels.getLowerX() + 2;
const uint32_t uArrayHeight = m_regSizeInVoxels.getUpperY() - m_regSizeInVoxels.getLowerY() + 2; const uint32_t uArrayHeight = m_regSizeInVoxels.getUpperY() - m_regSizeInVoxels.getLowerY() + 2;
const uint32_t uArrayDepth = m_regSizeInVoxels.getUpperZ() - m_regSizeInVoxels.getLowerZ() + 2; const uint32_t uArrayDepth = m_regSizeInVoxels.getUpperZ() - m_regSizeInVoxels.getLowerZ() + 2;
@ -59,22 +71,6 @@ namespace PolyVox
Array3DUint8 pBitmask(uArrayWidth, uArrayHeight, uArrayDepth); Array3DUint8 pBitmask(uArrayWidth, uArrayHeight, uArrayDepth);
memset(pBitmask.getRawData(), 0x00, pBitmask.getNoOfElements()); memset(pBitmask.getRawData(), 0x00, pBitmask.getNoOfElements());
computeBitmaskForSlice<true>(pBitmask, pIndicesX, pIndicesY, pIndicesZ);
m_meshCurrent->setOffset(m_regSizeInVoxels.getLowerCorner());
POLYVOX_LOG_TRACE("Marching cubes surface extraction took ", timer.elapsedTimeInMilliSeconds(),
"ms (Region size = ", m_regSizeInVoxels.getWidthInVoxels(), "x", m_regSizeInVoxels.getHeightInVoxels(),
"x", m_regSizeInVoxels.getDepthInVoxels(), ")");
}
template<typename VolumeType, typename MeshType, typename ControllerType>
template<bool isPrevZAvail>
void MarchingCubesSurfaceExtractor<VolumeType, MeshType, ControllerType>::computeBitmaskForSlice(Array3DUint8& pBitmask,
Array3DInt32& pIndicesX,
Array3DInt32& pIndicesY,
Array3DInt32& pIndicesZ)
{
for (int32_t iZVolSpace = m_regSizeInVoxels.getLowerZ(); iZVolSpace <= m_regSizeInVoxels.getUpperZ(); iZVolSpace++) for (int32_t iZVolSpace = m_regSizeInVoxels.getLowerZ(); iZVolSpace <= m_regSizeInVoxels.getUpperZ(); iZVolSpace++)
{ {
const uint32_t uZRegSpace = iZVolSpace - m_regSizeInVoxels.getLowerZ(); const uint32_t uZRegSpace = iZVolSpace - m_regSizeInVoxels.getLowerZ();