Switched to Half-Edge based data structure for meshes.
This commit is contained in:
David Williams
@ -3,6 +3,7 @@
|
||||
|
||||
#include "SurfaceVertex.h"
|
||||
#include "SurfaceTriangle.h"
|
||||
#include "SurfaceEdge.h"
|
||||
|
||||
#include "OgreLogManager.h"
|
||||
#include "OgreStringConverter.h"
|
||||
@ -13,8 +14,9 @@ namespace Ogre
|
||||
{
|
||||
SurfacePatch::SurfacePatch()
|
||||
{
|
||||
m_setVertices.clear();
|
||||
m_setTriangles.clear();
|
||||
m_listVertices.clear();
|
||||
m_listTriangles.clear();
|
||||
m_listEdges.clear();
|
||||
|
||||
m_uTrianglesAdded = 0;
|
||||
m_uVerticesAdded = 0;
|
||||
@ -42,27 +44,88 @@ namespace Ogre
|
||||
|
||||
void SurfacePatch::addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2)
|
||||
{
|
||||
//if(m_uTrianglesAdded > 1) return;
|
||||
//LogManager::getSingleton().logMessage("Adding Triangle " + StringConverter::toString(m_uTrianglesAdded));
|
||||
m_uTrianglesAdded++;
|
||||
m_uVerticesAdded += 3;
|
||||
|
||||
m_uVerticesAdded += 3;
|
||||
|
||||
SurfaceVertexIterator v0Iter = find(m_listVertices.begin(), m_listVertices.end(), v0);
|
||||
if(v0Iter == m_listVertices.end())
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Adding Vertex " + StringConverter::toString(v0.position.x) + "," + StringConverter::toString(v0.position.y) + "," + StringConverter::toString(v0.position.z));
|
||||
m_listVertices.push_back(v0);
|
||||
v0Iter = m_listVertices.end();
|
||||
v0Iter--;
|
||||
}
|
||||
//else
|
||||
//LogManager::getSingleton().logMessage("Already Exists " + StringConverter::toString(v0.position.x) + "," + StringConverter::toString(v0.position.y) + "," + StringConverter::toString(v0.position.z));
|
||||
|
||||
SurfaceVertexIterator v1Iter = find(m_listVertices.begin(), m_listVertices.end(), v1);
|
||||
if(v1Iter == m_listVertices.end())
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Adding Vertex " + StringConverter::toString(v1.position.x) + "," + StringConverter::toString(v1.position.y) + "," + StringConverter::toString(v1.position.z));
|
||||
m_listVertices.push_back(v1);
|
||||
v1Iter = m_listVertices.end();
|
||||
v1Iter--;
|
||||
}
|
||||
//else
|
||||
//LogManager::getSingleton().logMessage("Already Exists " + StringConverter::toString(v1.position.x) + "," + StringConverter::toString(v1.position.y) + "," + StringConverter::toString(v1.position.z));
|
||||
|
||||
SurfaceVertexIterator v2Iter = find(m_listVertices.begin(), m_listVertices.end(), v2);
|
||||
if(v2Iter == m_listVertices.end())
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Adding Vertex " + StringConverter::toString(v2.position.x) + "," + StringConverter::toString(v2.position.y) + "," + StringConverter::toString(v2.position.z));
|
||||
m_listVertices.push_back(v2);
|
||||
v2Iter = m_listVertices.end();
|
||||
v2Iter--;
|
||||
}
|
||||
//else
|
||||
//LogManager::getSingleton().logMessage("Already Exists " + StringConverter::toString(v2.position.x) + "," + StringConverter::toString(v2.position.y) + "," + StringConverter::toString(v2.position.z));
|
||||
|
||||
//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--;
|
||||
|
||||
v0Iter->edge = v0v1Iter;
|
||||
v1Iter->edge = v1v2Iter;
|
||||
v2Iter->edge = v2v0Iter;
|
||||
|
||||
v0v1Iter->nextHalfEdge = v1v2Iter;
|
||||
v1v2Iter->nextHalfEdge = v2v0Iter;
|
||||
v2v0Iter->nextHalfEdge = v0v1Iter;
|
||||
|
||||
SurfaceTriangle triangle;
|
||||
|
||||
triangle.v0 = m_setVertices.insert(v0).first;
|
||||
triangle.v1 = m_setVertices.insert(v1).first;
|
||||
triangle.v2 = m_setVertices.insert(v2).first;
|
||||
triangle.edge = v0v1Iter;
|
||||
|
||||
SurfaceTriangleIterator iterTriangle = m_setTriangles.insert(triangle).first;
|
||||
m_listTriangles.push_back(triangle);
|
||||
SurfaceTriangleIterator iterTriangle = m_listTriangles.end();
|
||||
iterTriangle--;
|
||||
|
||||
triangle.v0->listTrianglesUsingThisVertex.push_back(iterTriangle);
|
||||
triangle.v1->listTrianglesUsingThisVertex.push_back(iterTriangle);
|
||||
triangle.v2->listTrianglesUsingThisVertex.push_back(iterTriangle);
|
||||
v0v1Iter->triangle = iterTriangle;
|
||||
v1v2Iter->triangle = iterTriangle;
|
||||
v2v0Iter->triangle = iterTriangle;
|
||||
}
|
||||
|
||||
void SurfacePatch::computeNormalsFromVolume(VolumeIterator volIter)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("In SurfacePatch::computeNormalsFromVolume");
|
||||
for(SurfaceVertexIterator vertexIter = m_setVertices.begin(); vertexIter != m_setVertices.end(); ++vertexIter)
|
||||
for(SurfaceVertexIterator vertexIter = m_listVertices.begin(); vertexIter != m_listVertices.end(); ++vertexIter)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("In Loop");
|
||||
const float posX = (vertexIter->position.x + m_v3dOffset.x) / 2.0f;
|
||||
@ -152,6 +215,47 @@ namespace Ogre
|
||||
vertexData.clear();
|
||||
indexData.clear();
|
||||
|
||||
vertexData.resize(m_listVertices.size());
|
||||
std::copy(m_listVertices.begin(), m_listVertices.end(), vertexData.begin());
|
||||
|
||||
/*LogManager::getSingleton().logMessage("----------Vertex Data----------");
|
||||
for(std::vector<SurfaceVertex>::iterator vertexIter = vertexData.begin(); vertexIter != vertexData.end(); ++vertexIter)
|
||||
{
|
||||
LogManager::getSingleton().logMessage(StringConverter::toString(vertexIter->position.x) + "," + StringConverter::toString(vertexIter->position.y) + "," + StringConverter::toString(vertexIter->position.z));
|
||||
}
|
||||
LogManager::getSingleton().logMessage("----------End Vertex Data----------");*/
|
||||
|
||||
for(SurfaceTriangleIterator iterTriangles = m_listTriangles.begin(); iterTriangles != m_listTriangles.end(); ++iterTriangles)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Begin Triangle:");
|
||||
std::vector<SurfaceVertex>::iterator iterVertex;
|
||||
SurfaceEdgeIterator edgeIter;
|
||||
|
||||
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));
|
||||
iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->target));
|
||||
LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.z));
|
||||
indexData.push_back(iterVertex - vertexData.begin());
|
||||
|
||||
edgeIter = edgeIter->nextHalfEdge;
|
||||
iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->target));
|
||||
//LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.z));
|
||||
indexData.push_back(iterVertex - vertexData.begin());
|
||||
|
||||
edgeIter = edgeIter->nextHalfEdge;
|
||||
iterVertex = find(vertexData.begin(), vertexData.end(), *(edgeIter->target));
|
||||
//LogManager::getSingleton().logMessage(" " + StringConverter::toString(iterVertex->position.x) + "," + StringConverter::toString(iterVertex->position.y) + "," + StringConverter::toString(iterVertex->position.z));
|
||||
indexData.push_back(iterVertex - vertexData.begin());
|
||||
|
||||
//LogManager::getSingleton().logMessage("End Triangle");
|
||||
}
|
||||
}
|
||||
|
||||
/*void SurfacePatch::getVertexAndIndexData(std::vector<SurfaceVertex>& vertexData, std::vector<uint>& indexData)
|
||||
{
|
||||
vertexData.clear();
|
||||
indexData.clear();
|
||||
|
||||
vertexData.resize(m_setVertices.size());
|
||||
std::copy(m_setVertices.begin(), m_setVertices.end(), vertexData.begin());
|
||||
|
||||
@ -168,7 +272,9 @@ namespace Ogre
|
||||
iterVertex = lower_bound(vertexData.begin(), vertexData.end(),(*(iterTriangles->v2)));
|
||||
indexData.push_back(iterVertex - vertexData.begin());
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
#ifdef BLAH
|
||||
|
||||
void SurfacePatch::decimate(void)
|
||||
{
|
||||
@ -176,7 +282,7 @@ namespace Ogre
|
||||
LogManager::getSingleton().logMessage("Triangles before decimation = " + StringConverter::toString(m_setTriangles.size()));
|
||||
|
||||
//Build the lists of connected vertices
|
||||
for(SurfaceVertexIterator vertexIter = m_setVertices.begin(); vertexIter != m_setVertices.end(); ++vertexIter)
|
||||
/*for(SurfaceVertexIterator vertexIter = m_setVertices.begin(); vertexIter != m_setVertices.end(); ++vertexIter)
|
||||
{
|
||||
vertexIter->listConnectedVertices.clear();
|
||||
|
||||
@ -199,49 +305,80 @@ namespace Ogre
|
||||
|
||||
//Remove self from own connected vertex list
|
||||
vertexIter->listConnectedVertices.remove(vertexIter);
|
||||
}
|
||||
}*/
|
||||
|
||||
//do the vertex merging
|
||||
for(SurfaceVertexIterator vertexIter = m_setVertices.begin(); vertexIter != m_setVertices.end(); ++vertexIter)
|
||||
//for(SurfaceVertexIterator vertexIter = m_setVertices.begin(); vertexIter != m_setVertices.end(); ++vertexIter)
|
||||
for(uint ct = 0; ct < 500; ++ct)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Vertex Pos = " + StringConverter::toString(vertexIter->position.x) + "," + StringConverter::toString(vertexIter->position.y) + "," + StringConverter::toString(vertexIter->position.z) + " No of connected vertices = " + StringConverter::toString(vertexIter->listConnectedVertices.size()));
|
||||
/*if(vertexIter->alpha < 0.9)
|
||||
continue;*/
|
||||
if(vertexIter->listConnectedVertices.size() != 6)
|
||||
SurfaceVertexIterator currentVertexIter;
|
||||
for(currentVertexIter = m_setVertices.begin(); currentVertexIter != m_setVertices.end(); ++currentVertexIter)
|
||||
{
|
||||
//LogManager::getSingleton().logMessage("Skipping edge/corner vertex");
|
||||
continue;
|
||||
|
||||
//LogManager::getSingleton().logMessage("Vertex Pos = " + StringConverter::toString(vertexIter->position.x) + "," + StringConverter::toString(vertexIter->position.y) + "," + StringConverter::toString(vertexIter->position.z) + " No of connected vertices = " + StringConverter::toString(vertexIter->listConnectedVertices.size()));
|
||||
|
||||
/*if(vertexIter->listConnectedVertices.size() == 6)
|
||||
break;*/
|
||||
if(currentVertexIter->flags == 0)
|
||||
break;
|
||||
if(currentVertexIter->flags == 0x01)
|
||||
break;
|
||||
if(currentVertexIter->flags == 0x02)
|
||||
break;
|
||||
if(currentVertexIter->flags == 0x04)
|
||||
break;
|
||||
if(currentVertexIter->flags == 0x08)
|
||||
break;
|
||||
}
|
||||
if(currentVertexIter == m_setVertices.end())
|
||||
break;
|
||||
|
||||
SurfaceVertex& currentVertex = *currentVertexIter;
|
||||
|
||||
//Find a vertex to merge with
|
||||
/*std::list<SurfaceVertexIterator>::iterator firstConnectedVertexIter = currentVertex.listConnectedVertices.begin();
|
||||
SurfaceVertex& vertexToMergeWith = (*(*firstConnectedVertexIter));
|
||||
SurfaceVertexIterator vertexToMergeWithIter = m_setVertices.find(vertexToMergeWith);*/
|
||||
|
||||
SurfaceVertexIterator vertexToMergeWithIter = (*(currentVertex.listTrianglesUsingThisVertex.begin()))->v0;
|
||||
SurfaceVertex vertexToMergeWith = *vertexToMergeWithIter;
|
||||
if(currentVertex == vertexToMergeWith)
|
||||
{
|
||||
vertexToMergeWithIter = (*(currentVertex.listTrianglesUsingThisVertex.begin()))->v1;
|
||||
vertexToMergeWith = *vertexToMergeWithIter;
|
||||
}
|
||||
for(std::list<SurfaceTriangleIterator>::iterator triangleIterIter = currentVertex.listTrianglesUsingThisVertex.begin(); triangleIterIter != currentVertex.listTrianglesUsingThisVertex.end(); ++triangleIterIter)
|
||||
{
|
||||
SurfaceVertex connectedVertex = (*(*triangleIterIter)->v0);
|
||||
}
|
||||
|
||||
|
||||
//Change triangles to use new vertex
|
||||
for(SurfaceTriangleIterator iterTriangles = m_setTriangles.begin(); iterTriangles != m_setTriangles.end(); ++iterTriangles)
|
||||
{
|
||||
if(*(iterTriangles->v0) == currentVertex)
|
||||
iterTriangles->v0 = vertexToMergeWithIter;
|
||||
if(*(iterTriangles->v1) == currentVertex)
|
||||
iterTriangles->v1 = vertexToMergeWithIter;
|
||||
if(*(iterTriangles->v2) == currentVertex)
|
||||
iterTriangles->v2 = vertexToMergeWithIter;
|
||||
}
|
||||
|
||||
if(true/*verticesArePlanar(vertexIter)*/)
|
||||
//Remove the vertex from other connected vertex lists
|
||||
/*for(std::list<SurfaceVertexIterator>::iterator connectedVertexIter = currentVertex.listConnectedVertices.begin(); connectedVertexIter != currentVertex.listConnectedVertices.end(); ++connectedVertexIter)
|
||||
{
|
||||
//Find a vertex to merge with
|
||||
std::list<SurfaceVertexIterator>::iterator vertexToMergeWith = vertexIter->listConnectedVertices.begin();
|
||||
|
||||
//Change triangles to use new vertex
|
||||
for(SurfaceTriangleIterator iterTriangles = m_setTriangles.begin(); iterTriangles != m_setTriangles.end(); ++iterTriangles)
|
||||
for(std::list<SurfaceVertexIterator>::iterator secondLevelConnectedIter = (*connectedVertexIter)->listConnectedVertices.begin(); secondLevelConnectedIter != (*connectedVertexIter)->listConnectedVertices.end(); ++secondLevelConnectedIter)
|
||||
{
|
||||
if(iterTriangles->v0 == vertexIter)
|
||||
iterTriangles->v0 = *vertexToMergeWith;
|
||||
if(iterTriangles->v1 == vertexIter)
|
||||
iterTriangles->v1 = *vertexToMergeWith;
|
||||
if(iterTriangles->v2 == vertexIter)
|
||||
iterTriangles->v2 = *vertexToMergeWith;
|
||||
}
|
||||
|
||||
//Change connected vertices to use new vertex
|
||||
for(std::list<SurfaceVertexIterator>::iterator connectedVertex = vertexIter->listConnectedVertices.begin(); connectedVertex != vertexIter->listConnectedVertices.end(); ++connectedVertex)
|
||||
{
|
||||
for(std::list<SurfaceVertexIterator>::iterator secondLevelConnected = (*connectedVertex)->listConnectedVertices.begin(); secondLevelConnected != (*connectedVertex)->listConnectedVertices.end(); ++secondLevelConnected)
|
||||
if((*(*secondLevelConnectedIter)) == currentVertex)
|
||||
{
|
||||
if((*secondLevelConnected) == vertexIter)
|
||||
(*secondLevelConnected) = *vertexToMergeWith;
|
||||
(*connectedVertexIter)->listConnectedVertices.remove(secondLevelConnected);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
//Now remove the vertex as nothing should point to it.
|
||||
//m_setVertices.erase(vertexIter);
|
||||
}
|
||||
//Now remove the vertex as nothing should point to it.
|
||||
m_setVertices.erase(currentVertexIter);
|
||||
}
|
||||
}
|
||||
|
||||
@ -283,4 +420,6 @@ namespace Ogre
|
||||
|
||||
return allXMatch || allYMatch || allZMatch;
|
||||
}*/
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user