Optimising SurfaceExtractor.
This commit is contained in:
parent
c0a504703e
commit
47291c59fc
@ -60,6 +60,15 @@ namespace PolyVox
|
|||||||
int32_t* m_pCurrentVertexIndicesY;
|
int32_t* m_pCurrentVertexIndicesY;
|
||||||
int32_t* m_pCurrentVertexIndicesZ;
|
int32_t* m_pCurrentVertexIndicesZ;
|
||||||
|
|
||||||
|
uint8_t v000;
|
||||||
|
uint8_t v100;
|
||||||
|
uint8_t v010;
|
||||||
|
uint8_t v110;
|
||||||
|
uint8_t v001;
|
||||||
|
uint8_t v101;
|
||||||
|
uint8_t v011;
|
||||||
|
uint8_t v111;
|
||||||
|
|
||||||
inline uint32_t getIndex(uint32_t x, uint32_t y)
|
inline uint32_t getIndex(uint32_t x, uint32_t y)
|
||||||
{
|
{
|
||||||
return x + (y * (m_uRegionWidth+2));
|
return x + (y * (m_uRegionWidth+2));
|
||||||
|
@ -373,18 +373,22 @@ namespace PolyVox
|
|||||||
{
|
{
|
||||||
uint32_t uNoOfNonEmptyCells = 0;
|
uint32_t uNoOfNonEmptyCells = 0;
|
||||||
|
|
||||||
//Iterate over each cell in the region
|
const uint16_t uMaxXVolSpace = regSlice1.getUpperCorner().getX();
|
||||||
for(uint16_t uYVolSpace = regSlice1.getLowerCorner().getY(); uYVolSpace <= regSlice1.getUpperCorner().getY(); uYVolSpace += m_uStepSize)
|
const uint16_t uMaxYVolSpace = regSlice1.getUpperCorner().getY();
|
||||||
{
|
|
||||||
for(uint16_t uXVolSpace = regSlice1.getLowerCorner().getX(); uXVolSpace <= regSlice1.getUpperCorner().getX(); uXVolSpace += m_uStepSize)
|
|
||||||
{
|
|
||||||
uint16_t uZVolSpace = regSlice1.getLowerCorner().getZ();
|
|
||||||
//Current position
|
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace);
|
|
||||||
|
|
||||||
|
const uint16_t uZVolSpace = regSlice1.getLowerCorner().getZ();
|
||||||
|
const uint16_t uZRegSpace = uZVolSpace - m_v3dRegionOffset.getZ();
|
||||||
|
|
||||||
|
//Iterate over each cell in the region
|
||||||
|
for(uint16_t uYVolSpace = regSlice1.getLowerCorner().getY(); uYVolSpace <= uMaxYVolSpace; uYVolSpace += m_uStepSize)
|
||||||
|
{
|
||||||
|
for(uint16_t uXVolSpace = regSlice1.getLowerCorner().getX(); uXVolSpace <= uMaxXVolSpace; uXVolSpace += m_uStepSize)
|
||||||
|
{
|
||||||
const uint16_t uXRegSpace = uXVolSpace - m_v3dRegionOffset.getX();
|
const uint16_t uXRegSpace = uXVolSpace - m_v3dRegionOffset.getX();
|
||||||
const uint16_t uYRegSpace = uYVolSpace - m_v3dRegionOffset.getY();
|
const uint16_t uYRegSpace = uYVolSpace - m_v3dRegionOffset.getY();
|
||||||
const uint16_t uZRegSpace = uZVolSpace - m_v3dRegionOffset.getZ();
|
|
||||||
|
//Current position
|
||||||
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace);
|
||||||
|
|
||||||
//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
|
||||||
uint8_t iCubeIndex = 0;
|
uint8_t iCubeIndex = 0;
|
||||||
@ -402,9 +406,16 @@ namespace PolyVox
|
|||||||
if(isPrevYAvail)
|
if(isPrevYAvail)
|
||||||
{
|
{
|
||||||
if(isPrevXAvail)
|
if(isPrevXAvail)
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
//z
|
//z
|
||||||
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
||||||
@ -425,11 +436,20 @@ namespace PolyVox
|
|||||||
if (v111 == 0) iCubeIndex |= 128;
|
if (v111 == 0) iCubeIndex |= 128;
|
||||||
}
|
}
|
||||||
else //previous X not available
|
else //previous X not available
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v011 = m_sampVolume.peekVoxel0px1py1pz();
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
//z
|
//z
|
||||||
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
||||||
@ -449,11 +469,20 @@ namespace PolyVox
|
|||||||
else //previous Y not available
|
else //previous Y not available
|
||||||
{
|
{
|
||||||
if(isPrevXAvail)
|
if(isPrevXAvail)
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v101 = m_sampVolume.peekVoxel1px0py1pz();
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
//z
|
//z
|
||||||
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
||||||
@ -470,15 +499,25 @@ namespace PolyVox
|
|||||||
if (v111 == 0) iCubeIndex |= 128;
|
if (v111 == 0) iCubeIndex |= 128;
|
||||||
}
|
}
|
||||||
else //previous X not available
|
else //previous X not available
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v001 = m_sampVolume.peekVoxel0px0py1pz();
|
||||||
|
v101 = m_sampVolume.peekVoxel1px0py1pz();
|
||||||
|
v011 = m_sampVolume.peekVoxel0px1py1pz();
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v001 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v001 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
//z
|
//z
|
||||||
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
uint8_t iPreviousCubeIndexZ = m_pPreviousBitmask[getIndex(uXRegSpace,uYRegSpace)];
|
||||||
@ -496,12 +535,20 @@ namespace PolyVox
|
|||||||
if(isPrevYAvail)
|
if(isPrevYAvail)
|
||||||
{
|
{
|
||||||
if(isPrevXAvail)
|
if(isPrevXAvail)
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v110 = m_sampVolume.peekVoxel1px1py0pz();
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
||||||
const uint8_t v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
//y
|
//y
|
||||||
uint8_t iPreviousCubeIndexY = m_pCurrentBitmask[getIndex(uXRegSpace,uYRegSpace-m_uStepSize)];
|
uint8_t iPreviousCubeIndexY = m_pCurrentBitmask[getIndex(uXRegSpace,uYRegSpace-m_uStepSize)];
|
||||||
@ -519,16 +566,27 @@ namespace PolyVox
|
|||||||
if (v111 == 0) iCubeIndex |= 128;
|
if (v111 == 0) iCubeIndex |= 128;
|
||||||
}
|
}
|
||||||
else //previous X not available
|
else //previous X not available
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v010 = m_sampVolume.peekVoxel0px1py0pz();
|
||||||
|
v110 = m_sampVolume.peekVoxel1px1py0pz();
|
||||||
|
|
||||||
|
v011 = m_sampVolume.peekVoxel0px1py1pz();
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace);
|
||||||
const uint8_t v010 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v010 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
||||||
const uint8_t v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
//y
|
//y
|
||||||
uint8_t iPreviousCubeIndexY = m_pCurrentBitmask[getIndex(uXRegSpace,uYRegSpace-m_uStepSize)];
|
uint8_t iPreviousCubeIndexY = m_pCurrentBitmask[getIndex(uXRegSpace,uYRegSpace-m_uStepSize)];
|
||||||
@ -546,16 +604,27 @@ namespace PolyVox
|
|||||||
else //previous Y not available
|
else //previous Y not available
|
||||||
{
|
{
|
||||||
if(isPrevXAvail)
|
if(isPrevXAvail)
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v100 = m_sampVolume.peekVoxel1px0py0pz();
|
||||||
|
v110 = m_sampVolume.peekVoxel1px1py0pz();
|
||||||
|
|
||||||
|
v101 = m_sampVolume.peekVoxel1px0py1pz();
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace);
|
||||||
const uint8_t v100 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v100 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
||||||
const uint8_t v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
//x
|
//x
|
||||||
uint8_t iPreviousCubeIndexX = m_pCurrentBitmask[getIndex(uXRegSpace-m_uStepSize,uYRegSpace)];
|
uint8_t iPreviousCubeIndexX = m_pCurrentBitmask[getIndex(uXRegSpace-m_uStepSize,uYRegSpace)];
|
||||||
@ -570,24 +639,39 @@ namespace PolyVox
|
|||||||
if (v111 == 0) iCubeIndex |= 128;
|
if (v111 == 0) iCubeIndex |= 128;
|
||||||
}
|
}
|
||||||
else //previous X not available
|
else //previous X not available
|
||||||
|
{
|
||||||
|
if(m_uLodLevel == 0)
|
||||||
|
{
|
||||||
|
v000 = m_sampVolume.getVoxel();
|
||||||
|
v100 = m_sampVolume.peekVoxel1px0py0pz();
|
||||||
|
v010 = m_sampVolume.peekVoxel0px1py0pz();
|
||||||
|
v110 = m_sampVolume.peekVoxel1px1py0pz();
|
||||||
|
|
||||||
|
v001 = m_sampVolume.peekVoxel0px0py1pz();
|
||||||
|
v101 = m_sampVolume.peekVoxel1px0py1pz();
|
||||||
|
v011 = m_sampVolume.peekVoxel0px1py1pz();
|
||||||
|
v111 = m_sampVolume.peekVoxel1px1py1pz();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace);
|
||||||
const uint8_t v000 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v000 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace);
|
||||||
const uint8_t v100 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v100 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace);
|
||||||
const uint8_t v010 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v010 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace);
|
||||||
const uint8_t v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v110 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v001 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v001 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v101 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v011 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
m_sampVolume.setPosition(uXVolSpace+m_uStepSize,uYVolSpace+m_uStepSize,uZVolSpace+m_uStepSize);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxel(m_uLodLevel);
|
||||||
|
}
|
||||||
|
|
||||||
if (v000 == 0) iCubeIndex |= 1;
|
if (v000 == 0) iCubeIndex |= 1;
|
||||||
if (v100 == 0) iCubeIndex |= 2;
|
if (v100 == 0) iCubeIndex |= 2;
|
||||||
@ -605,15 +689,15 @@ namespace PolyVox
|
|||||||
{
|
{
|
||||||
if(m_uLodLevel == 0)
|
if(m_uLodLevel == 0)
|
||||||
{
|
{
|
||||||
const uint8_t v000 = m_sampVolume.getVoxel();
|
v000 = m_sampVolume.getVoxel();
|
||||||
const uint8_t v100 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace , uZVolSpace );
|
v100 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace , uZVolSpace );
|
||||||
const uint8_t v010 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace , uYVolSpace+1, uZVolSpace );
|
v010 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace , uYVolSpace+1, uZVolSpace );
|
||||||
const uint8_t v110 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace+1, uZVolSpace );
|
v110 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace+1, uZVolSpace );
|
||||||
|
|
||||||
const uint8_t v001 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace , uYVolSpace , uZVolSpace+1);
|
v001 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace , uYVolSpace , uZVolSpace+1);
|
||||||
const uint8_t v101 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace , uZVolSpace+1);
|
v101 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace , uZVolSpace+1);
|
||||||
const uint8_t v011 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace , uYVolSpace+1, uZVolSpace+1);
|
v011 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace , uYVolSpace+1, uZVolSpace+1);
|
||||||
const uint8_t v111 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace+1, uZVolSpace+1);
|
v111 = m_sampVolume.getVolume().getVoxelAtWithBoundCheck(uXVolSpace+1, uYVolSpace+1, uZVolSpace+1);
|
||||||
|
|
||||||
if (v000 == 0) iCubeIndex |= 1;
|
if (v000 == 0) iCubeIndex |= 1;
|
||||||
if (v100 == 0) iCubeIndex |= 2;
|
if (v100 == 0) iCubeIndex |= 2;
|
||||||
@ -626,29 +710,29 @@ namespace PolyVox
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const uint8_t v000 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v000 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace , uZVolSpace );
|
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace , uZVolSpace );
|
||||||
const uint8_t v100 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v100 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace , uYVolSpace+1, uZVolSpace );
|
m_sampVolume.setPosition(uXVolSpace , uYVolSpace+1, uZVolSpace );
|
||||||
const uint8_t v010 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v010 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace+1, uZVolSpace );
|
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace+1, uZVolSpace );
|
||||||
const uint8_t v110 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v110 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace , uYVolSpace , uZVolSpace+1);
|
m_sampVolume.setPosition(uXVolSpace , uYVolSpace , uZVolSpace+1);
|
||||||
const uint8_t v001 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v001 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace , uZVolSpace+1);
|
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace , uZVolSpace+1);
|
||||||
const uint8_t v101 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v101 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace , uYVolSpace+1, uZVolSpace+1);
|
m_sampVolume.setPosition(uXVolSpace , uYVolSpace+1, uZVolSpace+1);
|
||||||
const uint8_t v011 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v011 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace+1, uZVolSpace+1);
|
m_sampVolume.setPosition(uXVolSpace+1, uYVolSpace+1, uZVolSpace+1);
|
||||||
const uint8_t v111 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
v111 = m_sampVolume.getSubSampledVoxelWithBoundsCheck(m_uLodLevel);
|
||||||
|
|
||||||
if (v000 == 0) iCubeIndex |= 1;
|
if (v000 == 0) iCubeIndex |= 1;
|
||||||
if (v100 == 0) iCubeIndex |= 2;
|
if (v100 == 0) iCubeIndex |= 2;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user