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

Work on mesh decimation.

Browse Source
This commit is contained in:
David Williams 2007-09-20 20:10:25 +00:00
parent 778ac2be9c
commit 00dbe56ef7
5 changed files with 40 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SurfaceEdge.h
View File

@ -35,7 +35,7 @@ namespace Ogre
{ {
public: public:
int crud; //int crud;
SurfaceVertexIterator target; SurfaceVertexIterator target;

2
include/SurfacePatch.h
View File

@ -43,8 +43,6 @@ namespace Ogre
void computeNormalsFromVolume(VolumeIterator volIter); void computeNormalsFromVolume(VolumeIterator volIter);
void computeOtherHalfEdges(void);
#ifdef BLAH #ifdef BLAH
bool decimate(void); bool decimate(void);
bool canCollapseEdge(SurfaceVertex target, SurfaceVertex other); bool canCollapseEdge(SurfaceVertex target, SurfaceVertex other);

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; regionY < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2+1; ++regionY) for(uint regionY = 0; regionY < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++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; regionX < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS/2+1; ++regionX) for(uint regionX = 0; regionX < OGRE_VOLUME_SIDE_LENGTH_IN_REGIONS; ++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)

216
source/SurfacePatch.cpp
View File

@ -47,22 +47,20 @@ 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 > 8) /*if(v0.position.x > 16)
return; return;
if(v0.position.y > 8) if(v0.position.y > 16)
return; return;
if(v1.position.x > 8) if(v1.position.x > 16)
return; return;
if(v1.position.y > 8) if(v1.position.y > 16)
return; return;
if(v2.position.x > 8) if(v2.position.x > 16)
return;
if(v2.position.y > 8)
return; return;
if(v2.position.y > 16)
return;*/
//if(m_uTrianglesAdded > 1) return;
//LogManager::getSingleton().logMessage("Adding Triangle " + StringConverter::toString(m_uTrianglesAdded));
m_uTrianglesAdded++; m_uTrianglesAdded++;
m_uVerticesAdded += 3; m_uVerticesAdded += 3;
@ -71,24 +69,6 @@ namespace Ogre
SurfaceVertexIterator v2Iter = findVertex(v2); SurfaceVertexIterator v2Iter = findVertex(v2);
//LogManager::getSingleton().logMessage("Creating Edges");
/*SurfaceEdge v0v1;
v0v1.target = v1Iter;
SurfaceEdge v1v2;
v1v2.target = v2Iter;
SurfaceEdge v2v0;
v2v0.target = v0Iter;
m_listEdges.push_back(v0v1);
SurfaceEdgeIterator v0v1Iter = m_listEdges.end();
v0v1Iter--;
m_listEdges.push_back(v1v2);
SurfaceEdgeIterator v1v2Iter = m_listEdges.end();
v1v2Iter--;
m_listEdges.push_back(v2v0);
SurfaceEdgeIterator v2v0Iter = m_listEdges.end();
v2v0Iter--;*/
SurfaceEdgeIterator v0v1Iter = findEdge(v0Iter,v1Iter); SurfaceEdgeIterator v0v1Iter = findEdge(v0Iter,v1Iter);
SurfaceEdgeIterator v1v2Iter = findEdge(v1Iter,v2Iter); SurfaceEdgeIterator v1v2Iter = findEdge(v1Iter,v2Iter);
SurfaceEdgeIterator v2v0Iter = findEdge(v2Iter,v0Iter); SurfaceEdgeIterator v2v0Iter = findEdge(v2Iter,v0Iter);
@ -116,10 +96,6 @@ namespace Ogre
v0v1Iter->triangle = iterTriangle; v0v1Iter->triangle = iterTriangle;
v1v2Iter->triangle = iterTriangle; v1v2Iter->triangle = iterTriangle;
v2v0Iter->triangle = iterTriangle; v2v0Iter->triangle = iterTriangle;
/*v0v1Iter->hasTriangle = true;
v1v2Iter->hasTriangle = true;
v2v0Iter->hasTriangle = true;*/
} }
SurfaceVertexIterator SurfacePatch::findVertex(const SurfaceVertex& vertex) SurfaceVertexIterator SurfacePatch::findVertex(const SurfaceVertex& vertex)
@ -302,70 +278,16 @@ namespace Ogre
} }
} }
void SurfacePatch::computeOtherHalfEdges(void)
{
LogManager::getSingleton().logMessage("Computing other half edges");
//Clear all other edges
for(SurfaceEdgeIterator edgeIter = m_listEdges.begin(); edgeIter != m_listEdges.end(); ++edgeIter)
{
edgeIter->otherHalfEdge = m_listEdges.end();
}
//FIXME - speed this up by storing edges in a container which sorts by edge 'target'.
std::list<SurfaceEdge> listAddedEdges;
//Assign all other edges
for(SurfaceEdgeIterator outerEdgeIter = m_listEdges.begin(); outerEdgeIter != m_listEdges.end(); ++outerEdgeIter)
{
bool foundOtherHalf = false;
for(SurfaceEdgeIterator innerEdgeIter = m_listEdges.begin(); innerEdgeIter != m_listEdges.end(); ++innerEdgeIter)
{
if((innerEdgeIter->target == outerEdgeIter->previousHalfEdge->target) && (outerEdgeIter->target == innerEdgeIter->previousHalfEdge->target))
{
innerEdgeIter->otherHalfEdge = outerEdgeIter;
outerEdgeIter->otherHalfEdge = innerEdgeIter;
foundOtherHalf = true;
}
}
if(!foundOtherHalf)
{
SurfaceEdge tempEdge;
tempEdge.otherHalfEdge = outerEdgeIter;
tempEdge.target = outerEdgeIter->nextHalfEdge->nextHalfEdge->target;
listAddedEdges.push_back(tempEdge);
}
}
LogManager::getSingleton().logMessage("No of added edges = " + StringConverter::toString(listAddedEdges.size()));
for(SurfaceEdgeIterator addedEdgeIter = listAddedEdges.begin(); addedEdgeIter != listAddedEdges.end(); ++addedEdgeIter)
{
LogManager::getSingleton().logMessage("Adding new edge");
m_listEdges.push_back(*addedEdgeIter);
SurfaceEdgeIterator justAddedIter = m_listEdges.end();
--justAddedIter;
justAddedIter->otherHalfEdge->otherHalfEdge = justAddedIter;
LogManager::getSingleton().logMessage("Done adding new edge");
}
LogManager::getSingleton().logMessage("Done computing other half edges");
}
bool SurfacePatch::decimate3(void) bool SurfacePatch::decimate3(void)
{ {
bool didDecimation = false; bool didDecimation = false;
LogManager::getSingleton().logMessage("Performing decimation"); //LogManager::getSingleton().logMessage("Performing decimation");
LogManager::getSingleton().logMessage("No of triangles = " + StringConverter::toString(m_listTriangles.size())); //LogManager::getSingleton().logMessage("No of triangles = " + StringConverter::toString(m_listTriangles.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)
{ {
LogManager::getSingleton().logMessage("Examining vertex " + vertexIter->toString()); //LogManager::getSingleton().logMessage("Examining vertex " + vertexIter->toString());
std::list<SurfaceVertexIterator> listConnectedVertices; std::list<SurfaceVertexIterator> listConnectedVertices;
//listConnectedVertices.push_back(vertexIter); //listConnectedVertices.push_back(vertexIter);
@ -400,7 +322,7 @@ namespace Ogre
bool allXMatch = true; bool allXMatch = true;
bool allYMatch = true; bool allYMatch = true;
bool allZMatch = true; bool allZMatch = true;
LogManager::getSingleton().logMessage("Checking connected vertices"); //LogManager::getSingleton().logMessage("Checking connected vertices");
for(std::list<SurfaceVertexIterator>::iterator connectedVertexIter = listConnectedVertices.begin(); connectedVertexIter != listConnectedVertices.end(); ++connectedVertexIter) for(std::list<SurfaceVertexIterator>::iterator connectedVertexIter = listConnectedVertices.begin(); connectedVertexIter != listConnectedVertices.end(); ++connectedVertexIter)
{ {
if((*connectedVertexIter)->position.x != vertexIter->position.x) if((*connectedVertexIter)->position.x != vertexIter->position.x)
@ -419,133 +341,63 @@ namespace Ogre
if((allXMatch) || (allYMatch) || (allZMatch)) if((allXMatch) || (allYMatch) || (allZMatch))
{ {
LogManager::getSingleton().logMessage(" All flat"); //LogManager::getSingleton().logMessage(" All flat");
nextEdge = firstEdge; nextEdge = firstEdge;
std::list<SurfaceEdgeIterator> edgesToRemove; std::list<SurfaceEdgeIterator> edgesToRemove;
std::list<SurfaceEdgeIterator> edgesFormingPolygon; //std::list<SurfaceEdgeIterator> edgesFormingPolygon;
do do
{ {
LogManager::getSingleton().logMessage("Removing triangle"); //LogManager::getSingleton().logMessage("Removing triangle");
m_listTriangles.erase(nextEdge->triangle); m_listTriangles.erase(nextEdge->triangle);
edgesToRemove.push_back(nextEdge); edgesToRemove.push_back(nextEdge);
edgesFormingPolygon.push_back(nextEdge->nextHalfEdge); //edgesFormingPolygon.push_back(nextEdge->nextHalfEdge);
nextEdge = nextEdge->previousHalfEdge; nextEdge = nextEdge->previousHalfEdge;
edgesToRemove.push_back(nextEdge); edgesToRemove.push_back(nextEdge);
nextEdge = nextEdge->otherHalfEdge; nextEdge = nextEdge->otherHalfEdge;
}while(nextEdge != firstEdge); }while(nextEdge != firstEdge);
//nextEdge = firstEdge;
//std::list<SurfaceEdgeIterator> edgesFormingPolygon;
/*do
{
LogManager::getSingleton().logMessage("Adding Edges To Remove");
edgesToRemove.push_back(nextEdge);
nextEdge = nextEdge->nextHalfEdge;
//edgesFormingPolygon.push_back(nextEdge);
nextEdge = nextEdge->nextHalfEdge;
edgesToRemove.push_back(nextEdge);
nextEdge = nextEdge->otherHalfEdge;
}while(nextEdge != firstEdge);*/
for(std::list<SurfaceEdgeIterator>::iterator edgesToRemoveIter = edgesToRemove.begin(); edgesToRemoveIter != edgesToRemove.end(); ++edgesToRemoveIter) for(std::list<SurfaceEdgeIterator>::iterator edgesToRemoveIter = edgesToRemove.begin(); edgesToRemoveIter != edgesToRemove.end(); ++edgesToRemoveIter)
{ {
m_listEdges.erase(*edgesToRemoveIter); m_listEdges.erase(*edgesToRemoveIter);
} }
LogManager::getSingleton().logMessage("Removing vertex " + vertexIter->toString()); //LogManager::getSingleton().logMessage("Removing vertex " + vertexIter->toString());
m_listVertices.erase(vertexIter); m_listVertices.erase(vertexIter);
//Now triangulate... //Now triangulate...
LogManager::getSingleton().logMessage("Doing triangulation"); //LogManager::getSingleton().logMessage("Doing triangulation");
//std::list<SurfaceEdgeIterator>::iterator firstEdgeIter = edgesFormingPolygon.begin(); //std::list<SurfaceEdgeIterator>::iterator firstEdgeIter = edgesFormingPolygon.begin();
std::list<SurfaceEdgeIterator>::iterator secondEdgeIter = edgesFormingPolygon.begin(); //std::list<SurfaceEdgeIterator>::iterator secondEdgeIter = edgesFormingPolygon.begin();
SurfaceEdgeIterator lastAddedEdge = (*edgesFormingPolygon.begin()); //SurfaceEdgeIterator lastAddedEdge = (*edgesFormingPolygon.begin());
//++firstEdgeIter; std::list<SurfaceVertexIterator>::iterator v0IterIter = listConnectedVertices.begin();
//++secondEdgeIter; std::list<SurfaceVertexIterator>::iterator v1IterIter = listConnectedVertices.begin();
++secondEdgeIter; std::list<SurfaceVertexIterator>::iterator v2IterIter = listConnectedVertices.begin();
++v1IterIter;
std::list<SurfaceEdgeIterator>::iterator endEdgeIter = edgesFormingPolygon.end(); ++v2IterIter;
--endEdgeIter; ++v2IterIter;
--endEdgeIter; while(v2IterIter != listConnectedVertices.end())
while(secondEdgeIter != endEdgeIter)
{ {
SurfaceEdge newEdge; SurfaceVertexIterator v0Iter = *v0IterIter;
newEdge.target = (lastAddedEdge)->otherHalfEdge->target; SurfaceVertexIterator v1Iter = *v1IterIter;
newEdge.nextHalfEdge = (lastAddedEdge); SurfaceVertexIterator v2Iter = *v2IterIter;
newEdge.previousHalfEdge = (*secondEdgeIter);
m_listEdges.push_back(newEdge);
SurfaceEdgeIterator newEdgeIter = m_listEdges.end(); addTriangle(*v0Iter, *v1Iter, *v2Iter);
--newEdgeIter;
(lastAddedEdge)->nextHalfEdge = (*secondEdgeIter); ++v1IterIter;
(lastAddedEdge)->previousHalfEdge = (newEdgeIter); ++v2IterIter;
(*secondEdgeIter)->nextHalfEdge = (newEdgeIter);
(*secondEdgeIter)->previousHalfEdge = (lastAddedEdge);
SurfaceEdge otherNewEdge;
m_listEdges.push_back(otherNewEdge);
SurfaceEdgeIterator otherNewEdgeIter = m_listEdges.end();
--otherNewEdgeIter;
otherNewEdgeIter->target = (*secondEdgeIter)->target;
otherNewEdgeIter->otherHalfEdge = newEdgeIter;
newEdgeIter->otherHalfEdge = otherNewEdgeIter;
SurfaceTriangle triangle;
m_listTriangles.push_back(triangle);
SurfaceTriangleIterator iterTriangle = m_listTriangles.end();
iterTriangle--;
iterTriangle->edge = lastAddedEdge;
lastAddedEdge->triangle = iterTriangle;
(*secondEdgeIter)->triangle = iterTriangle;
newEdgeIter->triangle = iterTriangle;
/*lastAddedEdge->hasTriangle = true;
(*secondEdgeIter)->hasTriangle = true;
newEdgeIter->hasTriangle = true;*/
//++firstEdgeIter;
++secondEdgeIter;
lastAddedEdge = otherNewEdgeIter;
} }
++endEdgeIter;
lastAddedEdge->nextHalfEdge = (*secondEdgeIter);
(*secondEdgeIter)->nextHalfEdge = (*endEdgeIter);
(*endEdgeIter)->nextHalfEdge = lastAddedEdge;
lastAddedEdge->previousHalfEdge = (*endEdgeIter);
(*endEdgeIter)->previousHalfEdge = (*secondEdgeIter);
(*secondEdgeIter)->previousHalfEdge = lastAddedEdge;
SurfaceTriangle triangle;
m_listTriangles.push_back(triangle);
SurfaceTriangleIterator iterTriangle = m_listTriangles.end();
iterTriangle--;
iterTriangle->edge = lastAddedEdge;
lastAddedEdge->triangle = iterTriangle;
(*secondEdgeIter)->triangle = iterTriangle;
(*endEdgeIter)->triangle = iterTriangle;
/*lastAddedEdge->hasTriangle = true;
(*secondEdgeIter)->hasTriangle = true;
(*endEdgeIter)->hasTriangle = true;*/
didDecimation = true; didDecimation = true;
break; break;
} }
} }
//LogManager::getSingleton().logMessage("Fixed = " + StringConverter::toString(fixed) + " Movable = " + StringConverter::toString(movable)); //LogManager::getSingleton().logMessage("Fixed = " + StringConverter::toString(fixed) + " Movable = " + StringConverter::toString(movable));
LogManager::getSingleton().logMessage("Done decimation"); //LogManager::getSingleton().logMessage("Done decimation");
LogManager::getSingleton().logMessage("No of triangles = " + StringConverter::toString(m_listTriangles.size())); //LogManager::getSingleton().logMessage("No of triangles = " + StringConverter::toString(m_listTriangles.size()));
return didDecimation; return didDecimation;
} }

6
source/VolumeSerializer.cpp
View File

@ -61,10 +61,10 @@ namespace Ogre
volIter.setVoxelAt(x,y,z,value); volIter.setVoxelAt(x,y,z,value);
if(z < 24) if(z < 24)
{ {
//if(x % 32 < 16) if(x % 32 < 16)
volIter.setVoxelAt(x,y,z,4); volIter.setVoxelAt(x,y,z,4);
/*else else
volIter.setVoxelAt(x,y,z,5);*/ volIter.setVoxelAt(x,y,z,5);
} }
else else
volIter.setVoxelAt(x,y,z,0); volIter.setVoxelAt(x,y,z,0);