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

Making use of sampling adjacent voxels. General optimisations and improvements.

Browse Source
This commit is contained in:
David Williams
2009-06-06 23:08:08 +00:00
parent 41e33b1f59
commit 3010eb341d
7 changed files with 174 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/PolyVoxCore/source/GradientEstimators.cpp
View File

@ -16,7 +16,7 @@ namespace PolyVox
const Vector3DFloat& v3dPos = iterSurfaceVertex->getPosition() + static_cast<Vector3DFloat>(isp.m_Region.getLowerCorner());
const Vector3DInt16 v3dFloor = static_cast<Vector3DInt16>(v3dPos);
VolumeSampler<uint8_t> volIter(*volumeData);
VolumeSampler<uint8_t> volIter(volumeData);
//Check all corners are within the volume, allowing a boundary for gradient estimation
bool lowerCornerInside = volumeData->getEnclosingRegion().containsPoint(v3dFloor,2);
@ -42,7 +42,7 @@ namespace PolyVox
{
Vector3DFloat v3dGradient; //To store the result
VolumeSampler<uint8_t> volIter(*volumeData);
VolumeSampler<uint8_t> volIter(volumeData);
const Vector3DInt32 v3dFloor = static_cast<Vector3DInt32>(v3dPos);

37
library/PolyVoxCore/source/SurfaceExtractor.cpp
View File

@ -9,7 +9,7 @@ namespace PolyVox
SurfaceExtractor::SurfaceExtractor(Volume<uint8_t>& volData)
:m_uLodLevel(0)
,m_volData(volData)
,m_sampVolume(volData)
,m_sampVolume(&volData)
{
}
@ -184,35 +184,62 @@ namespace PolyVox
//Process the edge where x is minimal.
uXVolSpace = m_regSliceCurrent.getLowerCorner().getX();
m_sampVolume.setPosition(uXVolSpace, m_regSliceCurrent.getLowerCorner().getY(), uZVolSpace);
for(uYVolSpace = m_regSliceCurrent.getLowerCorner().getY() + m_uStepSize; uYVolSpace <= uMaxYVolSpace; uYVolSpace += m_uStepSize)
{
uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX();
uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY();
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace);
if(uLodLevel == 0)
{
m_sampVolume.movePositiveY();
}
else
{
m_sampVolume.setPosition(uXVolSpace, uYVolSpace, uZVolSpace);
}
computeBitmaskForCell<false, true, isPrevZAvail, uLodLevel>();
}
//Process the edge where y is minimal.
uYVolSpace = m_regSliceCurrent.getLowerCorner().getY();
m_sampVolume.setPosition(m_regSliceCurrent.getLowerCorner().getX(), uYVolSpace, uZVolSpace);
for(uXVolSpace = m_regSliceCurrent.getLowerCorner().getX() + m_uStepSize; uXVolSpace <= uMaxXVolSpace; uXVolSpace += m_uStepSize)
{
uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX();
uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY();
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace);
if(uLodLevel == 0)
{
m_sampVolume.movePositiveX();
}
else
{
m_sampVolume.setPosition(uXVolSpace, uYVolSpace, uZVolSpace);
}
computeBitmaskForCell<true, false, isPrevZAvail, uLodLevel>();
}
//Process all remaining elemnents of the slice. In this case, previous x and y values are always available
for(uYVolSpace = m_regSliceCurrent.getLowerCorner().getY() + m_uStepSize; uYVolSpace <= uMaxYVolSpace; uYVolSpace += m_uStepSize)
{
m_sampVolume.setPosition(m_regSliceCurrent.getLowerCorner().getX(), uYVolSpace, uZVolSpace);
for(uXVolSpace = m_regSliceCurrent.getLowerCorner().getX() + m_uStepSize; uXVolSpace <= uMaxXVolSpace; uXVolSpace += m_uStepSize)
{
uXRegSpace = uXVolSpace - m_regInputCropped.getLowerCorner().getX();
uYRegSpace = uYVolSpace - m_regInputCropped.getLowerCorner().getY();
m_sampVolume.setPosition(uXVolSpace,uYVolSpace,uZVolSpace);
if(uLodLevel == 0)
{
m_sampVolume.movePositiveX();
}
else
{
m_sampVolume.setPosition(uXVolSpace, uYVolSpace, uZVolSpace);
}
computeBitmaskForCell<true, true, isPrevZAvail, uLodLevel>();
}
}
@ -274,7 +301,6 @@ namespace PolyVox
{
v011 = m_sampVolume.peekVoxel0px1py1pz();
v111 = m_sampVolume.peekVoxel1px1py1pz();
}
else
{
@ -307,7 +333,6 @@ namespace PolyVox
{
v101 = m_sampVolume.peekVoxel1px0py1pz();
v111 = m_sampVolume.peekVoxel1px1py1pz();
}
else
{

6
library/PolyVoxCore/source/VoxelFilters.cpp
View File

@ -9,9 +9,9 @@ namespace PolyVox
assert(volIter.getPosX() >= 1);
assert(volIter.getPosY() >= 1);
assert(volIter.getPosZ() >= 1);
assert(volIter.getPosX() <= volIter.getVolume().getWidth() - 2);
assert(volIter.getPosY() <= volIter.getVolume().getHeight() - 2);
assert(volIter.getPosZ() <= volIter.getVolume().getDepth() - 2);
assert(volIter.getPosX() <= volIter.getVolume()->getWidth() - 2);
assert(volIter.getPosY() <= volIter.getVolume()->getHeight() - 2);
assert(volIter.getPosZ() <= volIter.getVolume()->getDepth() - 2);
float sum = 0.0;