Merge branch 'develop' of cgogn:~untereiner/CGoGN into develop

Apps/Examples/volumeExplorer.cpp

@@ -171,16 +171,19 @@ void MyQT::cb_Open()
 	float maxV = 0.0f;
 	for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
 	{
-		float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
-		color[d] = PFP::VEC3(v,0,0);
-		if (v>maxV)
-			maxV=v;
-	}
-	for (unsigned int i = color.begin(); i != color.end(); color.next(i))
-	{
-		color[i][0] /= maxV;
-		color[i][2] = 1.0f - color[i][0];
+//		float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
+//		color[d] = PFP::VEC3(v,0,0);
+//		if (v>maxV)
+//			maxV=v;
+
+		if(myMap.isBoundaryAdjacentVolume(d))
+			color[d] = PFP::VEC3(0,0,0);
 	}
+//	for (unsigned int i = color.begin(); i != color.end(); color.next(i))
+//	{
+//		color[i][0] /= maxV;
+//		color[i][2] = 1.0f - color[i][0];
+//	}
 
 //	SelectorDartNoBoundary<PFP::MAP> nb(myMap);
 	m_topo_render->updateData(myMap, position,  0.8f, 0.8f, 0.8f);
@@ -414,20 +417,20 @@ int main(int argc, char **argv)
 		for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
 		{
 			float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
-			color[d] = PFP::VEC3(v,0,0);
-			if (v>maxV)
-				maxV=v;
-		}
-		for (unsigned int i = color.begin(); i != color.end(); color.next(i))
-		{
-			color[i][0] /= maxV;
-			color[i][2] = 1.0f - color[i][0];
+//			color[d] = PFP::VEC3(v,0,0);
+//			if (v>maxV)
+//				maxV=v;
+
+			if(myMap.isBoundaryAdjacentVolume(d))
+				color[d] = PFP::VEC3(0,0,0);
+			else
+				color[d] = PFP::VEC3(v,0,0);
 		}
-//		Algo::Volume::Export::exportNAS<PFP>(myMap,position,"/tmp/test2.nas");
-//		Algo::Volume::Export::exportMSH<PFP>(myMap,position,"/tmp/test2.msh");
-//		Algo::Volume::Export::exportTet<PFP>(myMap,position,"/tmp/test2.tet");
-//		Algo::Volume::Export::exportNodeEle<PFP>(myMap,position,"/tmp/test2");
-//		Algo::Volume::Export::exportVTU<PFP>(myMap,position,"/tmp/test4.vtu");
+//		for (unsigned int i = color.begin(); i != color.end(); color.next(i))
+//		{
+//			color[i][0] /= maxV;
+//			color[i][2] = 1.0f - color[i][0];
+//		}
 
 	}
 	else

include/Topology/map/map3.hpp

@@ -1029,7 +1029,7 @@ bool Map3<MAP_IMPL>::isVolumeIncidentToBoundary(Dart d) const
 	Traversor3WF<Map3<MAP_IMPL> > tra(*this, d);
 	for(Dart dit = tra.begin() ; dit != tra.end() ; dit = tra.next())
 	{
-		if(isBoundaryMarked3(phi3(dit)))
+		if(this->template isBoundaryMarked<3>(phi3(dit)))
 			return true ;
 	}
 	return false;