Refactoring work... Argh, this is hard!

This commit is contained in:
David Williams
2007-08-19 20:28:33 +00:00
parent 47bb4b016d
commit adfdb3062f
8 changed files with 129 additions and 49 deletions

View File

@ -1,5 +1,7 @@
#include "SurfacePatch.h"
#include <algorithm>
namespace Ogre
{
SurfacePatch::SurfacePatch()
@ -14,23 +16,60 @@ namespace Ogre
{
SurfaceTriangle triangle;
m_vecVertices.push_back(v0);
triangle.v0 = m_vecVertices.size()-1;
m_vecVertices.push_back(v1);
triangle.v1 = m_vecVertices.size()-1;
m_vecVertices.push_back(v2);
triangle.v2 = m_vecVertices.size()-1;
m_listVertices.push_back(v0);
triangle.v0 = m_listVertices.end();
triangle.v0--;
m_vecTriangles.push_back(triangle);
m_listVertices.push_back(v1);
triangle.v1 = m_listVertices.end();
triangle.v1--;
m_listVertices.push_back(v2);
triangle.v2 = m_listVertices.end();
triangle.v2--;
m_listTriangles.push_back(triangle);
/*m_vecVertexData.push_back(v0);
m_vecIndexData.push_back(m_vecVertexData.size()-1);
m_vecVertexData.push_back(v1);
m_vecIndexData.push_back(m_vecVertexData.size()-1);
m_vecVertexData.push_back(v2);
m_vecIndexData.push_back(m_vecVertexData.size()-1);*/
}
const std::vector<SurfaceVertex>& SurfacePatch::getVertexArray()
/*const std::vector<SurfaceVertex> SurfacePatch::getVertexArray()
{
return m_vecVertices;
std::vector<SurfaceVertex> vertexArray;
vertexArray.resize(m_listVertices.size());
std::copy(m_listVertices.begin(), m_listVertices.end(), vertexArray.begin());
return vertexArray;
}
const std::vector<SurfaceTriangle>& SurfacePatch::getTriangleArray()
const std::vector<SurfaceTriangle> SurfacePatch::getTriangleArray()
{
return m_vecTriangles;
std::vector<SurfaceTriangle> triangleArray;
triangleArray.resize(m_listTriangles.size());
std::copy(m_listTriangles.begin(), m_listTriangles.end(), triangleArray.begin());
return triangleArray;
}*/
void SurfacePatch::getVertexAndIndexData(std::vector<SurfaceVertex>& vertexData, std::vector<uint>& indexData)
{
vertexData.clear();
indexData.clear();
for(std::list<SurfaceTriangle>::iterator iterTriangles = m_listTriangles.begin(); iterTriangles != m_listTriangles.end(); ++iterTriangles)
{
vertexData.push_back(*(iterTriangles->v0));
indexData.push_back(vertexData.size()-1);
vertexData.push_back(*(iterTriangles->v1));
indexData.push_back(vertexData.size()-1);
vertexData.push_back(*(iterTriangles->v2));
indexData.push_back(vertexData.size()-1);
}
/*vertexData = m_vecVertexData;
indexData = m_vecIndexData;*/
}
}