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

Work on refactoring surface extractor.

Browse Source
This commit is contained in:
David Williams 2009-05-20 20:09:34 +00:00
parent f6e1af1828
commit 85829e004f
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/OpenGL/OpenGLWidget.cpp
View File

@ -64,7 +64,7 @@ void OpenGLWidget::setVolume(PolyVox::Volume<PolyVox::uint8_t>* volData)
Vector3DInt32 regUpperCorner(regionEndX, regionEndY, regionEndZ); Vector3DInt32 regUpperCorner(regionEndX, regionEndY, regionEndZ);
//Extract the surface for this region //Extract the surface for this region
extractSurface(m_volData, 1, PolyVox::Region(regLowerCorner, regUpperCorner), ispCurrent); extractSurface(m_volData, 0, PolyVox::Region(regLowerCorner, regUpperCorner), ispCurrent);
//computeNormalsForVertices(m_volData, *ispCurrent, SOBEL_SMOOTHED); //computeNormalsForVertices(m_volData, *ispCurrent, SOBEL_SMOOTHED);
//*ispCurrent = getSmoothedSurface(*ispCurrent); //*ispCurrent = getSmoothedSurface(*ispCurrent);

1
library/PolyVoxCore/include/VolumeIterator.h
View File

@ -47,6 +47,7 @@ namespace PolyVox
uint16_t getPosY(void) const; uint16_t getPosY(void) const;
uint16_t getPosZ(void) const; uint16_t getPosZ(void) const;
VoxelType getSubSampledVoxel(uint8_t uLevel) const; VoxelType getSubSampledVoxel(uint8_t uLevel) const;
VoxelType getSubSampledVoxelWithBoundsCheck(uint8_t uLevel) const;
const Volume<VoxelType>& getVolume(void) const; const Volume<VoxelType>& getVolume(void) const;
VoxelType getVoxel(void) const; VoxelType getVoxel(void) const;

19
library/PolyVoxCore/include/VolumeIterator.inl
View File

@ -163,6 +163,25 @@ namespace PolyVox
} }
} }
template <typename VoxelType>
VoxelType VolumeIterator<VoxelType>::getSubSampledVoxelWithBoundsCheck(uint8_t uLevel) const
{
const uint8_t uSize = 1 << uLevel;
if((mXPosInVolume >= 0) && (mXPosInVolume <= mVolume.getWidth() - uSize) &&
(mYPosInVolume >= 0) && (mYPosInVolume <= mVolume.getHeight() - uSize) &&
(mZPosInVolume >= 0) && (mZPosInVolume <= mVolume.getDepth() - uSize))
{
return getSubSampledVoxel(uLevel);
}
else
{
//If any voxel is outside then it's value will be zero, and so the minimum will be zero.
//No need to even look at the rest of the voxels.
return 0;
}
}
template <typename VoxelType> template <typename VoxelType>
const Volume<VoxelType>& VolumeIterator<VoxelType>::getVolume(void) const const Volume<VoxelType>& VolumeIterator<VoxelType>::getVolume(void) const
{ {