Merge branch 'master' of cgogn.u-strasbg.fr:~untereiner/CGoGN

include/Algo/ImplicitHierarchicalMesh/ihm3.h

@@ -264,6 +264,10 @@ public:
 	 */
 	bool volumeIsSubdividedOnce(Dart d);
 
+	/**
+	 *
+	 */
+	bool neighborhoodLevelDiffersByOne(Dart d);
 
 } ;
 

include/Algo/ImplicitHierarchicalMesh/subdivision3.h

@@ -45,13 +45,19 @@ template <typename PFP>
 void subdivideEdge(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position) ;
 
 template <typename PFP>
-void subdivideFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType = S_QUAD);
+void subdivideFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
 
 template <typename PFP>
 Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
 
 template <typename PFP>
-void subdivideLoop(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
+Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
+
+template <typename PFP>
+Dart subdivideVolumeOld(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
+
+//template <typename PFP>
+//void subdivideLoop(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
 
 template <typename PFP>
 void coarsenEdge(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);

src/Algo/ImplicitHierarchicalMesh/ihm3.cpp

@@ -515,6 +515,51 @@ bool ImplicitHierarchicalMap3:: volumeIsSubdividedOnce(Dart d)
 	return true;
 }
 
+bool ImplicitHierarchicalMap3::neighborhoodLevelDiffersByOne(Dart d)
+{
+	assert(m_dartLevel[d] <= m_curLevel || !"Access to a dart introduced after current level") ;
+
+	bool found = false;
+
+	unsigned int vLevel = volumeLevel(d) + 1;
+
+	Dart old = volumeOldestDart(d);
+
+	DartMarkerStore mf(*this);		// Lock a face marker to save one dart per face
+
+	//Store faces that are traversed and start with the face of d
+	std::vector<Dart> visitedFaces;
+	visitedFaces.reserve(20);
+	visitedFaces.push_back(old);
+
+	mf.markOrbit(FACE, old) ;
+
+	for(std::vector<Dart>::iterator face = visitedFaces.begin(); !found && face != visitedFaces.end(); ++face)
+	{
+		Dart e = *face ;
+		do
+		{
+			// add all face neighbours to the table
+
+			if(phi3(e) != e && (abs(volumeLevel(phi3(e)) - vLevel) > 1))
+			{
+				found = true;
+			}
+
+			Dart ee = phi2(e) ;
+			if(!mf.isMarked(ee)) // not already marked
+			{
+				visitedFaces.push_back(ee) ;
+				mf.markOrbit(FACE, ee) ;
+			}
+
+			e = phi1(e) ;
+		} while(e != *face) ;
+	}
+
+	return found;
+}
+
 } //namespace IHM
 
 } //namespace Algo