From 88ffec1d6a0a42dd64e8213f2122b84b1d613299 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Wed, 21 Jan 2009 17:26:48 +0000 Subject: [PATCH] update the lates library mods (definition of edge type) --- apps/tridecimator/tridecimator.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/tridecimator/tridecimator.cpp b/apps/tridecimator/tridecimator.cpp index 34734ba8..a868ca52 100644 --- a/apps/tridecimator/tridecimator.cpp +++ b/apps/tridecimator/tridecimator.cpp @@ -9,7 +9,7 @@ using namespace std; // stuff to define the mesh #include #include -#include +#include #include #include @@ -51,21 +51,22 @@ class MyFace; class MyVertex : public VertexSimp2< MyVertex, MyEdge, MyFace, - vert::VFAdj, - vert::Coord3f, - vert::Normal3f, - vert::Mark, - vert::BitFlags >{ + vertex::VFAdj, + vertex::Coord3f, + vertex::Normal3f, + vertex::Mark, + vertex::BitFlags >{ public: vcg::math::Quadric &Qd() {return q;} private: math::Quadric q; }; - -class MyEdge : public Edge { + +class DummyType; +class MyEdge : public EdgeSimp2 { public: inline MyEdge() {}; - inline MyEdge( MyVertex * v0, MyVertex * v1):Edge(v0,v1){}; + inline MyEdge( MyVertex * v0, MyVertex * v1){V(0) = v0; V(1) = v1; }; static inline MyEdge OrderedEdge(MyVertex* v0,MyVertex* v1){ if(v0