From 70c16f01efa58ea1dea3c356ae761ca78928c4c9 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 29 Nov 2006 16:21:45 +0000 Subject: [PATCH] Made static exposed funtions of the class --- vcg/complex/trimesh/hole.h | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/vcg/complex/trimesh/hole.h b/vcg/complex/trimesh/hole.h index 01aeeb66..bc299554 100644 --- a/vcg/complex/trimesh/hole.h +++ b/vcg/complex/trimesh/hole.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.19 2006/11/29 15:25:22 giec +Removed limit. + Revision 1.18 2006/11/29 15:18:49 giec Code refactory and bugfix. @@ -486,7 +489,7 @@ public: template - void FillHoleEar(MESH &m, Info &h ,int UBIT, std::vector &app,std::vector *vf =0) + static void FillHoleEar(MESH &m, Info &h ,int UBIT, std::vector &app,std::vector *vf =0) { //Aggiungo le facce e aggiorno il puntatore alla faccia! FaceIterator f = tri::Allocator::AddFaces(m, h.size-2, app); @@ -564,8 +567,8 @@ template - template//!!! - void EarCuttingFill(MESH &m, int sizeHole,bool Selected = false) +template//!!! + static void EarCuttingFill(MESH &m, int sizeHole,bool Selected = false) { std::vector< Info > vinfo; int UBIT = GetInfo(m, Selected,vinfo); @@ -596,8 +599,8 @@ template - template - void EarCuttingIntersectionFill(MESH &m, int sizeHole,bool Selected = false) +template + static void EarCuttingIntersectionFill(MESH &m, int sizeHole,bool Selected = false) { std::vector vinfo; int UBIT = GetInfo(m, Selected,vinfo); @@ -648,7 +651,7 @@ template - int GetInfo(MESH &m,bool Selected ,std::vector& VHI) + static int GetInfo(MESH &m,bool Selected ,std::vector& VHI) { FaceIterator fi; int UBIT = FaceType::LastBitFlag(); @@ -730,7 +733,7 @@ template | v3 v2\ */ - float ComputeDihedralAngle(CoordType p1,CoordType p2,CoordType p3,CoordType p4) + static float ComputeDihedralAngle(CoordType p1,CoordType p2,CoordType p3,CoordType p4) { CoordType n1 = ((p1 - p2) ^ (p3 - p1) ).Normalize(); CoordType n2 = ((p2 - p1) ^ (p4 - p2) ).Normalize(); @@ -738,7 +741,7 @@ template return math::ToDeg(acos(t)); } -bool existEdge(PosType pi,PosType pf) + static bool existEdge(PosType pi,PosType pf) { PosType app = pi; PosType appF = pi; @@ -760,7 +763,7 @@ bool existEdge(PosType pi,PosType pf) return false; } - Weight computeWeight( int i, int j, int k, + static Weight computeWeight( int i, int j, int k, std::vector pv, std::vector< std::vector< int > > v) { @@ -815,7 +818,7 @@ bool existEdge(PosType pi,PosType pf) return Weight(angle, area); } - std::vector calculateMinimumWeightTriangulation(MESH &m, std::vector vv ) + static std::vector calculateMinimumWeightTriangulation(MESH &m, std::vector vv ) { std::vector< std::vector< Weight > > w; //matrice dei pesi minimali di ogni orecchio preso in conzideraione std::vector< std::vector< int > > vi;//memorizza l'indice del terzo vertice del triangolo @@ -872,7 +875,7 @@ bool existEdge(PosType pi,PosType pf) } - void triangulate(std::vector &m,int i, int j, std::vector< std::vector > vi, + static void triangulate(std::vector &m,int i, int j, std::vector< std::vector > vi, std::vector vv) { if(i + 1 == j){return;} @@ -890,7 +893,7 @@ bool existEdge(PosType pi,PosType pf) triangulate(m, k, j, vi, vv); } -void MinimumWeightFill(MESH &m, bool Selected) + static void MinimumWeightFill(MESH &m, bool Selected) { FaceIterator fi; std::vector vvi; @@ -946,7 +949,7 @@ void MinimumWeightFill(MESH &m, bool Selected) } - void getBoundHole (PosType sp,std::vector&ret) + static void getBoundHole (PosType sp,std::vector&ret) { PosType fp = sp; //take vertex around the hole