Refactoring work... working on meshes

This commit is contained in:
David Williams
2007-09-02 11:16:58 +00:00
parent abe66c3d81
commit 80c6f149a5
7 changed files with 188 additions and 37 deletions

View File

@ -1,4 +1,5 @@
#include "SurfaceTriangle.h"
#include "SurfaceVertex.h"
namespace Ogre
{
@ -6,10 +7,42 @@ namespace Ogre
{
}
SurfaceTriangle::SurfaceTriangle(std::set<SurfaceVertex>::iterator v0ToSet, std::set<SurfaceVertex>::iterator v1ToSet, std::set<SurfaceVertex>::iterator v2ToSet)
SurfaceTriangle::SurfaceTriangle(SurfaceVertexIterator v0ToSet, SurfaceVertexIterator v1ToSet, SurfaceVertexIterator v2ToSet)
:v0(v0ToSet)
,v1(v1ToSet)
,v2(v2ToSet)
{
}
bool operator == (const SurfaceTriangle& lhs, const SurfaceTriangle& rhs)
{
return
(
(lhs.v0 == rhs.v0) &&
(lhs.v1 == rhs.v1) &&
(lhs.v2 == rhs.v2)
);
}
bool operator < (const SurfaceTriangle& lhs, const SurfaceTriangle& rhs)
{
if(lhs.v0 == rhs.v0)
{
if(lhs.v1 == rhs.v1)
{
if(lhs.v2 == rhs.v2)
{
return false;
}
return (*(lhs.v2) < *(rhs.v2));
}
return (*(lhs.v1) < *(rhs.v1));
}
return (*(lhs.v0) < *(rhs.v0));
}
/*bool operator < (const SurfaceTriangleIterator& lhs, const SurfaceTriangleIterator& rhs)
{
return (*lhs) < (*rhs);
}*/
}