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

Work reintegrating Region class.

Browse Source
This commit is contained in:
David Williams 2008-05-25 13:33:22 +00:00
parent f15491ec02
commit 50103589c6
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SurfaceExtractors.h
View File

@ -33,7 +33,7 @@ namespace PolyVox
void generateRoughMeshDataForRegion(BlockVolume<boost::uint8_t>* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch); void generateRoughMeshDataForRegion(BlockVolume<boost::uint8_t>* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch);
Vector3DFloat computeNormal(BlockVolume<boost::uint8_t>* volumeData, const Vector3DFloat& position, NormalGenerationMethod normalGenerationMethod); Vector3DFloat computeNormal(BlockVolume<boost::uint8_t>* volumeData, const Vector3DFloat& position, NormalGenerationMethod normalGenerationMethod);
void generateSmoothMeshDataForRegion(BlockVolume<boost::uint8_t>* volumeData, boost::uint16_t regionX, boost::uint16_t regionY, boost::uint16_t regionZ, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch); void generateSmoothMeshDataForRegion(BlockVolume<boost::uint8_t>* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch);
Vector3DFloat computeSmoothNormal(BlockVolume<boost::uint8_t>* volumeData, const Vector3DFloat& position, NormalGenerationMethod normalGenerationMethod); Vector3DFloat computeSmoothNormal(BlockVolume<boost::uint8_t>* volumeData, const Vector3DFloat& position, NormalGenerationMethod normalGenerationMethod);
} }

1
include/VolumeIterator.h
View File

@ -50,6 +50,7 @@ namespace PolyVox
VoxelType getVoxel(void) const; VoxelType getVoxel(void) const;
void setPosition(boost::uint16_t xPos, boost::uint16_t yPos, boost::uint16_t zPos); void setPosition(boost::uint16_t xPos, boost::uint16_t yPos, boost::uint16_t zPos);
void setValidRegion(const Region& region);
void setValidRegion(boost::uint16_t xFirst, boost::uint16_t yFirst, boost::uint16_t zFirst, boost::uint16_t xLast, boost::uint16_t yLast, boost::uint16_t zLast); void setValidRegion(boost::uint16_t xFirst, boost::uint16_t yFirst, boost::uint16_t zFirst, boost::uint16_t xLast, boost::uint16_t yLast, boost::uint16_t zLast);
void setVoxel(VoxelType tValue); void setVoxel(VoxelType tValue);

6
include/VolumeIterator.inl
View File

@ -189,6 +189,12 @@ namespace PolyVox
mCurrentVoxel = currentBlock->m_tData + mVoxelIndexInBlock; mCurrentVoxel = currentBlock->m_tData + mVoxelIndexInBlock;
} }
template <typename VoxelType>
void VolumeIterator<VoxelType>::setValidRegion(const Region& region)
{
setValidRegion(region.getLowerCorner().x(),region.getLowerCorner().y(),region.getLowerCorner().z(),region.getUpperCorner().x(),region.getUpperCorner().y(),region.getUpperCorner().z());
}
template <typename VoxelType> template <typename VoxelType>
void VolumeIterator<VoxelType>::setValidRegion(boost::uint16_t xFirst, boost::uint16_t yFirst, boost::uint16_t zFirst, boost::uint16_t xLast, boost::uint16_t yLast, boost::uint16_t zLast) void VolumeIterator<VoxelType>::setValidRegion(boost::uint16_t xFirst, boost::uint16_t yFirst, boost::uint16_t zFirst, boost::uint16_t xLast, boost::uint16_t yLast, boost::uint16_t zLast)
{ {

33
source/SurfaceExtractors.cpp
View File

@ -19,27 +19,20 @@ namespace PolyVox
regVolume.setUpperCorner(regVolume.getUpperCorner() - Vector3DInt32(1,1,1)); regVolume.setUpperCorner(regVolume.getUpperCorner() - Vector3DInt32(1,1,1));
region.cropTo(regVolume); region.cropTo(regVolume);
const uint16_t firstX = region.getLowerCorner().x();
const uint16_t firstY = region.getLowerCorner().y();
const uint16_t firstZ = region.getLowerCorner().z();
const uint16_t lastX = region.getUpperCorner().x();
const uint16_t lastY = region.getUpperCorner().y();
const uint16_t lastZ = region.getUpperCorner().z();
//Offset from lower block corner //Offset from lower block corner
const Vector3DFloat offset(firstX,firstY,firstZ); const Vector3DFloat offset = static_cast<Vector3DFloat>(region.getLowerCorner());
Vector3DFloat vertlist[12]; Vector3DFloat vertlist[12];
uint8_t vertMaterials[12]; uint8_t vertMaterials[12];
VolumeIterator<boost::uint8_t> volIter(*volumeData); VolumeIterator<boost::uint8_t> volIter(*volumeData);
volIter.setValidRegion(firstX,firstY,firstZ,lastX,lastY,lastZ); volIter.setValidRegion(region);
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//Get mesh data //Get mesh data
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//Iterate over each cell in the region //Iterate over each cell in the region
for(volIter.setPosition(firstX,firstY,firstZ);volIter.isValidForRegion();volIter.moveForwardInRegion()) for(volIter.setPosition(region.getLowerCorner().x(),region.getLowerCorner().y(), region.getLowerCorner().z());volIter.isValidForRegion();volIter.moveForwardInRegion())
{ {
//Current position //Current position
const uint16_t x = volIter.getPosX(); const uint16_t x = volIter.getPosX();
@ -416,23 +409,21 @@ namespace PolyVox
return result; return result;
} }
void generateSmoothMeshDataForRegion(BlockVolume<uint8_t>* volumeData, uint16_t regionX, uint16_t regionY, uint16_t regionZ, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch) void generateSmoothMeshDataForRegion(BlockVolume<uint8_t>* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch)
{ {
//First and last voxels in the region //When generating the mesh for a region we actually look one voxel outside it in the
const uint16_t firstX = regionX * POLYVOX_REGION_SIDE_LENGTH; // back, bottom, right direction. Protect against access violations by cropping region here
const uint16_t firstY = regionY * POLYVOX_REGION_SIDE_LENGTH; Region regVolume = volumeData->getEnclosingRegion();
const uint16_t firstZ = regionZ * POLYVOX_REGION_SIDE_LENGTH; regVolume.setUpperCorner(regVolume.getUpperCorner() - Vector3DInt32(1,1,1));
const uint16_t lastX = (std::min)(firstX + POLYVOX_REGION_SIDE_LENGTH-1,volumeData->getSideLength()-2); region.cropTo(regVolume);
const uint16_t lastY = (std::min)(firstY + POLYVOX_REGION_SIDE_LENGTH-1,volumeData->getSideLength()-2);
const uint16_t lastZ = (std::min)(firstZ + POLYVOX_REGION_SIDE_LENGTH-1,volumeData->getSideLength()-2);
//Offset from lower block corner //Offset from lower block corner
const Vector3DFloat offset(firstX,firstY,firstZ); const Vector3DFloat offset = static_cast<Vector3DFloat>(region.getLowerCorner());
Vector3DFloat vertlist[12]; Vector3DFloat vertlist[12];
uint8_t vertMaterials[12]; uint8_t vertMaterials[12];
VolumeIterator<boost::uint8_t> volIter(*volumeData); VolumeIterator<boost::uint8_t> volIter(*volumeData);
volIter.setValidRegion(firstX,firstY,firstZ,lastX,lastY,lastZ); volIter.setValidRegion(region);
const float threshold = 0.5f; const float threshold = 0.5f;
@ -441,7 +432,7 @@ namespace PolyVox
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//Iterate over each cell in the region //Iterate over each cell in the region
for(volIter.setPosition(firstX,firstY,firstZ);volIter.isValidForRegion();volIter.moveForwardInRegion()) for(volIter.setPosition(region.getLowerCorner().x(),region.getLowerCorner().y(), region.getLowerCorner().z());volIter.isValidForRegion();volIter.moveForwardInRegion())
{ {
//Current position //Current position
const uint16_t x = volIter.getPosX(); const uint16_t x = volIter.getPosX();