Add an optional per vertex radius property in occ, ocf, and IO mask.

Extend derivation_chain from 10 to 12

vcg/container/derivation_chain.h

@@ -99,6 +99,27 @@ template <template <typename,typename,typename,typename>
 					template <typename> class I, template <typename> class J>
           class Arity10: public J<Arity9<Base,BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I > > {};
 
+template <template <typename,typename,typename,typename>
+          class Base,class BVT, class BET, typename BFT,class BTT,
+          template <typename> class A, template <typename> class B, 
+          template <typename> class C, template <typename> class D,
+          template <typename> class E, template <typename> class F,
+          template <typename> class G, template <typename> class H,
+          template <typename> class I, template <typename> class J,
+          template <typename> class K>
+          class Arity11: public K<Arity10<Base,BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I, J> > {};
+
+
+template <template <typename,typename,typename,typename>
+          class Base,class BVT, class BET, typename BFT,class BTT,
+          template <typename> class A, template <typename> class B, 
+          template <typename> class C, template <typename> class D,
+          template <typename> class E, template <typename> class F,
+          template <typename> class G, template <typename> class H,
+          template <typename> class I, template <typename> class J,
+          template <typename> class K, template <typename> class L>
+          class Arity12: public L<Arity11<Base,BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I, J, K> > {};
+
 template < typename T=int>
 class DefaultDeriver : public T {};
 class DumClass {};

vcg/simplex/vertexplus/base.h

@@ -142,8 +142,8 @@ template <class BVT, class BET, typename BFT,class BTT,
           template <typename> class E, template <typename> class F,
           template <typename> class G, template <typename> class H,
 					template <typename> class I, template <typename> class J,
-					template <typename> class K> 
+					template <typename> class K, template <typename> class L> 
-class VertexArityMax: public K<Arity10<VertexBase,BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I, J> > {
+class VertexArityMax: public Arity12<VertexBase,BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I, J, K, L> {
 
 // ----- Flags stuff -----
 public:
@@ -267,8 +267,8 @@ template <class BVT, class BET, class BFT, class BTT,
           template <typename> class E = DefaultDeriver, template <typename> class F = DefaultDeriver,
           template <typename> class G = DefaultDeriver, template <typename> class H = DefaultDeriver,
 					template <typename> class I = DefaultDeriver, template <typename> class J = DefaultDeriver,
-					template <typename> class K = DefaultDeriver> 
+					template <typename> class K = DefaultDeriver, template <typename> class L = DefaultDeriver>
-              class VertexSimp3: public VertexArityMax<BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I, J, K>  {};
+              class VertexSimp3: public VertexArityMax<BVT,BET,BFT,BTT, A, B, C, D, E, F, G, H, I, J, K, L>  {};
 
 template <class BVT, class BET, class BFT, 
           template <typename> class A = DefaultDeriver, template <typename> class B = DefaultDeriver,
@@ -276,8 +276,8 @@ template <class BVT, class BET, class BFT,
           template <typename> class E = DefaultDeriver, template <typename> class F = DefaultDeriver,
           template <typename> class G = DefaultDeriver, template <typename> class H = DefaultDeriver,
 					template <typename> class I = DefaultDeriver, template <typename> class J = DefaultDeriver,
-					template <typename> class K = DefaultDeriver> 
+					template <typename> class K = DefaultDeriver, template <typename> class L = DefaultDeriver>
-              class VertexSimp2: public VertexArityMax<BVT,BET,BFT,DumClass, A, B, C, D, E, F, G, H, I, J, K>  {};
+              class VertexSimp2: public VertexArityMax<BVT,BET,BFT,DumClass, A, B, C, D, E, F, G, H, I, J, K, L>  {};
 
 template <class BVT, class BET, 
           template <typename> class A = DefaultDeriver, template <typename> class B = DefaultDeriver,
@@ -285,8 +285,8 @@ template <class BVT, class BET,
           template <typename> class E = DefaultDeriver, template <typename> class F = DefaultDeriver,
           template <typename> class G = DefaultDeriver, template <typename> class H = DefaultDeriver,
 					template <typename> class I = DefaultDeriver, template <typename> class J = DefaultDeriver,
-					template <typename> class K = DefaultDeriver> 
+					template <typename> class K = DefaultDeriver, template <typename> class L = DefaultDeriver> 
-                class VertexSimp1: public VertexArityMax<BVT,BET,DumClass,DumClass, A, B, C, D, E, F, G, H, I, J, K>  {};
+                class VertexSimp1: public VertexArityMax<BVT,BET,DumClass,DumClass, A, B, C, D, E, F, G, H, I, J, K, L>  {};
 
 }// end namespace
 #endif

vcg/simplex/vertexplus/component_occ.h

@@ -218,6 +218,37 @@ template <class T> class CurvatureDirdOcc: public CurvatureDirOcc<CurvatureDirTy
 public:	static void Name(std::vector<std::string> & name){name.push_back(std::string("CurvatureDird"));T::Name(name);}
 };
 
+/*-------------------------- RADIUS ----------------------------------*/
+
+template <class A, class TT> class RadiusOcc: public TT {
+public:
+  typedef A RadiusType;
+  typedef A ScalarType;
+  typedef typename TT::VertType VertType;
+
+  RadiusType  &R(){  return CAT< vector_occ<VertType>,RadiusType>::Instance()->Get((VertType*)this);}
+  const RadiusType &cR() const { return CAT< vector_occ<VertType>,RadiusType>::Instance()->Get((VertType*)this);}
+
+  template <class LeftV>
+  void ImportLocal(const LeftV & leftV){
+    CAT< vector_occ<VertType>,RadiusType>::Instance()->Get((VertType*)this) = leftV.cR();
+    TT::ImporLocal(leftV);
+  }
+
+  static bool HasRadius()     { return true; }
+  static bool HasRadiusOcc()  { return true; }
+  static void Name(std::vector<std::string> & name){name.push_back(std::string("RadiusOcc"));TT::Name(name);}
+
+private:   
+};
+
+template <class T> class RadiusfOcc: public RadiusOcc<float, T> {
+  static void Name(std::vector<std::string> & name){name.push_back(std::string("RadiusfOcc"));T::Name(name);}
+};
+template <class T> class RadiusdOcc: public RadiusOcc<double, T> {
+  static void Name(std::vector<std::string> & name){name.push_back(std::string("RadiusdOcc"));T::Name(name);}
+};
+
 ///*----------------------------- VFADJ ------------------------------*/ 
 
 template <class T> class VFAdjOcc: public T {

vcg/simplex/vertexplus/component_ocf.h

@@ -109,14 +109,15 @@ class vector_ocf: public std::vector<VALUE_TYPE> {
 
 public:
 	vector_ocf():std::vector<VALUE_TYPE>(){
-  QualityEnabled=false;
+		QualityEnabled = false;
-  ColorEnabled=false;
+		ColorEnabled = false;
 		MarkEnabled = false;
-  NormalEnabled=false;
+		NormalEnabled = false;
-  VFAdjacencyEnabled=false;
+		VFAdjacencyEnabled = false;
 		CurvatureEnabled = false;
-	CurvatureEnabled= false;
+		CurvatureEnabled = false;
-	CurvatureDirEnabled= false;
+		CurvatureDirEnabled = false;
+		RadiusEnabled = false;
 	}
 
 	// override di tutte le funzioni che possono spostare
@@ -131,6 +132,7 @@ public:
 		if (VFAdjacencyEnabled)   AV.push_back(VFAdjType());
 		if (CurvatureEnabled)     CuV.push_back(typename VALUE_TYPE::CurvatureType());
 		if (CurvatureDirEnabled)  CuDV.push_back(typename VALUE_TYPE::CurvatureDirType());
+		if (RadiusEnabled)        RadiusV.push_back(typename VALUE_TYPE::RadiusType());
 	}
 	void pop_back();
 	void resize(const unsigned int & _size)
@@ -148,6 +150,7 @@ public:
 		if (VFAdjacencyEnabled)   AV.resize(_size);
 		if (CurvatureEnabled)     CuV.resize(_size);
 		if (CurvatureDirEnabled)  CuDV.resize(_size);
+		if (RadiusEnabled)        RadiusV.resize(_size);
 	}
 
 	void reserve(const unsigned int & _size)
@@ -159,6 +162,7 @@ public:
 		if (VFAdjacencyEnabled)  AV.reserve(_size);
 		if (CurvatureEnabled)    CuV.reserve(_size);
 		if (CurvatureDirEnabled) CuDV.reserve(_size);
+		if (RadiusEnabled)       RadiusV.reserve(_size);
 	}
 
 	void _updateOVP(ThisTypeIterator lbegin, ThisTypeIterator lend)
@@ -178,6 +182,7 @@ void ReorderVert(std::vector<size_t> &newVertIndex )
 	if (VFAdjacencyEnabled) assert( AV.size() == newVertIndex.size() );
 	if (CurvatureEnabled)   assert(CuV.size() == newVertIndex.size() );
 	if (CurvatureDirEnabled)assert(CuDV.size() == newVertIndex.size() );
+	assert( (!RadiusEnabled) || RadiusV.size() == newVertIndex.size() );
 
 	for(i=0;i<newVertIndex.size();++i)
 		{
@@ -190,6 +195,7 @@ void ReorderVert(std::vector<size_t> &newVertIndex )
 					if (VFAdjacencyEnabled)   AV[newVertIndex[i]] =  AV[i];
 					if (CurvatureEnabled)     CuV[newVertIndex[i]] = CuV[i];
 					if (CurvatureDirEnabled)  CuDV[newVertIndex[i]] =CuDV[i];
+					if (RadiusEnabled)        RadiusV[newVertIndex[i]] = RadiusV[i];
 				}
 		}
 
@@ -199,6 +205,7 @@ void ReorderVert(std::vector<size_t> &newVertIndex )
 	if (VFAdjacencyEnabled)   AV.resize(BaseType::size());
 	if (CurvatureEnabled)     CuV.resize(BaseType::size());
 	if (CurvatureDirEnabled)  CuDV.resize(BaseType::size());
+	if (RadiusEnabled)  RadiusV.resize(BaseType::size());
 }
 
 
@@ -295,7 +302,17 @@ void DisableCurvatureDir() {
 	CuDV.clear();
 }
 
+void EnableRadius() {
+	assert(VALUE_TYPE::HasRadiusOcf());
+	RadiusEnabled=true;
+	RadiusV.resize((*this).size());
+}
 
+void DisableRadius() {
+	assert(VALUE_TYPE::HasRadiusOcf());
+	RadiusEnabled=false;
+	RadiusV.clear();
+}
 
 struct VFAdjType {
 	typename VALUE_TYPE::FacePointer _fp ;
@@ -306,6 +323,7 @@ public:
 	std::vector<typename VALUE_TYPE::QualityType> QV;
 	std::vector<typename VALUE_TYPE::CurvatureType> CuV;
 	std::vector<typename VALUE_TYPE::CurvatureDirType> CuDV;
+	std::vector<typename VALUE_TYPE::RadiusType> RadiusV;
 	std::vector<typename VALUE_TYPE::ColorType> CV;
 	std::vector<typename VALUE_TYPE::NormalType> NV;
 	std::vector<struct VFAdjType> AV;
@@ -318,6 +336,7 @@ public:
 	bool CurvatureEnabled;
 	bool CurvatureDirEnabled;
 	bool MarkEnabled;
+	bool RadiusEnabled;
 };
 
 
@@ -440,7 +459,7 @@ public:
 	inline int IMark() const   {
 		assert((*this).Base().MarkEnabled);
 		return (*this).Base().MV[(*this).Index()];
-  } ;
+	}
 
 	template <class LeftV>
 	void ImportLocal(const LeftV & leftV)
@@ -529,6 +548,37 @@ public:	static void Name(std::vector<std::string> & name){name.push_back(std::st
 template <class T> class CurvatureDirdOcf: public CurvatureDirOcf<CurvatureDirTypeOcf<double>, T> {
 public:	static void Name(std::vector<std::string> & name){name.push_back(std::string("CurvatureDirdOcf"));T::Name(name);}
 };
+
+
+///*-------------------------- RADIUS  ----------------------------------*/
+
+template <class A, class TT> class RadiusOcf: public TT {
+public:
+	typedef A RadiusType;
+	typedef RadiusType ScalarType;
+
+	RadiusType  &R(){  assert((*this).Base().RadiusEnabled); return (*this).Base().RadiusV[(*this).Index()];}
+	const RadiusType &cR() const { assert((*this).Base().RadiusEnabled); return (*this).Base().RadiusV[(*this).Index()];}
+
+	template <class LeftV>
+	void ImportLocal(const LeftV & leftV)
+	{
+		if ((*this).Base().RadiusEnabled && leftV.Base().RadiusEnabled )
+			(*this).Base().RadiusV[(*this).Index()] = leftV.cR();
+		TT::ImportLocal(leftV);
+	}
+
+	static bool HasRadius()     { return true; }
+	static bool HasRadiusOcf()  { return true; }
+	static void Name(std::vector<std::string> & name){name.push_back(std::string("RadiusOcf")); TT::Name(name);}
+
+private:
+};
+
+template <class T> class RadiusfOcf: public RadiusOcf<float, T> {};
+template <class T> class RadiusdOcf: public RadiusOcf<double, T> {};
+
+
 ///*-------------------------- InfoOpt  ----------------------------------*/
 
 template < class T> class InfoOcf: public T {

wrap/io_trimesh/io_mask.h

@@ -46,14 +46,12 @@ Initial commit
 #ifndef __VCGLIB_IOTRIMESH_IO_MASK
 #define __VCGLIB_IOTRIMESH_IO_MASK
 
-//#include<wrap/callback.h>
-
 namespace vcg {
 namespace tri {
 namespace io {
 
 /**
-@name Load and Save in Ply format
+@name Input/output data mask
 */
 //@{
   
@@ -66,30 +64,32 @@ public:
 */
 
 enum {
-	IOM_NONE         = 0x0000,
+	IOM_NONE         = 0x00000,
 
-  IOM_VERTCOORD    = 0x0001,
+  IOM_VERTCOORD    = 0x00001,
-	IOM_VERTFLAGS    = 0x0002, 
+	IOM_VERTFLAGS    = 0x00002,
-	IOM_VERTCOLOR    = 0x0004,
+	IOM_VERTCOLOR    = 0x00004,
-	IOM_VERTQUALITY  = 0x0008,
+	IOM_VERTQUALITY  = 0x00008,
-	IOM_VERTNORMAL   = 0x0010,
+	IOM_VERTNORMAL   = 0x00010,
-	IOM_VERTTEXCOORD = 0x0020,
+	IOM_VERTTEXCOORD = 0x00020,
+  IOM_VERTRADIUS   = 0x10000,
 
-	IOM_FACEINDEX    = 0x0040,
+	IOM_FACEINDEX    = 0x00040,
-	IOM_FACEFLAGS    = 0x0080,
+	IOM_FACEFLAGS    = 0x00080,
-	IOM_FACECOLOR    = 0x0100,
+	IOM_FACECOLOR    = 0x00100,
-	IOM_FACEQUALITY  = 0x0200,
+	IOM_FACEQUALITY  = 0x00200,
-	IOM_FACENORMAL   = 0x0400,
+	IOM_FACENORMAL   = 0x00400,
-	IOM_WEDGCOLOR    = 0x0800,
-	IOM_WEDGTEXCOORD = 0x1000,
-	IOM_WEDGTEXMULTI = 0x2000, // Se ha anche l'indice di texture esplicito
-	IOM_WEDGNORMAL   = 0x4000,
 
-	IOM_CAMERA       = 0x8000,
+	IOM_WEDGCOLOR    = 0x00800,
+	IOM_WEDGTEXCOORD = 0x01000,
+	IOM_WEDGTEXMULTI = 0x02000, // Se ha anche l'indice di texture esplicito
+	IOM_WEDGNORMAL   = 0x04000,
+
+	IOM_CAMERA       = 0x08000,
 
 	IOM_FLAGS        = IOM_VERTFLAGS + IOM_FACEFLAGS,
 
-	IOM_ALL          = 0xFFFF
+	IOM_ALL          = 0xFFFFF
 };
 //
 //