From 527e4042b5eec1bc6ba1be55da86b7980b560d7b Mon Sep 17 00:00:00 2001 From: cnr-isti-vclab Date: Tue, 24 Jan 2006 09:58:11 +0000 Subject: [PATCH] Some changes in class Facet ( constructor and operator < ) --- vcg/complex/tetramesh/update/topology.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vcg/complex/tetramesh/update/topology.h b/vcg/complex/tetramesh/update/topology.h index 26656571..3a03dfea 100644 --- a/vcg/complex/tetramesh/update/topology.h +++ b/vcg/complex/tetramesh/update/topology.h @@ -65,7 +65,15 @@ public: vertex[0]=v0; vertex[1]=v1; vertex[2]=v2; - sort(vertex,vertex+3); + if(vertex[0] > vertex[1]) std::swap(vertex[0], vertex[1]); + if(vertex[1] > vertex[2]) + { + std::swap(vertex[1], vertex[2]); + if(vertex[0] > vertex[1]) + { + std::swap(vertex[0], vertex[1]); + } + } Tr = t; numface = index; } @@ -127,7 +135,7 @@ public: inline bool operator < ( Facet const & f) const { - return !(((*this)>f)&&((*this)!=f)); + return (!((*this)>f)&&((*this)!=f)); } inline bool operator <= ( Facet const & f) const