From 6b807efa9c7ea5c9c46a9dc24e75c32680384d47 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Wed, 19 May 2010 17:05:29 +0000 Subject: [PATCH] separated alltypes from usedtypes. The dummy types for simplex where char, now are derived by their proper type (eg. the dummy type for Vertex is a simple derivation of vcg::Vertex) --- vcg/complex/all_types.h | 16 ++++++++++++++++ vcg/complex/used_types.h | 41 +++++++++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 11 deletions(-) create mode 100755 vcg/complex/all_types.h diff --git a/vcg/complex/all_types.h b/vcg/complex/all_types.h new file mode 100755 index 00000000..10de611f --- /dev/null +++ b/vcg/complex/all_types.h @@ -0,0 +1,16 @@ +#ifndef VCG_ALL_TYPES_H +#define VCG_ALL_TYPES_H + +namespace vcg{ + +struct AllTypes{ + struct AVertexType {}; + struct AEdgeType {}; + struct AFaceType {}; + struct AHEdgeType {}; +}; + + +}; + +#endif // USED_TYPES_H diff --git a/vcg/complex/used_types.h b/vcg/complex/used_types.h index 07cc8286..22968818 100755 --- a/vcg/complex/used_types.h +++ b/vcg/complex/used_types.h @@ -5,14 +5,26 @@ #include #include +#include +#include +#include +#include + namespace vcg{ +// dummy mesh + +struct _Vertex; +struct _Edge ; +struct _Face ; +struct _HEdge ; + struct DummyTypes{ - typedef char VertexType; // simplex types - typedef char EdgeType; - typedef char FaceType; - typedef char TetraType; - typedef char HEdgeType; // connector types + typedef _Vertex VertexType; // simplex types + typedef _Edge EdgeType; + typedef _Face FaceType; + typedef char TetraType; + typedef _HEdge HEdgeType; // connector types typedef vcg::Point3 CoordType; typedef char ScalarType; @@ -28,12 +40,6 @@ struct DummyTypes{ void ImportLocal(const LeftV & /*left*/ ) {} }; -struct AllTypes{ - struct AVertexType {}; - struct AEdgeType {}; - struct AFaceType {}; - struct AHEdgeType {}; -}; template