Merge branch 'develop' of cgogn:~thery/CGoGNMR into develop

Apps/Benches/bench_remesh.cpp

+#include "Topology/generic/parameters.h"
+#include "Topology/map/embeddedMap2.h"
+
+#include "Geometry/vector_gen.h"
+
+#include "Algo/Import/import.h"
+#include "Algo/Export/export.h"
+
+#include "Algo/Geometry/boundingbox.h"
+#include "Algo/Geometry/normal.h"
+
+#include "Algo/Modelisation/subdivision.h"
+#include "Algo/Decimation/decimation.h"
+
+#include "Utils/chrono.h"
+#include "Algo/Filtering/average.h"
+
+using namespace CGoGN ;
+
+struct PFP: public PFP_STANDARD
+{
+	// definition of the map
+	typedef EmbeddedMap2 MAP ;
+};
+
+typedef PFP::MAP MAP ;
+
+
+int main(int argc, char **argv)
+{
+
+	if(argc != 2)
+		return 1;
+
+	MAP myMap;
+
+	std::vector<std::string> attrNames ;
+	if(!Algo::Surface::Import::importMesh<PFP>(myMap, argv[1], attrNames))
+	{
+		CGoGNerr << "could not import " << argv[1] << CGoGNendl ;
+		return 2;
+	}
+	VertexAttribute<PFP::VEC3, MAP> position = myMap.getAttribute<PFP::VEC3,VERTEX,MAP>( attrNames[0]) ;
+
+
+	Utils::Chrono chrono;
+
+	chrono.start();
+
+	Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
+	Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
+	Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
+	unsigned int nbVertices = Algo::Topo::getNbOrbits<VERTEX>(myMap) ;
+
+	std::vector<VertexAttribute<typename PFP::VEC3, MAP> *> attr;
+	attr.push_back(&position);
+	Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices * 0.1) ;
+
+	Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
+	Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
+	nbVertices = Algo::Topo::getNbOrbits<VERTEX>(myMap) ;
+
+	Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices * 0.1) ;
+
+	Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
+	Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
+	nbVertices = Algo::Topo::getNbOrbits<VERTEX>(myMap) ;
+
+	Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices * 0.1) ;
+
+	Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP>(myMap, position) ;
+	Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP>(myMap, position) ;
+
+	CGoGNout << "BenchTime dynamic "<< chrono.elapsed() << " ms"<< CGoGNendl;
+
+	Algo::Surface::Export::exportOFF<PFP>(myMap,position,"bench_res.off");
+
+	return 0;
+}

Apps/Benches/bench_trav.cpp

+/*******************************************************************************
+* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps  *
+* version 0.1                                                                  *
+* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg           *
+*                                                                              *
+* This library is free software; you can redistribute it and/or modify it      *
+* under the terms of the GNU Lesser General Public License as published by the *
+* Free Software Foundation; either version 2.1 of the License, or (at your     *
+* option) any later version.                                                   *
+*                                                                              *
+* This library is distributed in the hope that it will be useful, but WITHOUT  *
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or        *
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License  *
+* for more details.                                                            *
+*                                                                              *
+* You should have received a copy of the GNU Lesser General Public License     *
+* along with this library; if not, write to the Free Software Foundation,      *
+* Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
+*                                                                              *
+* Web site: http://cgogn.unistra.fr/                                           *
+* Contact information: cgogn@unistra.fr                                        *
+*                                                                              *
+*******************************************************************************/
+
+
+#include "Topology/generic/parameters.h"
+#include "Topology/map/embeddedMap3.h"
+#include "Algo/Tiling/Volume/cubic.h"
+#include "Algo/Geometry/area.h"
+#include "Algo/Geometry/volume.h"
+#include "Utils/chrono.h"
+
+
+using namespace CGoGN ;
+
+/**
+ * Struct that contains some informations about the types of the manipulated objects
+ * Mainly here to be used by the algorithms that are parameterized by it
+ */
+struct PFP: public PFP_STANDARD
+{
+	// definition of the type of the map
+	typedef EmbeddedMap3 MAP;
+	typedef double REAL;
+	typedef Geom::Vector<3,REAL> VEC3;
+};
+
+typedef PFP::MAP MAP;
+typedef PFP::MAP::IMPL MAP_IMPL;
+typedef PFP::VEC3 VEC3;
+
+int main()
+{
+	// declare a map to handle the mesh
+	MAP myMap;
+
+	Utils::Chrono ch;
+	ch.start();
+	// add position attribute on vertices and get handler on it
+	VertexAttribute<VEC3, MAP> position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
+	constexpr int nb = 100;
+	Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, nb, nb, nb);
+	cubic.embedIntoGrid(position, 10.0f, 10.0f, 10.0f);
+	std::cout<< "construct grid in " << ch.elapsed()<< " ms"<< std::endl;
+
+	ch.start();
+	VEC3 centerMesh(0,0,0);
+	int nbVols=0;
+	foreach_cell<VOLUME>(myMap, [&](Vol w) // foreach volume
+	{
+		VEC3 centerVol(0,0,0);
+		int nbFaces=0;
+		foreach_incident3<FACE>(myMap, w, [&](Face f) // foreach face of each volume
+		{
+			VEC3 centerFace(0,0,0);
+			int nbVert=0;
+			foreach_incident3<VERTEX>(myMap, f, [&](Vertex v) // foreach vertex of each face of each volume
+			{
+				centerFace += position[v];
+				nbVert++;
+			});
+			centerFace /=nbVert;
+			centerVol += centerFace;
+		});
+		centerVol /= nbFaces;
+		centerMesh += centerVol;
+	});
+	centerMesh /= nbVols;
+	CGoGNout<< "Traverse with foreach in " << ch.elapsed()<< " ms"<< CGoGNendl;
+
+
+	ch.start();
+	centerMesh=VEC3(0,0,0);
+	nbVols=0;
+	TraversorW<MAP> tw(myMap);	// alias for Traversor<MAP,VERTEX>
+	for (Dart dw=tw.begin(); dw!=tw.end(); dw=tw.next())
+	{
+		VEC3 centerVol(0,0,0);
+		int nbFaces=0;
+		Traversor3WF<MAP> trwf(myMap, dw);
+		for (Dart df = trwf.begin(); df != trwf.end(); df = trwf.next())
+		{
+			VEC3 centerFace(0,0,0);
+			int nbVert=0;
+			Traversor3FV<MAP> trfv(myMap, df);
+			for (Dart dv = trfv.begin(); dv != trfv.end(); dv = trfv.next())
+			{
+				centerFace += position[dv];
+				nbVert++;
+			}
+			centerFace /=nbVert;
+			centerVol += centerFace;
+		}
+		centerVol /= nbFaces;
+		centerMesh += centerVol;
+	}
+	CGoGNout<< "Traverse with traversor in " << ch.elapsed()<< " ms"<< CGoGNendl;
+
+	ch.start();
+	PFP::REAL vol = Algo::Geometry::totalVolume<PFP>(myMap, position);
+	CGoGNout<< "Parallel volume:" << ch.elapsed()<< " ms  val="<<vol<< CGoGNendl;
+
+	vol = 0;
+	foreach_cell<VOLUME>(myMap, [&](Vol w) // foreach volume
+	{
+		vol += Algo::Geometry::convexPolyhedronVolume<PFP>(myMap, w, position) ;
+	});
+
+	CGoGNout<< "Linear volume:" << ch.elapsed()<< " ms  val="<<vol<< CGoGNendl;
+
+
+	return 0;
+}

Apps/CMakeLists.txt

@@ -35,6 +35,8 @@ ENDIF (WITH_QT)
 
 add_subdirectory(Examples/Tests)
 
+add_subdirectory(Benches)
+
 add_subdirectory(Tuto/Traversals)
 add_subdirectory(Tuto/Attributes)
 add_subdirectory(Tuto/Markers)

SCHNApps/Plugins/surface_deformation/include/surface_deformation.h

@@ -28,19 +28,19 @@ struct MapParameters
 	void start(MapHandlerGen* mh);
 	void stop(MapHandlerGen* mh);
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> positionAttribute;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> positionAttribute;
 
 	CellSelector<PFP2::MAP, VERTEX>* handleSelector;
 	CellSelector<PFP2::MAP, VERTEX>* freeSelector;
 
 	bool initialized;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> positionInit;
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> diffCoord;
-	VertexAttribute<Eigen_Matrix3f, PFP2::MAP::IMPL> vertexRotationMatrix;
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> rotatedDiffCoord;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> positionInit;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> diffCoord;
+	VertexAttribute<Eigen_Matrix3f, PFP2::MAP> vertexRotationMatrix;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> rotatedDiffCoord;
 
-	VertexAttribute<unsigned int, PFP2::MAP::IMPL> vIndex;
+	VertexAttribute<unsigned int, PFP2::MAP> vIndex;
 	unsigned int nb_vertices;
 
 	NLContext nlContext;

SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp

@@ -185,11 +185,11 @@ void Surface_DifferentialProperties_Plugin::computeNormal(
 	if(mh == NULL)
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
 	if(!position.isValid())
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> normal = mh->getAttribute<PFP2::VEC3, VERTEX>(normalAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> normal = mh->getAttribute<PFP2::VEC3, VERTEX>(normalAttributeName);
 	if(!normal.isValid())
 		normal = mh->addAttribute<PFP2::VEC3, VERTEX>(normalAttributeName);
 
@@ -219,35 +219,35 @@ void Surface_DifferentialProperties_Plugin::computeCurvature(
 	if(mh == NULL)
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
 	if(!position.isValid())
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> normal = mh->getAttribute<PFP2::VEC3, VERTEX>(normalAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> normal = mh->getAttribute<PFP2::VEC3, VERTEX>(normalAttributeName);
 	if(!normal.isValid())
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> Kmax = mh->getAttribute<PFP2::VEC3, VERTEX>(KmaxAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> Kmax = mh->getAttribute<PFP2::VEC3, VERTEX>(KmaxAttributeName);
 	if(!Kmax.isValid())
 		Kmax = mh->addAttribute<PFP2::VEC3, VERTEX>(KmaxAttributeName);
 
-	VertexAttribute<PFP2::REAL, PFP2::MAP::IMPL> kmax = mh->getAttribute<PFP2::REAL, VERTEX>(kmaxAttributeName);
+	VertexAttribute<PFP2::REAL, PFP2::MAP> kmax = mh->getAttribute<PFP2::REAL, VERTEX>(kmaxAttributeName);
 	if(!kmax.isValid())
 		kmax = mh->addAttribute<PFP2::REAL, VERTEX>(kmaxAttributeName);
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> Kmin = mh->getAttribute<PFP2::VEC3, VERTEX>(KminAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> Kmin = mh->getAttribute<PFP2::VEC3, VERTEX>(KminAttributeName);
 	if(!Kmin.isValid())
 		Kmin = mh->addAttribute<PFP2::VEC3, VERTEX>(KminAttributeName);
 
-	VertexAttribute<PFP2::REAL, PFP2::MAP::IMPL> kmin = mh->getAttribute<PFP2::REAL, VERTEX>(kminAttributeName);
+	VertexAttribute<PFP2::REAL, PFP2::MAP> kmin = mh->getAttribute<PFP2::REAL, VERTEX>(kminAttributeName);
 	if(!kmin.isValid())
 		kmin = mh->addAttribute<PFP2::REAL, VERTEX>(kminAttributeName);
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> Knormal = mh->getAttribute<PFP2::VEC3, VERTEX>(KnormalAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> Knormal = mh->getAttribute<PFP2::VEC3, VERTEX>(KnormalAttributeName);
 	if(!Knormal.isValid())
 		Knormal = mh->addAttribute<PFP2::VEC3, VERTEX>(KnormalAttributeName);
 
-	EdgeAttribute<PFP2::REAL, PFP2::MAP::IMPL> edgeAngle = mh->getAttribute<PFP2::REAL, EDGE>("edgeAngle");
+	EdgeAttribute<PFP2::REAL, PFP2::MAP> edgeAngle = mh->getAttribute<PFP2::REAL, EDGE>("edgeAngle");
 	if(!edgeAngle.isValid())
 		edgeAngle = mh->addAttribute<PFP2::REAL, EDGE>("edgeAngle");
 
@@ -269,7 +269,7 @@ void Surface_DifferentialProperties_Plugin::computeCurvature(
 
 	if(compute_kmean)
 	{
-		VertexAttribute<PFP2::REAL, PFP2::MAP::IMPL> kmean = mh->getAttribute<PFP2::REAL, VERTEX>("kmean");
+		VertexAttribute<PFP2::REAL, PFP2::MAP> kmean = mh->getAttribute<PFP2::REAL, VERTEX>("kmean");
 		if(!kmean.isValid())
 			kmean = mh->addAttribute<PFP2::REAL, VERTEX>("kmean");
 
@@ -281,7 +281,7 @@ void Surface_DifferentialProperties_Plugin::computeCurvature(
 
 	if(compute_kgaussian)
 	{
-		VertexAttribute<PFP2::REAL, PFP2::MAP::IMPL> kgaussian = mh->getAttribute<PFP2::REAL, VERTEX>("kgaussian");
+		VertexAttribute<PFP2::REAL, PFP2::MAP> kgaussian = mh->getAttribute<PFP2::REAL, VERTEX>("kgaussian");
 		if(!kgaussian.isValid())
 			kgaussian = mh->addAttribute<PFP2::REAL, VERTEX>("kgaussian");
 

SCHNApps/Plugins/surface_import/src/surface_import.cpp

@@ -37,7 +37,7 @@ MapHandlerGen* Surface_Import_Plugin::importFromFile(const QString& fileName)
 			Algo::Surface::Import::importMesh<PFP2>(*map, fileName.toStdString(), attrNames);
 
 			// get vertex position attribute
-			VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> position = map->getAttribute<PFP2::VEC3, VERTEX>(attrNames[0]);
+			VertexAttribute<PFP2::VEC3, PFP2::MAP> position = map->getAttribute<PFP2::VEC3, VERTEX, PFP2::MAP>(attrNames[0]);
 			mh->registerAttribute(position);
 
 			// update corresponding VBO & emit attribute update signal

SCHNApps/Plugins/surface_modelisation/include/surface_modelisation.h

@@ -25,7 +25,7 @@ struct MapParameters
 		faceSelector(NULL)
 	{}
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> positionAttribute;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> positionAttribute;
 
 	CellSelector<PFP2::MAP, VERTEX>* vertexSelector;
 	CellSelector<PFP2::MAP, EDGE>* edgeSelector;

SCHNApps/Plugins/surface_modelisation/src/surface_modelisation.cpp

@@ -217,7 +217,7 @@ void Surface_Modelisation_Plugin::createEmptyMap()
 		MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(mhg);
 
 		// add vertex position attribute
-		VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> position = mh->addAttribute<PFP2::VEC3, VERTEX>("position");
+		VertexAttribute<PFP2::VEC3, PFP2::MAP> position = mh->addAttribute<PFP2::VEC3, VERTEX>("position");
 		// update corresponding VBO & emit attribute update signal
 		mh->notifyAttributeModification(position);
         mapNumber++;
@@ -230,7 +230,7 @@ void Surface_Modelisation_Plugin::createNewFace(MapHandlerGen* mhg)
     PFP2::MAP* map = mh->getMap();
     if (h_parameterSet[mhg].positionAttribute.isValid())
     {
-		VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL>& position = h_parameterSet[mhg].positionAttribute;
+		VertexAttribute<PFP2::VEC3, PFP2::MAP>& position = h_parameterSet[mhg].positionAttribute;
         if (collectedVertices.size() >= 3)
         {
             Dart d = map->newFace(collectedVertices.size());
@@ -259,7 +259,7 @@ void Surface_Modelisation_Plugin::addCube(MapHandlerGen *mhg)
     PFP2::MAP* map = mh->getMap();
     if (h_parameterSet[mhg].positionAttribute.isValid())
     {
-		VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL>& position = h_parameterSet[mhg].positionAttribute;
+		VertexAttribute<PFP2::VEC3, PFP2::MAP>& position = h_parameterSet[mhg].positionAttribute;
 
         Algo::Surface::Modelisation::embedPrism<PFP2>(*map, position, 4, true, 0.7f, 0.7f, 1.0f);
 
@@ -743,7 +743,7 @@ void Surface_Modelisation_Plugin::pathExtrudeFace(MapHandlerGen *mhg)
     PFP2::MAP* map = mh->getMap();
 
     MapParameters& p = h_parameterSet[mhg];
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL>& position = p.positionAttribute;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP>& position = p.positionAttribute;
     if(p.faceSelector && !p.faceSelector->getSelectedCells().empty())
     {
 		const std::vector<Face>& selectedDart = p.faceSelector->getSelectedCells();

SCHNApps/Plugins/surface_renderScalar/src/surface_renderScalar.cpp

@@ -160,7 +160,7 @@ void Surface_RenderScalar_Plugin::attributeModified(unsigned int orbit, QString
 			if(mapParam.scalarVBO && nameAttr == QString::fromStdString(mapParam.scalarVBO->name()))
 			{
 				MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(map);
-				const VertexAttribute<PFP2::REAL, PFP2::MAP::IMPL>& attr = mh->getAttribute<PFP2::REAL, VERTEX>(nameAttr);
+				const VertexAttribute<PFP2::REAL, PFP2::MAP>& attr = mh->getAttribute<PFP2::REAL, VERTEX>(nameAttr);
 				mapParam.scalarMin = std::numeric_limits<float>::max();
 				mapParam.scalarMax = std::numeric_limits<float>::min();
 				for(unsigned int i = attr.begin(); i != attr.end(); attr.next(i))
@@ -207,7 +207,7 @@ void Surface_RenderScalar_Plugin::changeScalarVBO(const QString& view, const QSt
 		if(vbuf)
 		{
 			MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(m);
-			const VertexAttribute<PFP2::REAL, PFP2::MAP::IMPL>& attr = mh->getAttribute<PFP2::REAL, VERTEX>(QString::fromStdString(vbuf->name()));
+			const VertexAttribute<PFP2::REAL, PFP2::MAP>& attr = mh->getAttribute<PFP2::REAL, VERTEX>(QString::fromStdString(vbuf->name()));
 			p.scalarMin = std::numeric_limits<float>::max();
 			p.scalarMax = std::numeric_limits<float>::min();
 			for(unsigned int i = attr.begin(); i != attr.end(); attr.next(i))

SCHNApps/Plugins/surface_renderScalar/src/surface_renderScalar_dockTab.cpp

@@ -60,7 +60,7 @@ void Surface_RenderScalar_DockTab::selectedScalarVBOChanged()
 				if(vbo)
 				{
 					MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(map);
-					const VertexAttribute<PFP2::REAL, PFP2::MAP::IMPL>& attr = mh->getAttribute<PFP2::REAL, VERTEX>(QString::fromStdString(vbo->name()));
+					const VertexAttribute<PFP2::REAL, PFP2::MAP>& attr = mh->getAttribute<PFP2::REAL, VERTEX>(QString::fromStdString(vbo->name()));
 					p.scalarMin = std::numeric_limits<float>::max();
 					p.scalarMax = std::numeric_limits<float>::min();
 					for(unsigned int i = attr.begin(); i != attr.end(); attr.next(i))

SCHNApps/Plugins/surface_renderTopo/include/surface_renderTopo.h

@@ -25,7 +25,7 @@ struct MapParameters
 		facesScaleFactor(1.0f)
 	{}
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> positionAttribute;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> positionAttribute;
 	bool drawDarts;
 	QColor dartsColor;
 	bool drawPhi1;

SCHNApps/Plugins/surface_selection/include/surface_selection.h

@@ -26,8 +26,8 @@ struct MapParameters
 		selectionMethod(SingleCell)
 	{}
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> positionAttribute;
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> normalAttribute;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> positionAttribute;
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> normalAttribute;
 	SelectionMethod selectionMethod;
 };
 

SCHNApps/Plugins/surface_subdivision/src/surface_subdivision.cpp

@@ -64,7 +64,7 @@ void Surface_Subdivision_Plugin::loopSubdivision(
 	if(mh == NULL)
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
 	if(!position.isValid())
 		return;
 
@@ -86,7 +86,7 @@ void Surface_Subdivision_Plugin::CCSubdivision(
 	if(mh == NULL)
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
 	if(!position.isValid())
 		return;
 
@@ -108,7 +108,7 @@ void Surface_Subdivision_Plugin::trianguleFaces(
 	if(mh == NULL)
 		return;
 
-	VertexAttribute<PFP2::VEC3, PFP2::MAP::IMPL> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> position = mh->getAttribute<PFP2::VEC3, VERTEX>(positionAttributeName);
 	if(!position.isValid())
 		return;
 

SCHNApps/Plugins/volume_import/src/volume_import.cpp

@@ -37,7 +37,7 @@ MapHandlerGen* Volume_Import_Plugin::importFromFile(const QString& fileName)
 			Algo::Volume::Import::importMesh<PFP3>(*map, fileName.toStdString(), attrNames);
 
 			// get vertex position attribute
-			VertexAttribute<PFP3::VEC3, PFP3::MAP::IMPL> position = map->getAttribute<PFP3::VEC3, VERTEX>(attrNames[0]);
+			VertexAttribute<PFP3::VEC3, PFP3::MAP> position = map->getAttribute<PFP3::VEC3, VERTEX, PFP3::MAP>(attrNames[0]);
 			mh->registerAttribute(position);
 
 			// update corresponding VBO & emit attribute update signal

SCHNApps/include/mapHandler.h

@@ -193,7 +193,6 @@ template <typename PFP>
 class MapHandler : public MapHandlerGen
 {
 	typedef typename PFP::MAP MAP;
-	typedef typename PFP::MAP::IMPL MAP_IMPL;
 	typedef typename PFP::VEC3 VEC3;
 
 public:
@@ -221,10 +220,10 @@ public:
 	 *********************************************************/
 
 	template <typename T, unsigned int ORBIT>
-	AttributeHandler<T, ORBIT, MAP_IMPL> getAttribute(const QString& nameAttr, bool onlyRegistered = true) const;
+	AttributeHandler<T, ORBIT, MAP> getAttribute(const QString& nameAttr, bool onlyRegistered = true) const;
 
 	template <typename T, unsigned int ORBIT>
-	AttributeHandler<T, ORBIT, MAP_IMPL> addAttribute(const QString& nameAttr, bool registerAttr = true);
+	AttributeHandler<T, ORBIT, MAP> addAttribute(const QString& nameAttr, bool registerAttr = true);
 
 	/*********************************************************
 	 * MANAGE DRAWING
@@ -233,7 +232,7 @@ public:
 	void draw(Utils::GLSLShader* shader, int primitive);
 	void drawBB();
 
-	void updateBB(const VertexAttribute<VEC3, MAP_IMPL>& position);
+	void updateBB(const VertexAttribute<VEC3, MAP>& position);
 	void updateBBDrawer();
 
 	/*********************************************************

SCHNApps/include/mapHandler.hpp

@@ -36,24 +36,24 @@ unsigned int MapHandler<PFP>::getNbOrbits(unsigned int orbit)
 
 template <typename PFP>
 template <typename T, unsigned int ORBIT>
-AttributeHandler<T, ORBIT, typename PFP::MAP::IMPL> MapHandler<PFP>::getAttribute(const QString& nameAttr, bool onlyRegistered) const
+AttributeHandler<T, ORBIT, typename PFP::MAP> MapHandler<PFP>::getAttribute(const QString& nameAttr, bool onlyRegistered) const
 {
 	if(onlyRegistered)
 	{
 		if(m_attribs[ORBIT].contains(nameAttr))
-			return static_cast<MAP*>(m_map)->template getAttribute<T, ORBIT>(nameAttr.toStdString());
+			return static_cast<MAP*>(m_map)->template getAttribute<T, ORBIT, MAP>(nameAttr.toStdString());
 		else
-			return AttributeHandler<T, ORBIT, MAP_IMPL>();
+			return AttributeHandler<T, ORBIT, MAP>();
 	}
 	else
-		return static_cast<MAP*>(m_map)->template getAttribute<T, ORBIT>(nameAttr.toStdString());
+		return static_cast<MAP*>(m_map)->template getAttribute<T, ORBIT, MAP>(nameAttr.toStdString());
 }
 
 template <typename PFP>
 template <typename T, unsigned int ORBIT>
-AttributeHandler<T, ORBIT, typename PFP::MAP::IMPL> MapHandler<PFP>::addAttribute(const QString& nameAttr, bool registerAttr)
+AttributeHandler<T, ORBIT, typename PFP::MAP> MapHandler<PFP>::addAttribute(const QString& nameAttr, bool registerAttr)
 {
-	AttributeHandler<T, ORBIT, MAP_IMPL> ah = static_cast<MAP*>(m_map)->template addAttribute<T, ORBIT>(nameAttr.toStdString());
+	AttributeHandler<T, ORBIT, MAP> ah = static_cast<MAP*>(m_map)->template addAttribute<T, ORBIT, MAP>(nameAttr.toStdString());
 	if(ah.isValid() && registerAttr)
 	{
 		registerAttribute(ah);
@@ -94,7 +94,7 @@ void MapHandler<PFP>::drawBB()
 }
 
 template <typename PFP>
-void MapHandler<PFP>::updateBB(const VertexAttribute<VEC3, MAP_IMPL>& position)
+void MapHandler<PFP>::updateBB(const VertexAttribute<VEC3, MAP>& position)
 {
 	m_bb = CGoGN::Algo::Geometry::computeBoundingBox<PFP>(*(static_cast<MAP*>(m_map)), position);
 	m_bbMin = qglviewer::Vec(m_bb.min()[0], m_bb.min()[1], m_bb.min()[2]);

include/Algo/BooleanOperator/mergeVertices.h

@@ -42,13 +42,13 @@ namespace BooleanOperator
 {
 
 template <typename PFP>
-bool isBetween(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions, Dart d, Dart e, Dart f) ;
+bool isBetween(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e, Dart f) ;
 
 template <typename PFP>
-void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions, Dart d, Dart e);
+void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e);
 
 template <typename PFP>
-void mergeVertices(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions);
+void mergeVertices(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions);
 
 }
 

include/Algo/BooleanOperator/mergeVertices.hpp

@@ -35,7 +35,7 @@ namespace BooleanOperator
 {
 
 template <typename PFP>
-bool isBetween(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions, Dart d, Dart e, Dart f)
+bool isBetween(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e, Dart f)
 {
 	return CGoGN::Geom::isBetween(positions[map.phi1(d)]-positions[d],
 	                 positions[map.phi1(e)]-positions[e],
@@ -43,7 +43,7 @@ bool isBetween(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3,
 }
 
 template <typename PFP>
-void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions, Dart d, Dart e, int precision)
+void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e, int precision)
 {
 	assert(positions[d].isNear(positions[e], precision) && !map.sameVertex(d, e)) ;
 
@@ -76,7 +76,7 @@ void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typ
 }
 
 template <typename PFP>
-void mergeVertices(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions, int precision)
+void mergeVertices(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, int precision)
 {
 	// TODO optimiser en triant les sommets
 	// map.template enableQuickTraversal<VERTEX>();

include/Algo/Decimation/approximator.hpp

@@ -52,13 +52,13 @@ Approximator<PFP,T,ORBIT>::Approximator(MAP& m, std::vector<VertexAttribute<T, M
 
 		std::stringstream aname ;
 		aname << "approx_" << m_attrV[i]->name() ;
-		m_approx[i] = this->m_map.template addAttribute<T, ORBIT>(aname.str()) ;
+		m_approx[i] = this->m_map.template addAttribute<T, ORBIT, MAP>(aname.str()) ;
 
 		if(m_predictor)	// if predictors are associated to the approximator
 		{				// create attributes to store the details needed for reconstruction
 			std::stringstream dname ;
 			dname << "detail_" << m_attrV[i]->name() ;
-			m_detail[i] = this->m_map.template addAttribute<T, ORBIT>(dname.str()) ;
+			m_detail[i] = this->m_map.template addAttribute<T, ORBIT, MAP>(dname.str()) ;
 		}
 	}
 }
@@ -117,14 +117,14 @@ Approximator<PFP,T,ORBIT>::getApprox(Dart d, unsigned int index) const
 }
 
 template <typename PFP, typename T, unsigned int ORBIT>
-const VertexAttribute<T, typename PFP::MAP::IMPL>&
+const VertexAttribute<T, typename PFP::MAP>&
 Approximator<PFP,T,ORBIT>::getAttr(unsigned int index) const
 {
 	return *(m_attrV[index]) ;
 }
 
 template <typename PFP, typename T, unsigned int ORBIT>
-VertexAttribute<T, typename PFP::MAP::IMPL>&
+VertexAttribute<T, typename PFP::MAP>&
 Approximator<PFP,T,ORBIT>::getAttr(unsigned int index)
 {
 	return *(m_attrV[index]) ;

include/Algo/Decimation/colorPerVertexApproximator.h

@@ -71,10 +71,10 @@ public:
 	{
 		assert(m_color->isValid() || !"Approximator_ColorNaive: the approximated attribute is not valid") ;
 
-		m_position = this->m_map.template getAttribute<VEC3, VERTEX>("position") ;
+		m_position = this->m_map.template getAttribute<VEC3, VERTEX, MAP>("position") ;
 		assert(m_position.isValid() || !"Approximator_ColorNaive::init: the position attribute is not valid") ;
 
-		m_approxposition = this->m_map.template getAttribute<VEC3, EDGE>("approx_position") ;
+		m_approxposition = this->m_map.template getAttribute<VEC3, EDGE, MAP>("approx_position") ;
 		assert(m_approxposition.isValid() || !"Approximator_ColorNaive::init: the approx_position attribute is not valid") ;
 
 		return m_color->isValid() && m_position.isValid() && m_approxposition.isValid() ;

include/Algo/Decimation/colorPerVertexApproximator.hpp

@@ -59,7 +59,7 @@ void Approximator_ColorNaive<PFP>::approximate(Dart d)
 template <typename PFP>
 bool Approximator_ColorQEMext<PFP>::init()
 {
-	m_quadric = this->m_map.template getAttribute<Utils::QuadricNd<REAL,6>, VERTEX>("QEMext-quadric") ;
+	m_quadric = this->m_map.template getAttribute<Utils::QuadricNd<REAL,6>, VERTEX, MAP>("QEMext-quadric") ;
 	// Does not require to be valid (if it is not, altenatives will be used).
 
 	if(this->m_predictor)
@@ -171,7 +171,7 @@ void Approximator_ColorQEMext<PFP>::approximate(Dart d)
 template <typename PFP>
 bool Approximator_GeomColOpt<PFP>::init()
 {
-	m_quadric = this->m_map.template getAttribute<Utils::Quadric<REAL>, VERTEX>("QEMquadric") ;
+	m_quadric = this->m_map.template getAttribute<Utils::Quadric<REAL>, VERTEX, MAP>("QEMquadric") ;
 	// Does not require to be valid (if it is not, altenatives will be used).
 
 	if(this->m_predictor)

include/Algo/Decimation/decimation.h

@@ -63,9 +63,9 @@ int decimate(
 	typename PFP::MAP& map,
 	SelectorType s,
 	ApproximatorType a,
-	std::vector<VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>*>& attribs,
+	std::vector<VertexAttribute<typename PFP::VEC3, typename PFP::MAP>*>& attribs,
 	unsigned int