From c79845f6fdb7bf33c87977d21078609ab69e38f2 Mon Sep 17 00:00:00 2001 From: David Williams Date: Mon, 24 Sep 2007 23:13:55 +0000 Subject: [PATCH] Cleaning up decimation, moving to sets. --- include/SurfaceEdge.h | 21 +++++++-- include/SurfacePatch.h | 4 +- include/SurfaceTriangle.h | 2 +- include/SurfaceVertex.h | 2 +- source/PolyVoxSceneManager.cpp | 4 +- source/SurfaceEdge.cpp | 16 ++++--- source/SurfacePatch.cpp | 78 +++++++++++++++++++++++----------- 7 files changed, 87 insertions(+), 40 deletions(-) diff --git a/include/SurfaceEdge.h b/include/SurfaceEdge.h index d7c83a14..39e6d473 100644 --- a/include/SurfaceEdge.h +++ b/include/SurfaceEdge.h @@ -29,18 +29,17 @@ namespace Ogre class SurfaceTriangle; typedef std::set::iterator SurfaceTriangleIterator; class SurfaceEdge; - typedef std::list::iterator SurfaceEdgeIterator; + typedef std::set::iterator SurfaceEdgeIterator; class SurfaceEdge { public: + SurfaceEdge(const SurfaceVertexIterator& targetToSet,const SurfaceVertexIterator& sourceToSet); friend bool operator == (const SurfaceEdge& lhs, const SurfaceEdge& rhs); friend bool operator < (const SurfaceEdge& lhs, const SurfaceEdge& rhs); - //int crud; - - SurfaceVertexIterator target; + //int crud; SurfaceTriangleIterator triangle; @@ -55,6 +54,20 @@ namespace Ogre std::string toString(void); bool isDegenerate(void); + + const SurfaceVertexIterator& getTarget(void) + { + return target; + } + + const SurfaceVertexIterator& getSource(void) + { + return source; + } + + private: + SurfaceVertexIterator target; + SurfaceVertexIterator source; }; } diff --git a/include/SurfacePatch.h b/include/SurfacePatch.h index 6aafbaa7..5ff1ad52 100644 --- a/include/SurfacePatch.h +++ b/include/SurfacePatch.h @@ -23,7 +23,7 @@ namespace Ogre class SurfaceTriangle; typedef std::set::iterator SurfaceTriangleIterator; class SurfaceEdge; - typedef std::list::iterator SurfaceEdgeIterator; + typedef std::set::iterator SurfaceEdgeIterator; class SurfacePatch { @@ -57,7 +57,7 @@ namespace Ogre private: std::set m_listVertices; std::set m_listTriangles; - std::list m_listEdges; + std::set m_listEdges; //std::vector m_vecVertexData; //std::vector m_vecIndexData; diff --git a/include/SurfaceTriangle.h b/include/SurfaceTriangle.h index cbb095fd..ee7a89e3 100644 --- a/include/SurfaceTriangle.h +++ b/include/SurfaceTriangle.h @@ -29,7 +29,7 @@ namespace Ogre class SurfaceTriangle; typedef std::set::iterator SurfaceTriangleIterator; class SurfaceEdge; - typedef std::list::iterator SurfaceEdgeIterator; + typedef std::set::iterator SurfaceEdgeIterator; class SurfaceTriangle { diff --git a/include/SurfaceVertex.h b/include/SurfaceVertex.h index 46ef516f..5571023d 100644 --- a/include/SurfaceVertex.h +++ b/include/SurfaceVertex.h @@ -32,7 +32,7 @@ namespace Ogre class SurfaceTriangle; typedef std::set::iterator SurfaceTriangleIterator; class SurfaceEdge; - typedef std::list::iterator SurfaceEdgeIterator; + typedef std::set::iterator SurfaceEdgeIterator; class SurfaceVertex { diff --git a/source/PolyVoxSceneManager.cpp b/source/PolyVoxSceneManager.cpp index c6918b0b..b57e065f 100644 --- a/source/PolyVoxSceneManager.cpp +++ b/source/PolyVoxSceneManager.cpp @@ -324,10 +324,10 @@ namespace Ogre for(uint regionZ = 0; regionZ < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++regionZ) { LogManager::getSingleton().logMessage("regionZ = " + StringConverter::toString(regionZ)); - for(uint regionY = OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2-1; regionY < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2+1; ++regionY) + for(uint regionY = OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2-2; regionY < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2+1; ++regionY) { //LogManager::getSingleton().logMessage("regionY = " + StringConverter::toString(regionY)); - for(uint regionX = OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2-1; regionX < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2+1; ++regionX) + for(uint regionX = OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2-2; regionX < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2+1; ++regionX) { //LogManager::getSingleton().logMessage("regionX = " + StringConverter::toString(regionX)); if(surfaceUpToDate[regionX][regionY][regionZ] == false) diff --git a/source/SurfaceEdge.cpp b/source/SurfaceEdge.cpp index 9b7b509d..f7744323 100644 --- a/source/SurfaceEdge.cpp +++ b/source/SurfaceEdge.cpp @@ -4,10 +4,16 @@ namespace Ogre { + SurfaceEdge::SurfaceEdge(const SurfaceVertexIterator& targetToSet,const SurfaceVertexIterator& sourceToSet) + { + target = targetToSet; + source = sourceToSet; + } + std::string SurfaceEdge::toString(void) { std::stringstream ss; - ss << "SurfaceEdge: Target Vertex = " << target->toString() << "Source Vertex = " << otherHalfEdge->target->toString(); + ss << "SurfaceEdge: Target Vertex = " << target->toString() << "Source Vertex = " << source->toString(); return ss.str(); } @@ -16,13 +22,13 @@ namespace Ogre return ( ((*lhs.target) == (*rhs.target)) && - ((*lhs.otherHalfEdge->target) == (*rhs.otherHalfEdge->target)) + ((*lhs.source) == (*rhs.source)) ); } bool SurfaceEdge::isDegenerate(void) { - return (target == otherHalfEdge->target); + return (target == source); } bool operator < (const SurfaceEdge& lhs, const SurfaceEdge& rhs) @@ -32,9 +38,9 @@ namespace Ogre if ((*rhs.target) < (*lhs.target)) return false; - if ((*lhs.otherHalfEdge->target) < (*rhs.otherHalfEdge->target)) + if ((*lhs.source) < (*rhs.source)) return true; - if ((*rhs.otherHalfEdge->target) < (*lhs.otherHalfEdge->target)) + if ((*rhs.source) < (*lhs.source)) return false; return false; diff --git a/source/SurfacePatch.cpp b/source/SurfacePatch.cpp index 9f925ea0..10e833c0 100644 --- a/source/SurfacePatch.cpp +++ b/source/SurfacePatch.cpp @@ -47,17 +47,17 @@ namespace Ogre void SurfacePatch::addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2) { - /*if(v0.position.x > 16) + /*if(v0.getPosition().x > 4) return; - if(v0.position.y > 16) + if(v0.getPosition().y > 4) return; - if(v1.position.x > 16) + if(v1.getPosition().x > 4) return; - if(v1.position.y > 16) + if(v1.getPosition().y > 4) return; - if(v2.position.x > 16) + if(v2.getPosition().x > 4) return; - if(v2.position.y > 16) + if(v2.getPosition().y > 4) return;*/ @@ -117,43 +117,54 @@ namespace Ogre SurfaceEdgeIterator SurfacePatch::findEdge(const SurfaceVertexIterator& source, const SurfaceVertexIterator& target) { + /*LogManager::getSingleton().logMessage("In findEdge()"); + LogManager::getSingleton().logMessage("Input: source = " + source->toString() + " target = " + target->toString()); for(SurfaceEdgeIterator edgeIter = m_listEdges.begin(); edgeIter != m_listEdges.end(); ++edgeIter) { - if((edgeIter->target == target) && (edgeIter->otherHalfEdge->target == source)) + LogManager::getSingleton().logMessage("Current: source = " + edgeIter->getSource()->toString() + " target = " + edgeIter->getTarget()->toString()); + if((edgeIter->getTarget() == target) && (edgeIter->getSource() == source)) { return edgeIter; } } //Not found - return end. - return m_listEdges.end(); + return m_listEdges.end();*/ + + SurfaceEdge edgeToFind(target,source); + return m_listEdges.find(edgeToFind); } SurfaceEdgeIterator SurfacePatch::findOrAddEdge(const SurfaceVertexIterator& source, const SurfaceVertexIterator& target) { - for(SurfaceEdgeIterator edgeIter = m_listEdges.begin(); edgeIter != m_listEdges.end(); ++edgeIter) + /*for(SurfaceEdgeIterator edgeIter = m_listEdges.begin(); edgeIter != m_listEdges.end(); ++edgeIter) { - if((edgeIter->target == target) && (edgeIter->otherHalfEdge->target == source)) + if((edgeIter->target == target) && (edgeIter->source == source)) { return edgeIter; } + }*/ + + SurfaceEdge edgeToFind(target, source); + SurfaceEdgeIterator foundEdgeIter = m_listEdges.find(edgeToFind); + if(foundEdgeIter != m_listEdges.end()) + { + return foundEdgeIter; } //Not found - add it. - SurfaceEdge edge; - edge.target = target; - SurfaceEdge otherEdge; - otherEdge.target = source; + SurfaceEdge edge(target,source); + SurfaceEdge otherEdge(source, target); - m_listEdges.push_back(edge); + /*m_listEdges.push_back(edge); SurfaceEdgeIterator edgeIter = m_listEdges.end(); - edgeIter--; - //SurfaceEdgeIterator edgeIter = m_listEdges.insert(edge).first; + edgeIter--;*/ + SurfaceEdgeIterator edgeIter = m_listEdges.insert(edge).first; - m_listEdges.push_back(otherEdge); + /*m_listEdges.push_back(otherEdge); SurfaceEdgeIterator otherEdgeIter = m_listEdges.end(); - otherEdgeIter--; - //SurfaceEdgeIterator otherEdgeIter = m_listEdges.insert(edge).first; + otherEdgeIter--;*/ + SurfaceEdgeIterator otherEdgeIter = m_listEdges.insert(otherEdge).first; edgeIter->otherHalfEdge = otherEdgeIter; edgeIter->nextHalfEdge = otherEdgeIter; @@ -275,18 +286,18 @@ namespace Ogre edgeIter = iterTriangles->getEdge(); //LogManager::getSingleton().logMessage("Edge Target " + StringConverter::toString(edgeIter->target->position.x) + "," + StringConverter::toString(edgeIter->target->position.y) + "," + StringConverter::toString(edgeIter->target->position.z)); - iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->target)); + iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->getTarget())); //LogManager::getSingleton().logMessage(""); //LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->getPosition().x) + "," + StringConverter::toString(iterVertex->getPosition().y) + "," + StringConverter::toString(iterVertex->getPosition().z)); indexData.push_back(iterVertex - vertexData.begin()); edgeIter = edgeIter->nextHalfEdge; - iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->target)); + iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->getTarget())); //LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->getPosition().x) + "," + StringConverter::toString(iterVertex->getPosition().y) + "," + StringConverter::toString(iterVertex->getPosition().z)); indexData.push_back(iterVertex - vertexData.begin()); edgeIter = edgeIter->nextHalfEdge; - iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->target)); + iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->getTarget())); //LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->getPosition().x) + "," + StringConverter::toString(iterVertex->getPosition().y) + "," + StringConverter::toString(iterVertex->getPosition().z)); indexData.push_back(iterVertex - vertexData.begin()); @@ -359,7 +370,7 @@ namespace Ogre exit(1); } - result.push_back(nextEdge->target); + result.push_back(nextEdge->getTarget()); previousEdge = nextEdge; nextEdge = nextEdge->previousHalfEdge->otherHalfEdge; @@ -389,7 +400,7 @@ namespace Ogre exit(1); } - result.push_front(nextEdge->target); + result.push_front(nextEdge->getTarget()); previousEdge = nextEdge; nextEdge = nextEdge->otherHalfEdge->nextHalfEdge; @@ -406,6 +417,7 @@ namespace Ogre bool didDecimation = false; //LogManager::getSingleton().logMessage("\n\nPerforming decimation"); //LogManager::getSingleton().logMessage("No of triangles at start = " + StringConverter::toString(m_listTriangles.size())); + //LogManager::getSingleton().logMessage("No of edges at start = " + StringConverter::toString(m_listEdges.size())); //int fixed = 0; //int movable = 0; for(SurfaceVertexIterator vertexIter = m_listVertices.begin(); vertexIter != m_listVertices.end(); ++vertexIter) @@ -435,9 +447,15 @@ namespace Ogre //LogManager::getSingleton().logMessage("Vertex can be removed"); + //std::list edgesToRemove; + for(std::list::iterator iter = listConnectedVertices.begin(); iter != listConnectedVertices.end(); ++iter) { SurfaceEdgeIterator edgeToDelete = findEdge(vertexIter, *iter); + /*if(edgeToDelete == m_listEdges.end()) + { + LogManager::getSingleton().logMessage("Error - Failed to find"); + }*/ SurfaceEdgeIterator otherEdgeToDelete = edgeToDelete->otherHalfEdge; if(edgeToDelete->nextHalfEdge != edgeToDelete->otherHalfEdge) @@ -445,10 +463,20 @@ namespace Ogre m_listTriangles.erase(edgeToDelete->triangle); } + //LogManager::getSingleton().logMessage("Removing edge " + edgeToDelete->toString()); m_listEdges.erase(edgeToDelete); + //LogManager::getSingleton().logMessage("Removing edge " + otherEdgeToDelete->toString()); m_listEdges.erase(otherEdgeToDelete); + //edgesToRemove.push_back(edgeToDelete); + //edgesToRemove.push_back(otherEdgeToDelete); } + /*LogManager::getSingleton().logMessage("Now removing edges"); + for(std::list::iterator iter = edgesToRemove.begin(); iter != edgesToRemove.end(); ++iter) + { + m_listEdges.erase(*iter); + }*/ + //LogManager::getSingleton().logMessage("Removing vertex " + vertexIter->toString()); m_listVertices.erase(vertexIter);