Merge branch 'develop' of icube-forge.unistra.fr:thery/cgogn into develop

SCHNApps/CMakeLists.txt

@@ -148,7 +148,7 @@ SET(SCHNApps_QOBJECT_FILES
 
 
 
-	link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
+link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
 
 
 INCLUDE_DIRECTORIES(
@@ -186,3 +186,6 @@ TARGET_LINK_LIBRARIES( SCHNApps
 
 ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins Plugins)
 
+IF(IS_DIRECTORY ${SCHNApps_ROOT_DIR}/../../Plugins)
+	ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/../../Plugins ExtPlugins)
+ENDIF(IS_DIRECTORY ${SCHNApps_ROOT_DIR}/../../Plugins)

include/Algo/Geometry/inclusion.hpp

@@ -180,7 +180,7 @@ bool isPointInConvexFace(typename PFP::MAP& map, Face f, const VertexAttribute<t
 	if(o3d == Geom::ON)
 	{
 		Traversor2FV<typename PFP::MAP> tfv(map, f) ;
-		for(Vertex v = tfv.begin(); v != tfv.end(); v = tfv.next())
+		for(Vertex v = tfv.begin(); v.dart != tfv.end(); v = tfv.next())
 		{
 			VEC3 N = pl.normal();
 			VEC3 v2(position[map.phi1(v.dart)] - position[v]);
@@ -212,7 +212,7 @@ bool isPointInConvexFace2D(typename PFP::MAP& map, Face f, const VertexAttribute
 	Geom::Orientation2D o2d;
 
 	Traversor2FV<typename PFP::MAP> tfv(map, f) ;
-	for(Vertex v = tfv.begin(); v != tfv.end(); v = tfv.next())
+	for(Vertex v = tfv.begin(); v.dart != tfv.end(); v = tfv.next())
 	{
 		o2d = Geom::testOrientation2D(point, position[v], position[map.phi1(v.dart)]);
 		if(CCW)
@@ -284,7 +284,7 @@ bool isConvexFaceInOrIntersectingTetrahedron(typename PFP::MAP& map, Face f, con
 	typedef typename PFP::VEC3 VEC3 ;
 
 	Traversor2FV<typename PFP::MAP> tfv(map, f) ;
-	for(Vertex v = tfv.begin(); v != tfv.end(); v = tfv.next())
+	for(Vertex v = tfv.begin(); v.dart != tfv.end(); v = tfv.next())
 	{
 		if(Geom::isPointInTetrahedron(points, position[v], CCW))
 			return true;