resolving compilation pb

include/Algo/BooleanOperator/mergeVertices.hpp

@@ -60,7 +60,7 @@ void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3>& po
 		Dart d1 = d ;
 		do
 		{
-			if (CGoGN::Algo::BooleanOperator::isBetween<PFP>(map, positions, e, d,
+			if (BooleanOperator::isBetween<PFP>(map, positions, e, d,
 			                                                 map.alpha1(d))) break ;
 			d = map.alpha1(d) ;
 		} while (d != d1) ;

include/Algo/Export/exportPov.h

@@ -49,7 +49,7 @@ void exportMeshPlain(std::ofstream& out, typename PFP::MAP& map, VertexAttribute
 		unsigned int nb = map.faceDegree(d);
 
 		if(nb == 3)
-			Algo::ExportPov::exportTrianglePlain<PFP>(out,position[d],position[map.phi1(d)],position[map.phi1(map.phi1(d))]);
+			exportTrianglePlain<PFP>(out,position[d],position[map.phi1(d)],position[map.phi1(map.phi1(d))]);
 		else
 		{
 			out << "polygon{ " << nb+1 << std::endl;
@@ -219,7 +219,7 @@ bool exportScenePov(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3>&
 	out << "count 100 nearest_count 10 error_bound 0.15 recursion_limit 1 low_error_factor 0.2 gray_threshold 0.0 minimum_reuse 0.015 brightness 1 adc_bailout 0.01/2 normal off media off}" << std::endl;
 	out << "max_trace_level 255}" << std::endl;
 
-	exportMeshPlain<PFP>(out,map,position,"myMesh",good);
+	exportMeshPlain<PFP>(out,map,position,"myMesh");
 
 	out << "object {myMesh" << std::endl;
  	out << "translate <" << translate[0] << "," << translate[1] << "," << translate[2] << ">" << std::endl;
@@ -263,11 +263,7 @@ bool exportScenePovSmooth(typename PFP::MAP& map, VertexAttribute<typename PFP::
 //	out << "count 300 nearest_count 10 error_bound 0.15 recursion_limit 1 low_error_factor 0.2 gray_threshold 0.0 minimum_reuse 0.015 brightness 1 adc_bailout 0.01/2 normal off media off}" << std::endl;
 	out << "max_trace_level 60}" << std::endl;
 
-<<<<<<< HEAD
-	Algo::ExportPov::export3MeshPlainSmooth<PFP>(out,map,position,"myMesh");
-=======
-	export3MeshPlainSmooth<PFP>(out,map,position,"myMesh",good);
->>>>>>> 9da4717808f9c38da5f9d54d821f4b1e3050bbc1
+	export3MeshPlainSmooth<PFP>(out,map,position,"myMesh");
 
 	out << "object {myMesh" << std::endl;
  	out << "translate <" << translate[0] << "," << translate[1] << "," << translate[2] << ">" << std::endl;

include/Algo/Import/importSvg.hpp

@@ -350,7 +350,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
 
 	/////////////////////////////////////////////////////////////////////////////////////////////
 	// Merge near vertices
-	Algo::BooleanOperator::mergeVertices<PFP>(map,position,1);
+	BooleanOperator::mergeVertices<PFP>(map,position,1);
 	std::cout << "importSVG : Merging of vertices." << std::endl;
 
 	/////////////////////////////////////////////////////////////////////////////////////////////
@@ -521,7 +521,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
 	{
 		for (Dart d = map.begin() ; d != map.end() ; map.next(d))
 		{
-			if(map.isBoundaryMarked(d))
+			if(map.isBoundaryMarked2(d))
 			{
 				map.fillHole(d);
 			}
@@ -557,7 +557,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
 
 		for (Dart d = map.begin() ; d != map.end() ; map.next(d))
 		{
-			if (!map.isBoundaryMarked(d) && brokenL.isMarked(d))
+			if (!map.isBoundaryMarked2(d) && brokenL.isMarked(d))
 			{
 				map.deleteFace(d,false);
 			}
@@ -567,7 +567,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
 
 		for (Dart d = map.begin() ; d != map.end() ; map.next(d))
 		{
-			if (map.isBoundaryMarked(d))
+			if (map.isBoundaryMarked2(d))
 				buildingMark.mark(d);
 		}
 

include/Algo/MovingObjects/particle_base.h

@@ -33,6 +33,9 @@ namespace CGoGN
 namespace Algo
 {
 
+namespace Surface
+{
+
 namespace MovingObjects
 {
 
@@ -73,10 +76,14 @@ public:
 	}
 } ;
 
+
+
 } // namespace MovingObjects
 
 } // namespace Algo
 
+}
+
 } // namespace CGoGN
 
 #endif

include/Algo/MovingObjects/particle_cell_2D.h

@@ -29,7 +29,7 @@ enum
 } ;
 
 template <typename PFP>
-class ParticleCell2D : public MovingObjects::ParticleBase<PFP>
+class ParticleCell2D : public ParticleBase<PFP>
 {
 public:
 	typedef typename PFP::MAP MAP ;

include/Algo/MovingObjects/particle_cell_3D.h

@@ -31,7 +31,7 @@ enum {
 };
 
 template <typename PFP>
-class ParticleCell3D : public MovingObjects::ParticleBase
+class ParticleCell3D : public Algo::MovingObjects::ParticleBase
 {
 public :
 	typedef typename PFP::MAP Map;
@@ -55,7 +55,7 @@ public :
 	{}
 
 	ParticleCell3D(Map& map, Dart belonging_cell, VEC3 pos, const TAB_POS& tabPos) :
-		ParticleBase(pos), m(map), position(tabPos), d(belonging_cell), state(3)
+		Algo::MovingObjects::ParticleBase(pos), m(map), position(tabPos), d(belonging_cell), state(3)
 	{
 		m_positionFace = pointInFace(d);
 	}

include/Algo/Render/GL2/topoRender.hpp

@@ -54,8 +54,9 @@ template<typename PFP>
 void TopoRender::updateDataBoundary(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& positions, float ke, float kf,float ns)
 {
 	m_normalShift = ns;
-	SelectorDartBoundary<typename PFP::MAP> sdb(map);
-	MapBrowserSelector mbs(map,sdb);
+//	SelectorDartBoundary<typename PFP::MAP> sdb(map);
+//	MapBrowserSelector mbs(map,sdb);
+	MapBrowserSelector mbs(map,SelectorDartBoundary<typename PFP::MAP>(map));
 	map.setBrowser(&mbs);
 
 	updateData<PFP>(map,positions, ke, kf,true);