AttributeHandler -> [Vertex,Edge,...]Attribute

Apps/Examples/clipping.h

@@ -81,7 +81,7 @@ public:
 
 	//Manip Carte
 	MAP myMap ;
-	AttributeHandler<VEC3, VERTEX> position;
+	VertexAttribute<VEC3> position;
 	Dart dglobal;
 
 	//Render

Apps/Examples/concave_rendering.cpp

@@ -132,7 +132,7 @@ typedef PFP::VEC3 VEC3 ;
 // declaration of the map
 MAP myMap;
 // and attribute of position
-AttributeHandler<VEC3, VERTEX> position;
+VertexAttribute<VEC3> position;
 
 unsigned int nb_ears;
 

Apps/Examples/extrusionView.cpp

@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	QApplication app(argc, argv);
 	MyQT sqt;
 
-	AttributeHandler<VEC3, VERTEX> position = myMap.addAttribute<VEC3, VERTEX>("position") ;
+	VertexAttribute<VEC3> position = myMap.addAttribute<VEC3, VERTEX>("position") ;
 
 	// define the face extruded (here a cross)
 	std::vector<PFP::VEC3> objV;

Apps/Examples/mcmesh.h

@@ -73,7 +73,7 @@ public:
 	bool m_drawEdges ;
 	bool m_drawFaces ;
 
-	AttributeHandler<VEC3, VERTEX> position ;
+	VertexAttribute<VEC3> position ;
 
 	Algo::Render::GL2::MapRender* m_render ;
 

Apps/Examples/simpleGMap2.h

@@ -51,7 +51,7 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
 public:
 	MAP myMap ;
 
-	AttributeHandler<VEC3, VERTEX> position ;
+	VertexAttribute<VEC3> position ;
 
 	SimpleGMap2() ;
 

Apps/Examples/simpleGMap3.h

@@ -52,9 +52,9 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
 public:
 	MAP myMap ;
 
-	AttributeHandler<VEC3, VERTEX> position ;
-	AttributeHandler<VEC3, VERTEX> normal ;
-	AttributeHandler<VEC3, VOLUME> volume ;
+	VertexAttribute<VEC3> position ;
+	VertexAttribute<VEC3> normal ;
+	VolumeAttribute<VEC3> volume ;
 
 	SimpleGMap3() ;
 

Apps/Examples/simpleMap3.h

@@ -52,7 +52,7 @@ public:
 	MAP myMap ;
 	SelectorTrue allDarts ;
 
-	AttributeHandler<VEC3, VERTEX> position ;
+	VertexAttribute<VEC3> position ;
 
 	SimpleMap3() ;
 

Apps/Examples/texturesExample.cpp

@@ -204,7 +204,7 @@ int main(int argc, char**argv)
 
 	PFP::MAP& m = tv.myMap;
 
-	AttributeHandler<VEC3, VERTEX> position = m.addAttribute<VEC3, VERTEX>("position");
+	VertexAttribute<VEC3> position = m.addAttribute<VEC3, VERTEX>("position");
 	AttributeHandler<Geom::Vec2f, VERTEX> texcoord = m.addAttribute<Geom::Vec2f, VERTEX>("texcoord");
 
 #define NB 96

Apps/Examples/viewer.cpp

@@ -248,7 +248,7 @@ void Viewer::exportMesh(std::string& filename)
 		Algo::Export::exportOFF<PFP>(myMap, position, filename.c_str(), allDarts) ;
 	else if (extension.compare(0, 4, std::string(".ply")) == 0)
 	{
-		std::vector<AttributeHandler<VEC3, VERTEX>*> attributes ;
+		std::vector<VertexAttribute<VEC3>*> attributes ;
 		attributes.push_back(&position) ;
 		Algo::Export::exportPLYnew<PFP>(myMap, attributes, filename.c_str(), true, allDarts) ;
 	}

Apps/Examples/volumeExplorer.cpp

@@ -33,8 +33,8 @@
 
 
 PFP::MAP myMap;
-AttributeHandler<PFP::VEC3, VERTEX> position ;
-AttributeHandler<PFP::VEC3, VOLUME> color ;
+VertexAttribute<PFP::VEC3> position ;
+VolumeAttribute<PFP::VEC3> color ;
 
 void MyQT::volumes_onoff(bool x)
 {

Apps/Tuto/show_traversors.cpp

@@ -40,7 +40,7 @@
 
 
 MAP myMap;
-AttributeHandler<VEC3, VERTEX> position ;
+VertexAttribute<VEC3> position ;
 Dart dglobal;
 
 void MyQT::cb_checkTopo(bool b)

Apps/Tuto/tp_master.cpp

@@ -64,7 +64,7 @@ typedef PFP::VEC3 Point3D;
 //		handler d'attribut de position par sommet
 AttributeHandler<Point3D, VERTEX> position;
 //		handler d'attribut de normale par sommet
-AttributeHandler<PFP::VEC3, VERTEX> normal;
+VertexAttribute<PFP::VEC3> normal;
 
 
 /// Fonctions a connaitre:

Apps/Tuto/tuto1.h

@@ -73,7 +73,7 @@ protected:
 	MAP myMap;
 
 	// attribute for vertices positions
-	AttributeHandler<VEC3, VERTEX> position;
+	VertexAttribute<VEC3> position;
 
 	// render (for the topo)
 	Algo::Render::GL2::TopoRender* m_render_topo;

Apps/Tuto/tuto2.cpp

@@ -53,7 +53,7 @@ void MyQT::createMap()
 	Dart d1 = myMap.newFace(3);
 	Dart d2 = myMap.newFace(4);
 	myMap.sewFaces(d1, d2);
-	AttributeHandler<VEC3, VERTEX> position = myMap.addAttribute<PFP::VEC3, VERTEX>("position");
+	VertexAttribute<VEC3> position = myMap.addAttribute<PFP::VEC3, VERTEX>("position");
 	position[d1] = PFP::VEC3(0, 0, 0);
 	position[PHI1(d1)] = PFP::VEC3(2, 0, 0);
 	position[PHI_1(d1)] = PFP::VEC3(1, 2, 0);
@@ -61,7 +61,7 @@ void MyQT::createMap()
 	position[PHI_1(d2)] = PFP::VEC3(2, -2, 0);
 
 	// create another attribute on vertices (for faces drawing)
-	AttributeHandler<VEC3, VERTEX> colorF = myMap.addAttribute<PFP::VEC3, VERTEX>("colorF");
+	VertexAttribute<VEC3> colorF = myMap.addAttribute<PFP::VEC3, VERTEX>("colorF");
 
 	colorF[d1] = Geom::Vec3f(1.0f,0.0f,0.0f);
 	colorF[PHI1(d1)] = Geom::Vec3f(0.0f,1.0f,0.0f);
@@ -70,7 +70,7 @@ void MyQT::createMap()
 	colorF[PHI_1(d2)] = Geom::Vec3f(0.0f,1.0f,1.0f);
 
 	// create another attribute on vertices (for edges drawing)
-	AttributeHandler<VEC3, VERTEX> colorE = myMap.addAttribute<PFP::VEC3, VERTEX>("colorE");
+	VertexAttribute<VEC3> colorE = myMap.addAttribute<PFP::VEC3, VERTEX>("colorE");
 
 	colorE[d1] = Geom::Vec3f(0.0f,0.5f,0.5f);
 	colorE[PHI1(d1)] = Geom::Vec3f(0.5f,0.0f,0.5f);

Apps/Tuto/tuto3.h

@@ -75,7 +75,7 @@ protected:
 	MAP myMap;
 
 	// attribute handler on position;
-	AttributeHandler<VEC3, VERTEX> position;
+	VertexAttribute<VEC3> position;
 
 	// render (for the topo)
 	Algo::Render::GL2::TopoRender* m_render_topo;

Apps/Tuto/tuto4.h

@@ -63,7 +63,7 @@ protected:
 	MAP myMap;
 
 	// attribute handler on position;
-	AttributeHandler<VEC3, VERTEX> position;
+	VertexAttribute<VEC3> position;
 
 	// render (for the topo)
 	Algo::Render::GL2::TopoRender* m_render_topo;

Apps/Tuto/tuto5.cpp

@@ -35,7 +35,7 @@
 
 
 MAP myMap;
-AttributeHandler<VEC3, VERTEX> position ;
+VertexAttribute<VEC3> position ;
 Dart dglobal;
 
 void MyQT::balls_onoff(bool x)

Apps/Tuto/tuto_oper2.h

@@ -84,7 +84,7 @@ protected:
 	// declaration of the map
 	MAP myMap;
 
-	AttributeHandler<VEC3, VERTEX> position;
+	VertexAttribute<VEC3> position;
 	AttributeHandler<VEC3, DART> colorDarts;
 
 	SelectorDartNoBoundary<PFP::MAP> nb;

Apps/Tuto/tuto_oper3.h

@@ -84,7 +84,7 @@ protected:
 	// declaration of the map
 	MAP myMap;
 
-	AttributeHandler<VEC3, VERTEX> position;
+	VertexAttribute<VEC3> position;
 
 	SelectorDartNoBoundary<PFP::MAP> nb;
 

Apps/Tuto/tuto_orbits.cpp

@@ -37,7 +37,7 @@
 #include "Algo/Import/import.h"
 
 MAP myMap;
-AttributeHandler<VEC3, VERTEX> position ;
+VertexAttribute<VEC3> position ;
 AttributeHandler<VEC3, DART> middleDarts;
 
 

Apps/Tuto/tuto_subdivision.cpp

@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 	Algo::Import::importMesh<PFP>(myMap, argv[1], attrNames);
 
 	// get a handler to the 3D vector attribute created by the import
-	AttributeHandler<PFP::VEC3, VERTEX> position = myMap.getAttribute<PFP::VEC3, VERTEX>(attrNames[0]);
+	VertexAttribute<PFP::VEC3> position = myMap.getAttribute<PFP::VEC3, VERTEX>(attrNames[0]);
 
 	for(unsigned int i = 0; i < nbSteps; ++i)
 		Algo::Modelisation::LoopSubdivision<PFP>(myMap, position);

include/Algo/BooleanOperator/mergeVertices.h

@@ -39,10 +39,10 @@ namespace BooleanOperator
 {
 
 template <typename PFP>
-void mergeVertex(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& positions, Dart d, Dart e);
+void mergeVertex(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& positions, Dart d, Dart e);
 
 template <typename PFP>
-void mergeVertices(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& positions);
+void mergeVertices(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& positions);
 
 }
 

include/Algo/BooleanOperator/mergeVertices.hpp

@@ -32,7 +32,7 @@ namespace BooleanOperator
 {
 
 template <typename PFP>
-void mergeVertex(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& positions, Dart d, Dart e)
+void mergeVertex(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& positions, Dart d, Dart e)
 {
 	assert(Geom::arePointsEquals(positions[d],positions[e]) && !map.sameVertex(d,e));
 	Dart dd;
@@ -55,7 +55,7 @@ void mergeVertex(typename PFP::MAP& map, const AttributeHandler<typename PFP::VE
 }
 
 template <typename PFP>
-void mergeVertices(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& positions)
+void mergeVertices(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& positions)
 {
 	for(Dart d = map.begin() ; d != map.end() ; map.next(d))
 	{

include/Algo/Decimation/decimation.h

@@ -44,7 +44,7 @@ void decimate(
 	typename PFP::MAP& map,
 	SelectorType s,
 	ApproximatorType a,
-	AttributeHandler<typename PFP::VEC3, VERTEX>& position,
+	VertexAttribute<typename PFP::VEC3>& position,
 	unsigned int nbWantedVertices,
 	const FunctorSelect& selected = allDarts
 ) ;

include/Algo/Decimation/decimation.hpp

@@ -34,7 +34,7 @@ namespace Decimation
 template <typename PFP>
 void decimate(
 	typename PFP::MAP& map, SelectorType s, ApproximatorType a,
-	AttributeHandler<typename PFP::VEC3, VERTEX>& position, unsigned int nbWantedVertices, const FunctorSelect& selected
+	VertexAttribute<typename PFP::VEC3>& position, unsigned int nbWantedVertices, const FunctorSelect& selected
 )
 {
 	std::vector<ApproximatorGen<PFP>*> approximators ;

include/Algo/Decimation/edgeSelector.h

@@ -54,7 +54,7 @@ private:
 	Dart cur ;
 
 public:
-	EdgeSelector_MapOrder(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector_MapOrder(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{}
 	~EdgeSelector_MapOrder()
@@ -81,7 +81,7 @@ private:
 	bool allSkipped ;
 
 public:
-	EdgeSelector_Random(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector_Random(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{}
 	~EdgeSelector_Random()
@@ -121,7 +121,7 @@ private:
 	void computeEdgeInfo(Dart d, EdgeInfo& einfo) ;
 
 public:
-	EdgeSelector_Length(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector_Length(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		edgeInfo = m.template addAttribute<EdgeInfo, EDGE>("edgeInfo") ;
@@ -168,7 +168,7 @@ private:
 	void computeEdgeInfo(Dart d, EdgeInfo& einfo) ;
 
 public:
-	EdgeSelector_QEM(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector_QEM(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		edgeInfo = m.template addAttribute<EdgeInfo, EDGE>("edgeInfo") ;
@@ -217,7 +217,7 @@ private:
 	void recomputeQuadric(const Dart d, const bool recomputeNeighbors = false) ;
 
 public:
-	EdgeSelector_QEMml(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector_QEMml(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		edgeInfo = m.template addAttribute<EdgeInfo, EDGE>("edgeInfo") ;
@@ -255,14 +255,14 @@ private:
 	Geom::BoundingBox<VEC3> bb ;
 	REAL radius ;
 
-	AttributeHandler<VEC3, VERTEX> normal ;
+	VertexAttribute<VEC3> normal ;
 	AttributeHandler<EdgeInfo, EDGE> edgeInfo ;
-	AttributeHandler<REAL, EDGE> edgeangle ;
-	AttributeHandler<REAL, VERTEX> kmax ;
-	AttributeHandler<REAL, VERTEX> kmin ;
-	AttributeHandler<VEC3, VERTEX> Kmax ;
-	AttributeHandler<VEC3, VERTEX> Kmin ;
-	AttributeHandler<VEC3, VERTEX> Knormal ;
+	EdgeAttribute<REAL> edgeangle ;
+	VertexAttribute<REAL> kmax ;
+	VertexAttribute<REAL> kmin ;
+	VertexAttribute<VEC3> Kmax ;
+	VertexAttribute<VEC3> Kmin ;
+	VertexAttribute<VEC3> Knormal ;
 
 	std::multimap<float,Dart> edges ;
 	typename std::multimap<float,Dart>::iterator cur ;
@@ -274,7 +274,7 @@ private:
 	void computeEdgeInfo(Dart d, EdgeInfo& einfo) ;
 
 public:
-	EdgeSelector_Curvature(MAP& m, AttributeHandler<VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector_Curvature(MAP& m, VertexAttribute<VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		bb = Algo::Geometry::computeBoundingBox<PFP>(m, pos) ;
@@ -359,7 +359,7 @@ private:
 	void computeEdgeInfo(Dart d, EdgeInfo& einfo) ;
 
 public:
-	EdgeSelector_MinDetail(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector_MinDetail(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		edgeInfo = m.template addAttribute<EdgeInfo, EDGE>("edgeInfo") ;

include/Algo/Decimation/geometryApproximator.h

@@ -48,7 +48,7 @@ protected:
 	AttributeHandler<Quadric<REAL>, VERTEX> m_quadric ;
 
 public:
-	Approximator_QEM(MAP& m, AttributeHandler<VEC3, VERTEX>& pos, Predictor<PFP, VEC3>* pred = NULL) :
+	Approximator_QEM(MAP& m, VertexAttribute<VEC3>& pos, Predictor<PFP, VEC3>* pred = NULL) :
 		Approximator<PFP, VEC3>(m, pos, pred)
 	{}
 	~Approximator_QEM()
@@ -70,7 +70,7 @@ protected:
 	AttributeHandler<Quadric<REAL>, VERTEX> m_quadric ;
 
 public:
-	Approximator_QEMhalfEdge(MAP& m, AttributeHandler<VEC3, VERTEX>& pos, Predictor<PFP, VEC3>* pred = NULL) :
+	Approximator_QEMhalfEdge(MAP& m, VertexAttribute<VEC3>& pos, Predictor<PFP, VEC3>* pred = NULL) :
 		Approximator<PFP, VEC3>(m, pos, pred)
 	{}
 	~Approximator_QEMhalfEdge()
@@ -88,7 +88,7 @@ public:
 	typedef typename PFP::VEC3 VEC3 ;
 	typedef typename PFP::REAL REAL ;
 
-	Approximator_MidEdge(MAP& m, AttributeHandler<VEC3, VERTEX>& pos, Predictor<PFP, VEC3>* pred = NULL) :
+	Approximator_MidEdge(MAP& m, VertexAttribute<VEC3>& pos, Predictor<PFP, VEC3>* pred = NULL) :
 		Approximator<PFP, VEC3>(m, pos, pred)
 	{}
 	~Approximator_MidEdge()
@@ -106,7 +106,7 @@ public:
 	typedef typename PFP::VEC3 VEC3 ;
 	typedef typename PFP::REAL REAL ;
 
-	Approximator_HalfCollapse(MAP& m, AttributeHandler<VEC3, VERTEX>& pos, Predictor<PFP, VEC3>* pred = NULL) :
+	Approximator_HalfCollapse(MAP& m, VertexAttribute<VEC3>& pos, Predictor<PFP, VEC3>* pred = NULL) :
 		Approximator<PFP, VEC3>(m, pos, pred)
 	{}
 	~Approximator_HalfCollapse()
@@ -124,7 +124,7 @@ public:
 	typedef typename PFP::VEC3 VEC3 ;
 	typedef typename PFP::REAL REAL ;
 
-	Approximator_CornerCutting(MAP& m, AttributeHandler<VEC3, VERTEX>& pos, Predictor<PFP, VEC3>* pred = NULL) :
+	Approximator_CornerCutting(MAP& m, VertexAttribute<VEC3>& pos, Predictor<PFP, VEC3>* pred = NULL) :
 		Approximator<PFP, VEC3>(m, pos, pred)
 	{}
 	~Approximator_CornerCutting()

include/Algo/Decimation/geometryPredictor.h

@@ -44,7 +44,7 @@ public:
 	typedef typename PFP::VEC3 VEC3 ;
 	typedef typename PFP::REAL REAL ;
 
-	Predictor_HalfCollapse(MAP& m, AttributeHandler<VEC3, VERTEX>& pos) :
+	Predictor_HalfCollapse(MAP& m, VertexAttribute<VEC3>& pos) :
 		Predictor<PFP, VEC3>(m, pos)
 	{}
 	PredictorType getType() { return P_HalfCollapse ; }
@@ -60,7 +60,7 @@ public:
 	typedef typename PFP::VEC3 VEC3 ;
 	typedef typename PFP::REAL REAL ;
 
-	Predictor_CornerCutting(MAP& m, AttributeHandler<VEC3, VERTEX>& pos) :
+	Predictor_CornerCutting(MAP& m, VertexAttribute<VEC3>& pos) :
 		Predictor<PFP, VEC3>(m, pos)
 	{}
 	PredictorType getType() { return P_CornerCutting ; }
@@ -77,7 +77,7 @@ public:
 	typedef typename PFP::VEC3 VEC3 ;
 	typedef typename PFP::REAL REAL ;
 
-	Predictor_TangentPredict1(MAP& m, AttributeHandler<VEC3, VERTEX>& pos) :
+	Predictor_TangentPredict1(MAP& m, VertexAttribute<VEC3>& pos) :
 		Predictor<PFP, VEC3>(m, pos)
 	{}
 	PredictorType getType() { return P_TangentPredict1 ; }
@@ -94,7 +94,7 @@ public:
 	typedef typename PFP::VEC3 VEC3 ;
 	typedef typename PFP::REAL REAL ;
 
-	Predictor_TangentPredict2(MAP& m, AttributeHandler<VEC3, VERTEX>& pos) :
+	Predictor_TangentPredict2(MAP& m, VertexAttribute<VEC3>& pos) :
 		Predictor<PFP, VEC3>(m, pos)
 	{}
 	PredictorType getType() { return P_TangentPredict2 ; }

include/Algo/Decimation/halfEdgeSelector.h

@@ -67,7 +67,7 @@ private:
 	void recomputeQuadric(const Dart d, const bool recomputeNeighbors = false) ;
 
 public:
-	HalfEdgeSelector_QEMml(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
+	HalfEdgeSelector_QEMml(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		halfEdgeInfo = m.template addAttribute<HalfEdgeInfo, DART>("halfEdgeInfo") ;
@@ -124,7 +124,7 @@ private:
 	void recomputeQuadric(const Dart d, const bool recomputeNeighbors) ;
 
 public:
-	HalfEdgeSelector_Lightfield(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
+	HalfEdgeSelector_Lightfield(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		m_frame = m.template getAttribute<MATRIX33, VERTEX>("frame") ;
@@ -188,7 +188,7 @@ private:
 	void computeEdgeInfo(Dart d, EdgeInfo& einfo) ;
 
 public:
-	EdgeSelector_Lightfield(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
+	EdgeSelector_Lightfield(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
 		EdgeSelector<PFP>(m, pos, approx, select)
 	{
 		m_frame = m.template getAttribute<FRAME, VERTEX>("frame") ;

include/Algo/Decimation/lightfieldApproximator.h

@@ -98,8 +98,8 @@ public:
 	typedef Geom::Matrix<3,6,REAL> MATRIX36 ;
 
 protected:
-	AttributeHandler<VEC3, VERTEX> m_position ;
-	AttributeHandler<VEC3, EDGE> m_approxPosition ;
+	VertexAttribute<VEC3> m_position ;
+	EdgeAttribute<VEC3> m_approxPosition ;
 
 public:
 	Approximator_Frame(MAP& m, AttributeHandler<MATRIX33, VERTEX>& frame, Predictor<PFP, MATRIX33>* pred = NULL) :

include/Algo/Decimation/selector.h

@@ -60,12 +60,12 @@ public:
 
 protected:
 	MAP& m_map ;
-	AttributeHandler<typename PFP::VEC3, VERTEX>& m_position ;
+	VertexAttribute<typename PFP::VEC3>& m_position ;
 	std::vector<ApproximatorGen<PFP>*>& m_approximators ;
 	const FunctorSelect& m_select ;
 
 public:
-	EdgeSelector(MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
+	EdgeSelector(MAP& m, VertexAttribute<typename PFP::VEC3>& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select) :
 		m_map(m), m_position(pos), m_approximators(approx), m_select(select)
 	{}
 	virtual ~EdgeSelector()

include/Algo/Export/export.h

@@ -46,7 +46,7 @@ namespace Export
 * @return true
 */
 template <typename PFP>
-bool exportPLY(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, const bool binary, const FunctorSelect& good = allDarts) ;
+bool exportPLY(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, const bool binary, const FunctorSelect& good = allDarts) ;
 
 /**
 * export the map into a PLY file
@@ -57,7 +57,7 @@ bool exportPLY(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3
 * @return true
 */
 template <typename PFP>
-bool exportPLYnew(typename PFP::MAP& map, const std::vector<AttributeHandler<typename PFP::VEC3, VERTEX>* >& attributeHandlers, const char* filename, const bool binary, const FunctorSelect& good = allDarts) ;
+bool exportPLYnew(typename PFP::MAP& map, const std::vector<VertexAttribute<typename PFP::VEC3>* >& attributeHandlers, const char* filename, const bool binary, const FunctorSelect& good = allDarts) ;
 
 /**
 * export the map into a OFF file
@@ -66,7 +66,7 @@ bool exportPLYnew(typename PFP::MAP& map, const std::vector<AttributeHandler<typ
 * @return true
 */
 template <typename PFP>
-bool exportOFF(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, const FunctorSelect& good = allDarts) ;
+bool exportOFF(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, const FunctorSelect& good = allDarts) ;
 
 /**
 * export the map into a Trian file
@@ -75,7 +75,7 @@ bool exportOFF(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3
 * @return true
 */
 template <typename PFP>
-bool exportTrian(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, char* filename, const FunctorSelect& good = allDarts) ;
+bool exportTrian(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, char* filename, const FunctorSelect& good = allDarts) ;
 
 /**
 * export the map into a PLYPTMgeneric file (K. Vanhoey generic format).
@@ -90,7 +90,7 @@ bool exportTrian(typename PFP::MAP& map, const AttributeHandler<typename PFP::VE
 * @return true
 */
 //template <typename PFP>
-//bool exportPlySLFgeneric(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, const FunctorSelect& good = allDarts) ;
+//bool exportPlySLFgeneric(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, const FunctorSelect& good = allDarts) ;
 
 /**
 * export the map into a PLYPTMgeneric file (K. Vanhoey generic format).
@@ -105,7 +105,7 @@ bool exportTrian(typename PFP::MAP& map, const AttributeHandler<typename PFP::VE
 * @return true
 */
 //template <typename PFP>
-//bool exportPlySLFgenericBin(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, const FunctorSelect& good = allDarts) ;
+//bool exportPlySLFgenericBin(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, const FunctorSelect& good = allDarts) ;
 
 /**
 * export the map into a PLYSLF file (K. Vanhoey generic format).
@@ -120,7 +120,7 @@ bool exportTrian(typename PFP::MAP& map, const AttributeHandler<typename PFP::VE
 * @return true
 */
 template <typename PFP>
-bool exportPlyPTMgeneric(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, const FunctorSelect& good = allDarts) ;
+bool exportPlyPTMgeneric(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, const FunctorSelect& good = allDarts) ;
 
 /**
 * export the map into a PLYPTMgeneric file (K. Vanhoey generic format)
@@ -132,7 +132,7 @@ bool exportPlyPTMgeneric(typename PFP::MAP& map, const AttributeHandler<typename
 * @return true
 */
 template <typename PFP>
-bool exportPLYPTM(typename PFP::MAP& map, const char* filename, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const AttributeHandler<typename PFP::VEC3, VERTEX> frame[3], const AttributeHandler<typename PFP::VEC3, VERTEX> colorPTM[6], const FunctorSelect& good = allDarts) ;
+bool exportPLYPTM(typename PFP::MAP& map, const char* filename, const VertexAttribute<typename PFP::VEC3>& position, const VertexAttribute<typename PFP::VEC3> frame[3], const VertexAttribute<typename PFP::VEC3> colorPTM[6], const FunctorSelect& good = allDarts) ;
 
 } // namespace Export
 

include/Algo/Export/export.hpp

@@ -38,7 +38,7 @@ namespace Export
 {
 
 template <typename PFP>
-bool exportPLY(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, bool binary, const FunctorSelect& good)
+bool exportPLY(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, bool binary, const FunctorSelect& good)
 {
 	typedef typename PFP::MAP MAP;
 	typedef typename PFP::VEC3 VEC3;
@@ -165,7 +165,7 @@ bool exportPLY(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3
 }
 
 template <typename PFP>
-bool exportPLYnew(typename PFP::MAP& map, const std::vector<AttributeHandler<typename PFP::VEC3, VERTEX>*>& attributeHandlers, const char* filename, bool binary, const FunctorSelect& good)
+bool exportPLYnew(typename PFP::MAP& map, const std::vector<VertexAttribute<typename PFP::VEC3>*>& attributeHandlers, const char* filename, bool binary, const FunctorSelect& good)
 {
 	typedef typename PFP::MAP MAP;
 	typedef typename PFP::VEC3 VEC3;
@@ -241,7 +241,7 @@ bool exportPLYnew(typename PFP::MAP& map, const std::vector<AttributeHandler<typ
 	out << "comment or contact : cgogn@unistra.fr" << std::endl ;
 	// Vertex elements
 	out << "element vertex " << vertices.size() << std::endl ;
-	for (typename std::vector<AttributeHandler<typename PFP::VEC3, VERTEX>* >::const_iterator attrHandler = attributeHandlers.begin() ; attrHandler != attributeHandlers.end() ; ++attrHandler)
+	for (typename std::vector<VertexAttribute<typename PFP::VEC3>* >::const_iterator attrHandler = attributeHandlers.begin() ; attrHandler != attributeHandlers.end() ; ++attrHandler)
 	{
 		if ((*attrHandler)->isValid() && ((*attrHandler)->getOrbit() == VERTEX) )
 		{
@@ -281,7 +281,7 @@ bool exportPLYnew(typename PFP::MAP& map, const std::vector<AttributeHandler<typ
 	{
 		// ascii vertices
 		for(unsigned int i = 0; i < vertices.size(); ++i)
-			for (typename std::vector<AttributeHandler<typename PFP::VEC3, VERTEX>* >::const_iterator attrHandler = attributeHandlers.begin() ; attrHandler != attributeHandlers.end() ; ++attrHandler)
+			for (typename std::vector<VertexAttribute<typename PFP::VEC3>* >::const_iterator attrHandler = attributeHandlers.begin() ; attrHandler != attributeHandlers.end() ; ++attrHandler)
 				if ((*attrHandler)->isValid() && (*attrHandler)->getOrbit() == VERTEX)
 					out << (*(*attrHandler))[vertices[i]] << std::endl ;
 
@@ -298,7 +298,7 @@ bool exportPLYnew(typename PFP::MAP& map, const std::vector<AttributeHandler<typ
 	{
 		// binary vertices
 		for(unsigned int i = 0; i < vertices.size(); ++i)
-			for (typename std::vector<AttributeHandler<typename PFP::VEC3, VERTEX>*>::const_iterator attrHandler = attributeHandlers.begin() ; attrHandler != attributeHandlers.end() ; ++attrHandler)
+			for (typename std::vector<VertexAttribute<typename PFP::VEC3>*>::const_iterator attrHandler = attributeHandlers.begin() ; attrHandler != attributeHandlers.end() ; ++attrHandler)
 				if ((*attrHandler)->isValid() && (*attrHandler)->getOrbit() == VERTEX)
 				{
 					const typename PFP::VEC3& v = (*(*attrHandler))[vertices[i]] ;
@@ -320,7 +320,7 @@ bool exportPLYnew(typename PFP::MAP& map, const std::vector<AttributeHandler<typ
 }
 
 template <typename PFP>
-bool exportOFF(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, const FunctorSelect& good)
+bool exportOFF(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, const FunctorSelect& good)
 {
 	typedef typename PFP::MAP MAP;
 	typedef typename PFP::VEC3 VEC3;
@@ -387,7 +387,7 @@ bool exportOFF(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3
 }
 
 template <typename PFP>
-bool exportPlyPTMgeneric(typename PFP::MAP& map, const AttributeHandler<typename PFP::VEC3, VERTEX>& position, const char* filename, const FunctorSelect& good)
+bool exportPlyPTMgeneric(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const char* filename, const FunctorSelect& good)
 {
 	typedef typename PFP::MAP MAP;