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

Just tidying up the MeshDecimator stuff a bit...

Browse Source
This commit is contained in:
David Williams
2011-01-05 21:32:31 +00:00
parent f8c036bcf6
commit d0e4b06051
2 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
library/PolyVoxCore/include/MeshDecimator.h
View File

@@ -28,13 +28,32 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
template <typename VertexType>
class MeshDecimator
{
//Used to keep track of when a vertex is
//on one or more faces of the region
enum POLYVOXCORE_API RegionFaceFlags
{
RFF_ON_REGION_FACE_NEG_X,
RFF_ON_REGION_FACE_POS_X ,
RFF_ON_REGION_FACE_NEG_Y ,
RFF_ON_REGION_FACE_POS_Y ,
RFF_ON_REGION_FACE_NEG_Z ,
RFF_ON_REGION_FACE_POS_Z,
RFF_NO_OF_REGION_FACE_FLAGS
};
//Data about the initial mesh - this
//will be fill in once at the start
struct InitialVertexMetadata struct InitialVertexMetadata
{ {
Vector3DFloat normal; Vector3DFloat normal;
bool isOnMaterialEdge; bool isOnMaterialEdge;
std::bitset<VF_NO_OF_FLAGS> vertexFlags; std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> isOnRegionFace;
}; };
//Representing a triangle for decimation purposes.
struct Triangle struct Triangle
{ {
uint32_t v0; uint32_t v0;
@@ -42,10 +61,6 @@ namespace PolyVox
uint32_t v2; uint32_t v2;
Vector3DFloat normal; Vector3DFloat normal;
}; };
template <typename VertexType>
class MeshDecimator
{
public: public:
MeshDecimator(SurfaceMesh<VertexType>* pInputMesh/*, SurfaceMesh<PositionMaterial>* pMeshOutput*/); MeshDecimator(SurfaceMesh<VertexType>* pInputMesh/*, SurfaceMesh<PositionMaterial>* pMeshOutput*/);
@@ -63,7 +78,7 @@ namespace PolyVox
//SurfaceMesh<PositionMaterial>* pMeshOutput; //SurfaceMesh<PositionMaterial>* pMeshOutput;
uint32_t performDecimationPass(float fMinDotProductForCollapse); uint32_t performDecimationPass(float fMinDotProductForCollapse);
bool isSubset(std::bitset<VF_NO_OF_FLAGS> a, std::bitset<VF_NO_OF_FLAGS> b); bool isSubset(std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> a, std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> b);
bool canCollapseEdge(uint32_t uSrc, uint32_t uDest); bool canCollapseEdge(uint32_t uSrc, uint32_t uDest);
bool canCollapseNormalEdge(uint32_t uSrc, uint32_t uDst); bool canCollapseNormalEdge(uint32_t uSrc, uint32_t uDst);

36
library/PolyVoxCore/include/MeshDecimator.inl
View File

@@ -101,7 +101,7 @@ namespace PolyVox
{ {
vecVertexMetadata[ct].normal.setElements(0,0,0); vecVertexMetadata[ct].normal.setElements(0,0,0);
vecVertexMetadata[ct].isOnMaterialEdge = false; vecVertexMetadata[ct].isOnMaterialEdge = false;
vecVertexMetadata[ct].vertexFlags.reset(); vecVertexMetadata[ct].isOnRegionFace.reset();
} }
for(int outerCt = 0; outerCt < m_pInputMesh->m_vecVertices.size()-1; outerCt++) for(int outerCt = 0; outerCt < m_pInputMesh->m_vecVertices.size()-1; outerCt++)
@@ -134,14 +134,14 @@ namespace PolyVox
regTransformed.shift(regTransformed.getLowerCorner() * static_cast<int16_t>(-1)); regTransformed.shift(regTransformed.getLowerCorner() * static_cast<int16_t>(-1));
//Plus and minus X //Plus and minus X
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_NEG_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() < regTransformed.getLowerCorner().getX() + 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_NEG_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() < regTransformed.getLowerCorner().getX() + 0.001f);
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_POS_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() > regTransformed.getUpperCorner().getX() - 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_POS_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() > regTransformed.getUpperCorner().getX() - 0.001f);
//Plus and minus Y //Plus and minus Y
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_NEG_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() < regTransformed.getLowerCorner().getY() + 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_NEG_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() < regTransformed.getLowerCorner().getY() + 0.001f);
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_POS_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() > regTransformed.getUpperCorner().getY() - 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_POS_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() > regTransformed.getUpperCorner().getY() - 0.001f);
//Plus and minus Z //Plus and minus Z
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_NEG_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() < regTransformed.getLowerCorner().getZ() + 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_NEG_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() < regTransformed.getLowerCorner().getZ() + 0.001f);
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_POS_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() > regTransformed.getUpperCorner().getZ() - 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_POS_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() > regTransformed.getUpperCorner().getZ() - 0.001f);
} }
} }
@@ -153,7 +153,7 @@ namespace PolyVox
//Initialise the metadata //Initialise the metadata
for(int ct = 0; ct < vecVertexMetadata.size(); ct++) for(int ct = 0; ct < vecVertexMetadata.size(); ct++)
{ {
vecVertexMetadata[ct].vertexFlags.reset(); vecVertexMetadata[ct].isOnRegionFace.reset();
vecVertexMetadata[ct].isOnMaterialEdge = false; vecVertexMetadata[ct].isOnMaterialEdge = false;
vecVertexMetadata[ct].normal = m_pInputMesh->m_vecVertices[ct].normal; vecVertexMetadata[ct].normal = m_pInputMesh->m_vecVertices[ct].normal;
} }
@@ -164,14 +164,14 @@ namespace PolyVox
regTransformed.shift(regTransformed.getLowerCorner() * static_cast<int16_t>(-1)); regTransformed.shift(regTransformed.getLowerCorner() * static_cast<int16_t>(-1));
//Plus and minus X //Plus and minus X
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_NEG_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() < regTransformed.getLowerCorner().getX() + 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_NEG_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() < regTransformed.getLowerCorner().getX() + 0.001f);
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_POS_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() > regTransformed.getUpperCorner().getX() - 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_POS_X, m_pInputMesh->m_vecVertices[ct].getPosition().getX() > regTransformed.getUpperCorner().getX() - 0.001f);
//Plus and minus Y //Plus and minus Y
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_NEG_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() < regTransformed.getLowerCorner().getY() + 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_NEG_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() < regTransformed.getLowerCorner().getY() + 0.001f);
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_POS_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() > regTransformed.getUpperCorner().getY() - 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_POS_Y, m_pInputMesh->m_vecVertices[ct].getPosition().getY() > regTransformed.getUpperCorner().getY() - 0.001f);
//Plus and minus Z //Plus and minus Z
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_NEG_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() < regTransformed.getLowerCorner().getZ() + 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_NEG_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() < regTransformed.getLowerCorner().getZ() + 0.001f);
vecVertexMetadata[ct].vertexFlags.set(VF_ON_GEOMETRY_EDGE_POS_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() > regTransformed.getUpperCorner().getZ() - 0.001f); vecVertexMetadata[ct].isOnRegionFace.set(RFF_ON_REGION_FACE_POS_Z, m_pInputMesh->m_vecVertices[ct].getPosition().getZ() > regTransformed.getUpperCorner().getZ() - 0.001f);
} }
//If all three vertices have the same material then we are not on a material edge. If any vertex has a different //If all three vertices have the same material then we are not on a material edge. If any vertex has a different
@@ -291,7 +291,7 @@ namespace PolyVox
bCanCollapse &= canCollapseMaterialEdge(uSrc, uDst); bCanCollapse &= canCollapseMaterialEdge(uSrc, uDst);
} }
if(m_vecInitialVertexMetadata[uSrc].vertexFlags.any()) if(m_vecInitialVertexMetadata[uSrc].isOnRegionFace.any())
{ {
bCanCollapse &= canCollapseRegionEdge(uSrc, uDst); bCanCollapse &= canCollapseRegionEdge(uSrc, uDst);
} }
@@ -322,7 +322,7 @@ namespace PolyVox
// We can collapse normal vertices onto edge vertices, and edge vertices // We can collapse normal vertices onto edge vertices, and edge vertices
// onto corner vertices, but not vice-versa. Hence we check whether all // onto corner vertices, but not vice-versa. Hence we check whether all
// the edge flags in the source vertex are also set in the destination vertex. // the edge flags in the source vertex are also set in the destination vertex.
if(isSubset(m_vecInitialVertexMetadata[uSrc].vertexFlags, m_vecInitialVertexMetadata[uDst].vertexFlags) == false) if(isSubset(m_vecInitialVertexMetadata[uSrc].isOnRegionFace, m_vecInitialVertexMetadata[uDst].isOnRegionFace) == false)
{ {
return false; return false;
} }
@@ -426,11 +426,11 @@ namespace PolyVox
// Returns true if every bit which is set in 'a' is also set in 'b'. The reverse does not need to be true. // Returns true if every bit which is set in 'a' is also set in 'b'. The reverse does not need to be true.
template <typename VertexType> template <typename VertexType>
bool MeshDecimator<VertexType>::isSubset(std::bitset<VF_NO_OF_FLAGS> a, std::bitset<VF_NO_OF_FLAGS> b) bool MeshDecimator<VertexType>::isSubset(std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> a, std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> b)
{ {
bool result = true; bool result = true;
for(int ct = 0; ct < VF_NO_OF_FLAGS; ct++) for(int ct = 0; ct < RFF_NO_OF_REGION_FACE_FLAGS; ct++)
{ {
if(a.test(ct)) if(a.test(ct))
{ {