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

Cleaning up decimation, moving to sets.

Browse Source
This commit is contained in:
David Williams 2007-09-24 23:13:55 +00:00
parent cabc988625
commit c79845f6fd
7 changed files with 87 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/SurfaceEdge.h
View File

@ -29,18 +29,17 @@ namespace Ogre
class SurfaceTriangle; class SurfaceTriangle;
typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator; typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator;
class SurfaceEdge; class SurfaceEdge;
typedef std::list<SurfaceEdge>::iterator SurfaceEdgeIterator; typedef std::set<SurfaceEdge>::iterator SurfaceEdgeIterator;
class SurfaceEdge class SurfaceEdge
{ {
public: 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);
friend bool operator < (const SurfaceEdge& lhs, const SurfaceEdge& rhs); friend bool operator < (const SurfaceEdge& lhs, const SurfaceEdge& rhs);
//int crud; //int crud;
SurfaceVertexIterator target;
SurfaceTriangleIterator triangle; SurfaceTriangleIterator triangle;
@ -55,6 +54,20 @@ namespace Ogre
std::string toString(void); std::string toString(void);
bool isDegenerate(void); bool isDegenerate(void);
const SurfaceVertexIterator& getTarget(void)
{
return target;
}
const SurfaceVertexIterator& getSource(void)
{
return source;
}
private:
SurfaceVertexIterator target;
SurfaceVertexIterator source;
}; };
} }

4
include/SurfacePatch.h
View File

@ -23,7 +23,7 @@ namespace Ogre
class SurfaceTriangle; class SurfaceTriangle;
typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator; typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator;
class SurfaceEdge; class SurfaceEdge;
typedef std::list<SurfaceEdge>::iterator SurfaceEdgeIterator; typedef std::set<SurfaceEdge>::iterator SurfaceEdgeIterator;
class SurfacePatch class SurfacePatch
{ {
@ -57,7 +57,7 @@ namespace Ogre
private: private:
std::set<SurfaceVertex> m_listVertices; std::set<SurfaceVertex> m_listVertices;
std::set<SurfaceTriangle> m_listTriangles; std::set<SurfaceTriangle> m_listTriangles;
std::list<SurfaceEdge> m_listEdges; std::set<SurfaceEdge> m_listEdges;
//std::vector<SurfaceVertex> m_vecVertexData; //std::vector<SurfaceVertex> m_vecVertexData;
//std::vector<uint> m_vecIndexData; //std::vector<uint> m_vecIndexData;

2
include/SurfaceTriangle.h
View File

@ -29,7 +29,7 @@ namespace Ogre
class SurfaceTriangle; class SurfaceTriangle;
typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator; typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator;
class SurfaceEdge; class SurfaceEdge;
typedef std::list<SurfaceEdge>::iterator SurfaceEdgeIterator; typedef std::set<SurfaceEdge>::iterator SurfaceEdgeIterator;
class SurfaceTriangle class SurfaceTriangle
{ {

2
include/SurfaceVertex.h
View File

@ -32,7 +32,7 @@ namespace Ogre
class SurfaceTriangle; class SurfaceTriangle;
typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator; typedef std::set<SurfaceTriangle>::iterator SurfaceTriangleIterator;
class SurfaceEdge; class SurfaceEdge;
typedef std::list<SurfaceEdge>::iterator SurfaceEdgeIterator; typedef std::set<SurfaceEdge>::iterator SurfaceEdgeIterator;
class SurfaceVertex class SurfaceVertex
{ {

4
source/PolyVoxSceneManager.cpp
View File

@ -324,10 +324,10 @@ namespace Ogre
for(uint regionZ = 0; regionZ < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++regionZ) for(uint regionZ = 0; regionZ < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++regionZ)
{ {
LogManager::getSingleton().logMessage("regionZ = " + StringConverter::toString(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)); //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)); //LogManager::getSingleton().logMessage("regionX = " + StringConverter::toString(regionX));
if(surfaceUpToDate[regionX][regionY][regionZ] == false) if(surfaceUpToDate[regionX][regionY][regionZ] == false)

16
source/SurfaceEdge.cpp
View File

@ -4,10 +4,16 @@
namespace Ogre namespace Ogre
{ {
SurfaceEdge::SurfaceEdge(const SurfaceVertexIterator& targetToSet,const SurfaceVertexIterator& sourceToSet)
{
target = targetToSet;
source = sourceToSet;
}
std::string SurfaceEdge::toString(void) std::string SurfaceEdge::toString(void)
{ {
std::stringstream ss; 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(); return ss.str();
} }
@ -16,13 +22,13 @@ namespace Ogre
return return
( (
((*lhs.target) == (*rhs.target)) && ((*lhs.target) == (*rhs.target)) &&
((*lhs.otherHalfEdge->target) == (*rhs.otherHalfEdge->target)) ((*lhs.source) == (*rhs.source))
); );
} }
bool SurfaceEdge::isDegenerate(void) bool SurfaceEdge::isDegenerate(void)
{ {
return (target == otherHalfEdge->target); return (target == source);
} }
bool operator < (const SurfaceEdge& lhs, const SurfaceEdge& rhs) bool operator < (const SurfaceEdge& lhs, const SurfaceEdge& rhs)
@ -32,9 +38,9 @@ namespace Ogre
if ((*rhs.target) < (*lhs.target)) if ((*rhs.target) < (*lhs.target))
return false; return false;
if ((*lhs.otherHalfEdge->target) < (*rhs.otherHalfEdge->target)) if ((*lhs.source) < (*rhs.source))
return true; return true;
if ((*rhs.otherHalfEdge->target) < (*lhs.otherHalfEdge->target)) if ((*rhs.source) < (*lhs.source))
return false; return false;
return false; return false;

78
source/SurfacePatch.cpp
View File

@ -47,17 +47,17 @@ namespace Ogre
void SurfacePatch::addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2) void SurfacePatch::addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2)
{ {
/*if(v0.position.x > 16) /*if(v0.getPosition().x > 4)
return; return;
if(v0.position.y > 16) if(v0.getPosition().y > 4)
return; return;
if(v1.position.x > 16) if(v1.getPosition().x > 4)
return; return;
if(v1.position.y > 16) if(v1.getPosition().y > 4)
return; return;
if(v2.position.x > 16) if(v2.getPosition().x > 4)
return; return;
if(v2.position.y > 16) if(v2.getPosition().y > 4)
return;*/ return;*/
@ -117,43 +117,54 @@ namespace Ogre
SurfaceEdgeIterator SurfacePatch::findEdge(const SurfaceVertexIterator& source, const SurfaceVertexIterator& target) 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) 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; return edgeIter;
} }
} }
//Not found - return end. //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) 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; return edgeIter;
} }
}*/
SurfaceEdge edgeToFind(target, source);
SurfaceEdgeIterator foundEdgeIter = m_listEdges.find(edgeToFind);
if(foundEdgeIter != m_listEdges.end())
{
return foundEdgeIter;
} }
//Not found - add it. //Not found - add it.
SurfaceEdge edge; SurfaceEdge edge(target,source);
edge.target = target; SurfaceEdge otherEdge(source, target);
SurfaceEdge otherEdge;
otherEdge.target = source;
m_listEdges.push_back(edge); /*m_listEdges.push_back(edge);
SurfaceEdgeIterator edgeIter = m_listEdges.end(); SurfaceEdgeIterator edgeIter = m_listEdges.end();
edgeIter--; edgeIter--;*/
//SurfaceEdgeIterator edgeIter = m_listEdges.insert(edge).first; SurfaceEdgeIterator edgeIter = m_listEdges.insert(edge).first;
m_listEdges.push_back(otherEdge); /*m_listEdges.push_back(otherEdge);
SurfaceEdgeIterator otherEdgeIter = m_listEdges.end(); SurfaceEdgeIterator otherEdgeIter = m_listEdges.end();
otherEdgeIter--; otherEdgeIter--;*/
//SurfaceEdgeIterator otherEdgeIter = m_listEdges.insert(edge).first; SurfaceEdgeIterator otherEdgeIter = m_listEdges.insert(otherEdge).first;
edgeIter->otherHalfEdge = otherEdgeIter; edgeIter->otherHalfEdge = otherEdgeIter;
edgeIter->nextHalfEdge = otherEdgeIter; edgeIter->nextHalfEdge = otherEdgeIter;
@ -275,18 +286,18 @@ namespace Ogre
edgeIter = iterTriangles->getEdge(); 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)); //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("");
//LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->getPosition().x) + "," + StringConverter::toString(iterVertex->getPosition().y) + "," + StringConverter::toString(iterVertex->getPosition().z)); //LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->getPosition().x) + "," + StringConverter::toString(iterVertex->getPosition().y) + "," + StringConverter::toString(iterVertex->getPosition().z));
indexData.push_back(iterVertex - vertexData.begin()); indexData.push_back(iterVertex - vertexData.begin());
edgeIter = edgeIter->nextHalfEdge; 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)); //LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->getPosition().x) + "," + StringConverter::toString(iterVertex->getPosition().y) + "," + StringConverter::toString(iterVertex->getPosition().z));
indexData.push_back(iterVertex - vertexData.begin()); indexData.push_back(iterVertex - vertexData.begin());
edgeIter = edgeIter->nextHalfEdge; 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)); //LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->getPosition().x) + "," + StringConverter::toString(iterVertex->getPosition().y) + "," + StringConverter::toString(iterVertex->getPosition().z));
indexData.push_back(iterVertex - vertexData.begin()); indexData.push_back(iterVertex - vertexData.begin());
@ -359,7 +370,7 @@ namespace Ogre
exit(1); exit(1);
} }
result.push_back(nextEdge->target); result.push_back(nextEdge->getTarget());
previousEdge = nextEdge; previousEdge = nextEdge;
nextEdge = nextEdge->previousHalfEdge->otherHalfEdge; nextEdge = nextEdge->previousHalfEdge->otherHalfEdge;
@ -389,7 +400,7 @@ namespace Ogre
exit(1); exit(1);
} }
result.push_front(nextEdge->target); result.push_front(nextEdge->getTarget());
previousEdge = nextEdge; previousEdge = nextEdge;
nextEdge = nextEdge->otherHalfEdge->nextHalfEdge; nextEdge = nextEdge->otherHalfEdge->nextHalfEdge;
@ -406,6 +417,7 @@ namespace Ogre
bool didDecimation = false; bool didDecimation = false;
//LogManager::getSingleton().logMessage("\n\nPerforming decimation"); //LogManager::getSingleton().logMessage("\n\nPerforming decimation");
//LogManager::getSingleton().logMessage("No of triangles at start = " + StringConverter::toString(m_listTriangles.size())); //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 fixed = 0;
//int movable = 0; //int movable = 0;
for(SurfaceVertexIterator vertexIter = m_listVertices.begin(); vertexIter != m_listVertices.end(); ++vertexIter) for(SurfaceVertexIterator vertexIter = m_listVertices.begin(); vertexIter != m_listVertices.end(); ++vertexIter)
@ -435,9 +447,15 @@ namespace Ogre
//LogManager::getSingleton().logMessage("Vertex can be removed"); //LogManager::getSingleton().logMessage("Vertex can be removed");
//std::list<SurfaceEdgeIterator> edgesToRemove;
for(std::list<SurfaceVertexIterator>::iterator iter = listConnectedVertices.begin(); iter != listConnectedVertices.end(); ++iter) for(std::list<SurfaceVertexIterator>::iterator iter = listConnectedVertices.begin(); iter != listConnectedVertices.end(); ++iter)
{ {
SurfaceEdgeIterator edgeToDelete = findEdge(vertexIter, *iter); SurfaceEdgeIterator edgeToDelete = findEdge(vertexIter, *iter);
/*if(edgeToDelete == m_listEdges.end())
{
LogManager::getSingleton().logMessage("Error - Failed to find");
}*/
SurfaceEdgeIterator otherEdgeToDelete = edgeToDelete->otherHalfEdge; SurfaceEdgeIterator otherEdgeToDelete = edgeToDelete->otherHalfEdge;
if(edgeToDelete->nextHalfEdge != edgeToDelete->otherHalfEdge) if(edgeToDelete->nextHalfEdge != edgeToDelete->otherHalfEdge)
@ -445,10 +463,20 @@ namespace Ogre
m_listTriangles.erase(edgeToDelete->triangle); m_listTriangles.erase(edgeToDelete->triangle);
} }
//LogManager::getSingleton().logMessage("Removing edge " + edgeToDelete->toString());
m_listEdges.erase(edgeToDelete); m_listEdges.erase(edgeToDelete);
//LogManager::getSingleton().logMessage("Removing edge " + otherEdgeToDelete->toString());
m_listEdges.erase(otherEdgeToDelete); m_listEdges.erase(otherEdgeToDelete);
//edgesToRemove.push_back(edgeToDelete);
//edgesToRemove.push_back(otherEdgeToDelete);
} }
/*LogManager::getSingleton().logMessage("Now removing edges");
for(std::list<SurfaceEdgeIterator>::iterator iter = edgesToRemove.begin(); iter != edgesToRemove.end(); ++iter)
{
m_listEdges.erase(*iter);
}*/
//LogManager::getSingleton().logMessage("Removing vertex " + vertexIter->toString()); //LogManager::getSingleton().logMessage("Removing vertex " + vertexIter->toString());
m_listVertices.erase(vertexIter); m_listVertices.erase(vertexIter);