diff --git a/include/SurfaceExtractors.h b/include/SurfaceExtractors.h index f8debade..251ce977 100644 --- a/include/SurfaceExtractors.h +++ b/include/SurfaceExtractors.h @@ -30,10 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. namespace PolyVox { - void generateRoughMeshDataForRegion(BlockVolume* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch); + void generateRoughMeshDataForRegion(BlockVolume* volumeData, boost::uint16_t regionX, boost::uint16_t regionY, boost::uint16_t regionZ, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch); Vector3DFloat computeNormal(BlockVolume* volumeData, const Vector3DFloat& position, NormalGenerationMethod normalGenerationMethod); - void generateSmoothMeshDataForRegion(BlockVolume* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch); + void generateSmoothMeshDataForRegion(BlockVolume* volumeData, boost::uint16_t regionX, boost::uint16_t regionY, boost::uint16_t regionZ, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch); Vector3DFloat computeSmoothNormal(BlockVolume* volumeData, const Vector3DFloat& position, NormalGenerationMethod normalGenerationMethod); } diff --git a/include/VolumeIterator.h b/include/VolumeIterator.h index 2e775ee8..e7dbc3b5 100644 --- a/include/VolumeIterator.h +++ b/include/VolumeIterator.h @@ -50,7 +50,7 @@ namespace PolyVox VoxelType getVoxel(void) const; 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 setVoxel(VoxelType tValue); bool isValidForRegion(void) const; diff --git a/include/VolumeIterator.inl b/include/VolumeIterator.inl index 661742ca..956febb6 100644 --- a/include/VolumeIterator.inl +++ b/include/VolumeIterator.inl @@ -190,15 +190,15 @@ namespace PolyVox } template - void VolumeIterator::setValidRegion(const Region& region) + void VolumeIterator::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) { - mXRegionFirst = region.getLowerCorner().x(); - mYRegionFirst = region.getLowerCorner().y(); - mZRegionFirst = region.getLowerCorner().z(); + mXRegionFirst = xFirst; + mYRegionFirst = yFirst; + mZRegionFirst = zFirst; - mXRegionLast = region.getUpperCorner().x(); - mYRegionLast = region.getUpperCorner().y(); - mZRegionLast = region.getUpperCorner().z(); + mXRegionLast = xLast; + mYRegionLast = yLast; + mZRegionLast = zLast; mXRegionFirstBlock = mXRegionFirst >> mVolume.m_uBlockSideLengthPower; mYRegionFirstBlock = mYRegionFirst >> mVolume.m_uBlockSideLengthPower; diff --git a/source/SurfaceExtractors.cpp b/source/SurfaceExtractors.cpp index 46be9d1f..e4b0ebe3 100644 --- a/source/SurfaceExtractors.cpp +++ b/source/SurfaceExtractors.cpp @@ -4,51 +4,36 @@ #include "GradientEstimators.h" #include "IndexedSurfacePatch.h" #include "MarchingCubesTables.h" -#include "Region.h" #include "VolumeIterator.h" using namespace boost; namespace PolyVox { - void generateRoughMeshDataForRegion(BlockVolume* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch) + void generateRoughMeshDataForRegion(BlockVolume* volumeData, uint16_t regionX, uint16_t regionY, uint16_t regionZ, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch) { //First and last voxels in the region - //const uint16_t firstX = regionX * POLYVOX_REGION_SIDE_LENGTH; - //const uint16_t firstY = regionY * POLYVOX_REGION_SIDE_LENGTH; - //const uint16_t firstZ = regionZ * POLYVOX_REGION_SIDE_LENGTH; - //const uint16_t lastX = (std::min)(firstX + POLYVOX_REGION_SIDE_LENGTH-1,volumeData->getSideLength()-2); - //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); - - //We don't go right to the edge - Region regVolume = volumeData->getEnclosingRegion(); - regVolume.setUpperCorner(regVolume.getUpperCorner() - Vector3DInt32(1,1,1)); - region.cropTo(regVolume); - - //const uint16_t firstX = (uint16_t)region.getLowerCorner().x(); - //const uint16_t firstY = (uint16_t)region.getLowerCorner().y(); - //const uint16_t firstZ = (uint16_t)region.getLowerCorner().z(); - //FIXME - for this next step, define some operation to crop one region to another. We can then crop to the volume - //const uint16_t lastX = static_cast(region.getUpperCorner().x()); - //const uint16_t lastY = static_cast(region.getUpperCorner().y()); - //const uint16_t lastZ = static_cast(region.getUpperCorner().z()); - + const uint16_t firstX = regionX * POLYVOX_REGION_SIDE_LENGTH; + const uint16_t firstY = regionY * POLYVOX_REGION_SIDE_LENGTH; + const uint16_t firstZ = regionZ * POLYVOX_REGION_SIDE_LENGTH; + const uint16_t lastX = (std::min)(firstX + POLYVOX_REGION_SIDE_LENGTH-1,volumeData->getSideLength()-2); + 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 - const Vector3DFloat offset(region.getLowerCorner()); + const Vector3DFloat offset(firstX,firstY,firstZ); Vector3DFloat vertlist[12]; uint8_t vertMaterials[12]; VolumeIterator volIter(*volumeData); - volIter.setValidRegion(region); + volIter.setValidRegion(firstX,firstY,firstZ,lastX,lastY,lastZ); ////////////////////////////////////////////////////////////////////////// //Get mesh data ////////////////////////////////////////////////////////////////////////// //Iterate over each cell in the region - for(volIter.setPosition(region.getLowerCorner().x(),region.getLowerCorner().y(),region.getLowerCorner().z());volIter.isValidForRegion();volIter.moveForwardInRegion()) + for(volIter.setPosition(firstX,firstY,firstZ);volIter.isValidForRegion();volIter.moveForwardInRegion()) { //Current position const uint16_t x = volIter.getPosX(); @@ -425,36 +410,23 @@ namespace PolyVox return result; } - void generateSmoothMeshDataForRegion(BlockVolume* volumeData, Region region, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch) + void generateSmoothMeshDataForRegion(BlockVolume* volumeData, uint16_t regionX, uint16_t regionY, uint16_t regionZ, IndexedSurfacePatch* singleMaterialPatch, IndexedSurfacePatch* multiMaterialPatch) { //First and last voxels in the region - //const uint16_t firstX = regionX * POLYVOX_REGION_SIDE_LENGTH; - //const uint16_t firstY = regionY * POLYVOX_REGION_SIDE_LENGTH; - //const uint16_t firstZ = regionZ * POLYVOX_REGION_SIDE_LENGTH; - //const uint16_t lastX = (std::min)(firstX + POLYVOX_REGION_SIDE_LENGTH-1,volumeData->getSideLength()-2); - //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); - - //We don't go right to the edge - Region regVolume = volumeData->getEnclosingRegion(); - regVolume.setUpperCorner(regVolume.getUpperCorner() - Vector3DInt32(1,1,1)); - region.cropTo(regVolume); - - //const uint16_t firstX = (uint16_t)region.getLowerCorner().x(); - //const uint16_t firstY = (uint16_t)region.getLowerCorner().y(); - //const uint16_t firstZ = (uint16_t)region.getLowerCorner().z(); - //FIXME - for this next step, define some operation to crop one region to another. We can then crop to the volume - //const uint16_t lastX = static_cast(region.getUpperCorner().x()); - //const uint16_t lastY = static_cast(region.getUpperCorner().y()); - //const uint16_t lastZ = static_cast(region.getUpperCorner().z()); + const uint16_t firstX = regionX * POLYVOX_REGION_SIDE_LENGTH; + const uint16_t firstY = regionY * POLYVOX_REGION_SIDE_LENGTH; + const uint16_t firstZ = regionZ * POLYVOX_REGION_SIDE_LENGTH; + const uint16_t lastX = (std::min)(firstX + POLYVOX_REGION_SIDE_LENGTH-1,volumeData->getSideLength()-2); + 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 - const Vector3DFloat offset(region.getLowerCorner()); + const Vector3DFloat offset(firstX,firstY,firstZ); Vector3DFloat vertlist[12]; uint8_t vertMaterials[12]; VolumeIterator volIter(*volumeData); - volIter.setValidRegion(region); + volIter.setValidRegion(firstX,firstY,firstZ,lastX,lastY,lastZ); const float threshold = 0.5f; @@ -463,7 +435,7 @@ namespace PolyVox ////////////////////////////////////////////////////////////////////////// //Iterate over each cell in the region - for(volIter.setPosition(region.getLowerCorner().x(),region.getLowerCorner().y(),region.getLowerCorner().z());volIter.isValidForRegion();volIter.moveForwardInRegion()) + for(volIter.setPosition(firstX,firstY,firstZ);volIter.isValidForRegion();volIter.moveForwardInRegion()) { //Current position const uint16_t x = volIter.getPosX(); diff --git a/source/VolumeChangeTracker.cpp b/source/VolumeChangeTracker.cpp index 7b572ed3..849163bd 100644 --- a/source/VolumeChangeTracker.cpp +++ b/source/VolumeChangeTracker.cpp @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "LinearVolume.h" #include "MarchingCubesTables.h" #include "VolumeChangeTracker.h" -#include "Region.h" #include "RegionGeometry.h" #include "SurfaceExtractors.h" #include "SurfaceVertex.h" @@ -84,16 +83,7 @@ namespace PolyVox regionGeometry.m_patchMultiMaterial = new IndexedSurfacePatch(true); regionGeometry.m_v3dRegionPosition = Vector3DInt32(regionX, regionY, regionZ); - const uint16_t firstX = regionX * POLYVOX_REGION_SIDE_LENGTH; - const uint16_t firstY = regionY * POLYVOX_REGION_SIDE_LENGTH; - const uint16_t firstZ = regionZ * POLYVOX_REGION_SIDE_LENGTH; - const uint16_t lastX = firstX + POLYVOX_REGION_SIDE_LENGTH-1; - const uint16_t lastY = firstY + POLYVOX_REGION_SIDE_LENGTH-1; - const uint16_t lastZ = firstZ + POLYVOX_REGION_SIDE_LENGTH-1; - - Region region(Vector3DInt32(firstX,firstY,firstZ),Vector3DInt32(lastX,lastY,lastZ)); - - generateRoughMeshDataForRegion(volumeData, region, regionGeometry.m_patchSingleMaterial, regionGeometry.m_patchMultiMaterial); + generateRoughMeshDataForRegion(volumeData, regionX,regionY,regionZ, regionGeometry.m_patchSingleMaterial, regionGeometry.m_patchMultiMaterial); regionGeometry.m_bContainsSingleMaterialPatch = regionGeometry.m_patchSingleMaterial->getVertices().size() > 0; regionGeometry.m_bContainsMultiMaterialPatch = regionGeometry.m_patchMultiMaterial->getVertices().size() > 0; @@ -145,7 +135,7 @@ namespace PolyVox lastZ = std::min(lastZ,int(volumeData->getSideLength()-1)); VolumeIterator volIter(*volumeData); - volIter.setValidRegion(Region(Vector3DInt32(firstX,firstY,firstZ),Vector3DInt32(lastX,lastY,lastZ))); + volIter.setValidRegion(firstX,firstY,firstZ,lastX,lastY,lastZ); volIter.setPosition(firstX,firstY,firstZ); while(volIter.isValidForRegion()) {