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-23 17:09:57 +00:00
parent 27f98b2b6a
commit 35c399202f
3 changed files with 13 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SurfacePatch.h
View File

@ -49,7 +49,7 @@ namespace Ogre
std::list<SurfaceVertexIterator> findConnectedVertices(SurfaceVertexIterator vertexIter, bool& isEdge); std::list<SurfaceVertexIterator> findConnectedVertices(SurfaceVertexIterator vertexIter, bool& isEdge);
bool decimateOneVertex(void); bool decimateOneVertex(void);
void triangulate(std::list<SurfaceVertexIterator> listVertices); void triangulate(std::list<SurfaceVertexIterator> listVertices);
bool isPolygonConvex(std::list<SurfaceVertexIterator> listVertices); bool isPolygonConvex(std::list<SurfaceVertexIterator> listVertices, Vector3 normal);
UIntVector3 m_v3dOffset; UIntVector3 m_v3dOffset;

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

107
source/SurfacePatch.cpp
View File

@ -275,26 +275,20 @@ namespace Ogre
edgeIter = iterTriangles->edge; edgeIter = iterTriangles->edge;
//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->target));
Vector3 v0 = (*(edgeIter->target)).position.toOgreVector3();
LogManager::getSingleton().logMessage(""); LogManager::getSingleton().logMessage("");
LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.z)); LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.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->target));
Vector3 v1 = (*(edgeIter->target)).position.toOgreVector3();
LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.z)); LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.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->target));
Vector3 v2 = (*(edgeIter->target)).position.toOgreVector3();
LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.z)); LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.z));
indexData.push_back(iterVertex - vertexData.begin()); indexData.push_back(iterVertex - vertexData.begin());
Vector3 cross = (v0-v1).crossProduct(v2-v1);
LogManager::getSingleton().logMessage("Cross = " + StringConverter::toString(cross));
//LogManager::getSingleton().logMessage("End Triangle"); //LogManager::getSingleton().logMessage("End Triangle");
} }
} }
@ -422,18 +416,18 @@ namespace Ogre
listConnectedVertices.remove(vertexIter); listConnectedVertices.remove(vertexIter);
listConnectedVertices.unique(); listConnectedVertices.unique();
LogManager::getSingleton().logMessage("No of connected vertices = " + StringConverter::toString(listConnectedVertices.size())); /*LogManager::getSingleton().logMessage("No of connected vertices = " + StringConverter::toString(listConnectedVertices.size()));
for(std::list<SurfaceVertexIterator>::iterator iter = listConnectedVertices.begin(); iter != listConnectedVertices.end(); ++iter) for(std::list<SurfaceVertexIterator>::iterator iter = listConnectedVertices.begin(); iter != listConnectedVertices.end(); ++iter)
{ {
LogManager::getSingleton().logMessage(" Connected vertex = " + (*iter)->toString()); LogManager::getSingleton().logMessage(" Connected vertex = " + (*iter)->toString());
} }*/
if(canRemoveVertexFrom(vertexIter, listConnectedVertices, isEdge) == false) if(canRemoveVertexFrom(vertexIter, listConnectedVertices, isEdge) == false)
{ {
continue; continue;
} }
if(isPolygonConvex(listConnectedVertices) == false) if(isPolygonConvex(listConnectedVertices, vertexIter->normal) == false)
{ {
continue; continue;
} }
@ -497,8 +491,9 @@ namespace Ogre
} }
} }
bool SurfacePatch::isPolygonConvex(std::list<SurfaceVertexIterator> listVertices) bool SurfacePatch::isPolygonConvex(std::list<SurfaceVertexIterator> listVertices, Vector3 normal)
{ {
normal.normalise(); //FIXME - don't need this?
std::list<SurfaceVertexIterator>::iterator v0IterIter = listVertices.begin(); std::list<SurfaceVertexIterator>::iterator v0IterIter = listVertices.begin();
std::list<SurfaceVertexIterator>::iterator v1IterIter = listVertices.begin(); std::list<SurfaceVertexIterator>::iterator v1IterIter = listVertices.begin();
std::list<SurfaceVertexIterator>::iterator v2IterIter = listVertices.begin(); std::list<SurfaceVertexIterator>::iterator v2IterIter = listVertices.begin();
@ -513,10 +508,12 @@ namespace Ogre
Vector3 v1tov0(v0Iter->position.toOgreVector3() -v1Iter->position.toOgreVector3()); Vector3 v1tov0(v0Iter->position.toOgreVector3() -v1Iter->position.toOgreVector3());
Vector3 v1tov2(v2Iter->position.toOgreVector3() -v1Iter->position.toOgreVector3()); Vector3 v1tov2(v2Iter->position.toOgreVector3() -v1Iter->position.toOgreVector3());
Vector3 cross = (v1tov0).crossProduct(v1tov2); Vector3 cross = (v1tov2).crossProduct(v1tov0);
LogManager::getSingleton().logMessage("Cross = " + StringConverter::toString(cross)); cross.normalise();
if(cross.z > 0.0) //LogManager::getSingleton().logMessage("Cross = " + StringConverter::toString(cross));
if(cross.dotProduct(normal) < 0.99)
{ {
return false; return false;
} }
@ -527,88 +524,4 @@ namespace Ogre
return true; return true;
} }
/*bool SurfacePatch::isPolygonConvex(std::list<SurfaceVertexIterator> listVertices)
{
std::list<SurfaceVertexIterator>::iterator v0IterIter = listVertices.begin();
std::list<SurfaceVertexIterator>::iterator v1IterIter = listVertices.begin();
++v1IterIter;
while(v1IterIter != listVertices.end())
{
SurfaceVertexIterator v0Iter = *v0IterIter;
SurfaceVertexIterator v1Iter = *v1IterIter;
Vector3 currentEdge = v1Iter->position.toOgreVector3() - v0Iter->position.toOgreVector3();
for(std::list<SurfaceVertexIterator>::iterator currentVertex = listVertices.begin(); currentVertex != listVertices.end(); ++currentVertex)
{
if((currentVertex == v0IterIter) || (currentVertex == v1IterIter))
{
continue;
}
Vector3 v0ToCurrent = (*currentVertex)->position.toOgreVector3() - v0Iter->position.toOgreVector3();
if(currentEdge.)
}
++v0IterIter;
++v1IterIter;
}
return true;
}*/
/*bool SurfacePatch::isPolygonConvex(std::list<SurfaceVertexIterator> listVertices)
{
if(listVertices.size() < 3)
{
LogManager::getSingleton().logMessage("Not enough vertices!");
return false;
}
std::list<SurfaceVertexIterator>::iterator v0IterIter = listVertices.begin();
std::list<SurfaceVertexIterator>::iterator v1IterIter = listVertices.begin();
std::list<SurfaceVertexIterator>::iterator v2IterIter = listVertices.begin();
++v1IterIter;
++v2IterIter;
++v2IterIter;
SurfaceVertexIterator v0Iter = *v0IterIter;
SurfaceVertexIterator v1Iter = *v1IterIter;
SurfaceVertexIterator v2Iter = *v2IterIter;
Vector3 v0tov1 = v1Iter->position.toOgreVector3() - v0Iter->position.toOgreVector3();
Vector3 v1tov2 = v2Iter->position.toOgreVector3() - v1Iter->position.toOgreVector3();
Vector3 firstCrossProduct = v0tov1.crossProduct(v1tov2);
firstCrossProduct.normalise();
++v0IterIter;
++v1IterIter;
++v2IterIter;
while(v2IterIter != listVertices.end())
{
v0Iter = *v0IterIter;
v1Iter = *v1IterIter;
v2Iter = *v2IterIter;
v0tov1 = v1Iter->position.toOgreVector3() - v0Iter->position.toOgreVector3();
v1tov2 = v2Iter->position.toOgreVector3() - v1Iter->position.toOgreVector3();
Vector3 currentCrossProduct = v0tov1.crossProduct(v1tov2);
currentCrossProduct.normalise();
if(firstCrossProduct.dotProduct(currentCrossProduct) < 0.99)
{
return false;
}
++v0IterIter;
++v1IterIter;
++v2IterIter;
}
return true;
}*/
} }