Commit 3138f742 by Pierre Kraemer

### merge cgogn:~jund/CGoGN

parent 911bd5a6
 ... ... @@ -48,7 +48,6 @@ void hexahedronToTetrahedron(typename PFP::MAP& map, Dart d); * Tetrahedron functions * ************************************************************************************************/ /** * test if the volume is a tetrahedron * @param map ... ... @@ -57,7 +56,6 @@ void hexahedronToTetrahedron(typename PFP::MAP& map, Dart d); template bool isTetrahedron(typename PFP::MAP& the_map, Dart d); /************************************************************************************************ * Swap Functions * ************************************************************************************************/ ... ... @@ -101,7 +99,6 @@ Dart swap2To3(typename PFP::MAP& map, Dart d); template void swap5To4(typename PFP::MAP& the_map, Dart d, typename PFP::TVEC3& positions); /************************************************************************************************ * Flip Functions * ************************************************************************************************/ ... ... @@ -112,23 +109,20 @@ void swap5To4(typename PFP::MAP& the_map, Dart d, typename PFP::TVEC3& positions template void flip1To4(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position); /** * */ template void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position); } // namespace Tetrahedralization } // namespace Modelisation } //end namespace Tetrahedralization } //end namespace Modelisation } //end namespace Algo } //end namespace CGoGN } // namespace Algo } // namespace CGoGN #include "Algo/Modelisation/tetrahedralization.hpp" #endif
 ... ... @@ -22,8 +22,6 @@ * * *******************************************************************************/ #include namespace CGoGN { ... ... @@ -59,16 +57,16 @@ bool isTetrahedron(typename PFP::MAP& the_map, Dart d) { DartMarkerStore mark(the_map); // Lock a marker std::list visitedFaces; // Faces that are traversed std::vector visitedFaces; // Faces that are traversed visitedFaces.reserve(64) ; visitedFaces.push_back(d); std::list::iterator faces; int nbFaces = 0; // Count the faces unsigned int nbFaces = 0; // Count the faces //Test the number of faces end its valency for(faces = visitedFaces.begin() ; faces != visitedFaces.end() ; ++faces) for(unsigned int i = 0; i < visitedFaces.size(); ++i) { Dart dc = *faces; Dart dc = visitedFaces[i]; //if this dart is not marked if(!mark.isMarked(dc)) ... ... @@ -201,6 +199,7 @@ void insertFace(typename PFP::MAP& map, Dart d, Dart nF) /*********************************************************************************************** * swap functions * ***********************************************************************************************/ //ok template void swap2To2(typename PFP::MAP& map, Dart d) ... ... @@ -335,8 +334,6 @@ void swap3To2(typename PFP::MAP& map, Dart d) } //[precond] le brin doit venir d'une face partagé par 2 tetraèdres // renvoie un brin de l'ancienne couture entre les 2 tetras qui est devenu une arête template ... ... @@ -404,7 +401,6 @@ void swap5To4(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& positions) * Flip Functions * ************************************************************************************************/ template void flip1To4(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position) { ... ... @@ -488,8 +484,9 @@ void flip1To4(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position) } /************************************************************************************************ * Bisection Functions * * Bisection Functions * ************************************************************************************************/ template void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position) { ... ... @@ -558,7 +555,6 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position } while(temp != d); // if(map.phi3(d) == d) // { // map.splitFace(map.phi_1(d), map.phi1(d)); ... ... @@ -631,10 +627,9 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position // temp = map.alpha2(temp); // } // while(temp != d); } // ///** // * create a tetra based on the two triangles that have a common dart and phi2(dart) // * return a new dart inside the tetra ... ... @@ -675,8 +670,6 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position // the_map.sewFaces(the_map.phi1(e),the_map.phi1(dd)); // the_map.sewFaces(ss2e,the_map.phi3(the_map.phi1(dd))); // // // // //embed the coords // the_map.setVertexEmb(d,the_map.getVertexEmb(d)); // the_map.setVertexEmb(e,the_map.getVertexEmb(e)); ... ... @@ -876,10 +869,10 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position // return ret; //} } // namespace Tetrahedralization }//end namespace Tetrahedralization }//end namespace Modelisation }//end namespace Algo }//end namespace CGoGN } // namespace Modelisation } // namespace Algo } // namespace CGoGN
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!