Commit b0194eba by Pierre Kraemer

### petite refonte des Marks

parent c040b413
 ... @@ -42,8 +42,7 @@ namespace Algo ... @@ -42,8 +42,7 @@ namespace Algo namespace Modelisation namespace Modelisation { { enum {NONE,GRID, CUBE, CYLINDER, CONE, SPHERE, TORE, COMPOSED}; enum { NONE,GRID, CUBE, CYLINDER, CONE, SPHERE, TORE, COMPOSED }; /** /** * sudivide the all quads of primtive into 2 triangles * sudivide the all quads of primtive into 2 triangles ... @@ -326,7 +325,7 @@ public: ... @@ -326,7 +325,7 @@ public: * mark all embedded vertices of the Polyhedron * mark all embedded vertices of the Polyhedron * @param m the marker to use * @param m the marker to use */ */ void markEmbVertices(Marker m); // void markEmbVertices(Mark m); /** /** * test if a vertex is in the Polyhedron * test if a vertex is in the Polyhedron ... ...
 ... @@ -974,21 +974,21 @@ void Polyhedron::transform(const Geom::Matrix44f& matrice) ... @@ -974,21 +974,21 @@ void Polyhedron::transform(const Geom::Matrix44f& matrice) template template void Polyhedron::mark(CellMarker& m) void Polyhedron::mark(CellMarker& m) { { for(typename std::vector::iterator di=m_tableVertDarts.begin(); di!=m_tableVertDarts.end(); ++di) for(typename std::vector::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di) { { m.mark(*di); m.mark(*di); } } } } template //template void Polyhedron::markEmbVertices(Marker m) //void Polyhedron::markEmbVertices(Mark m) { //{ AttributeHandler markers(VERTEX<<24,m_map); // AttributeHandler markers(VERTEX << 24, m_map); for(typename std::vector::iterator di=m_tableVertDarts.begin(); di!=m_tableVertDarts.end(); ++di) // for(typename std::vector::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di) { // { markers[*di].setMark(m); // markers[*di].setMark(m); } // } } //} ... @@ -1018,7 +1018,7 @@ void Polyhedron::embedTwistedStrip( float radius_min, float radius_max, fl ... @@ -1018,7 +1018,7 @@ void Polyhedron::embedTwistedStrip( float radius_min, float radius_max, fl } } template template void Polyhedron::embedHelicoid( float radius_min, float radius_max, float maxHeight, float nbTurn, int orient) void Polyhedron::embedHelicoid(float radius_min, float radius_max, float maxHeight, float nbTurn, int orient) { { typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::VEC3 VEC3 ; ... ...
 ... @@ -141,7 +141,7 @@ public: ... @@ -141,7 +141,7 @@ public: * mark all darts of the primitive * mark all darts of the primitive * @param m the marker to use * @param m the marker to use */ */ void mark(Marker m); // void mark(Mark m); /** /** ... ...
 ... @@ -218,7 +218,7 @@ void Primitive3D::embedHexaGrid( float x, float y, float z) ... @@ -218,7 +218,7 @@ void Primitive3D::embedHexaGrid( float x, float y, float z) template template void Primitive3D::transform(const Geom::Matrix44f& matrice) void Primitive3D::transform(const Geom::Matrix44f& matrice) { { for(typename std::vector::iterator di=m_tableVertDarts.begin(); di!=m_tableVertDarts.end(); ++di) for(typename std::vector::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di) { { typename PFP::VEC3& pos = m_positions[*di]; typename PFP::VEC3& pos = m_positions[*di]; pos = Geom::transform(pos, matrice); pos = Geom::transform(pos, matrice); ... @@ -226,14 +226,14 @@ void Primitive3D::transform(const Geom::Matrix44f& matrice) ... @@ -226,14 +226,14 @@ void Primitive3D::transform(const Geom::Matrix44f& matrice) } } template //template void Primitive3D::mark(Marker m) //void Primitive3D::mark(Mark m) { //{ for(typename std::vector::iterator di=m_tableVertDarts.begin(); di!=m_tableVertDarts.end(); ++di) // for(typename std::vector::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di) { // { m_map.markOrbit(0,*di,m); // m_map.markOrbit(0, *di, m); } // } } //} }//end namespace }//end namespace }//end namespace }//end namespace ... ...
 ... @@ -46,11 +46,11 @@ namespace Render ... @@ -46,11 +46,11 @@ namespace Render namespace GL1 namespace GL1 { { /** ///** * Render darts of generalized map //* Render darts of generalized map */ //*/ template //template void renderTopoGM2(typename PFP::MAP& the_map, Marker m); //void renderTopoGM2(typename PFP::MAP& the_map, Mark m); /** /** * Render darts of dual map * Render darts of dual map ... @@ -83,11 +83,13 @@ void renderTopoMD3(typename PFP::MAP& the_map, const typename PFP::TVEC3& positi ... @@ -83,11 +83,13 @@ void renderTopoMD3(typename PFP::MAP& the_map, const typename PFP::TVEC3& positi template template void renderTopoMD3(typename PFP::MAP& map, typename PFP::TVEC3& positions, bool drawPhi1, bool drawPhi2, bool drawPhi3, float ke, float kf, float kv); void renderTopoMD3(typename PFP::MAP& map, typename PFP::TVEC3& positions, bool drawPhi1, bool drawPhi2, bool drawPhi3, float ke, float kf, float kv); } // namespace GL1 } // namespace Render } // namespace Algo }// end namespace } // namespace CGoGN }// end namespace }// end namespace }// end namespace #include "Algo/Render/GL1/topo_render.hpp" #include "Algo/Render/GL1/topo_render.hpp" ... ...
 ... @@ -121,7 +121,7 @@ namespace GL1 ... @@ -121,7 +121,7 @@ namespace GL1 //}; //}; // // //template //template //void renderTopoGM2(typename PFP::MAP& map, Marker m) //void renderTopoGM2(typename PFP::MAP& map, Mark m) //{ //{ // // // // ... @@ -642,9 +642,11 @@ void renderTopoMD3(typename PFP::MAP& map, typename PFP::TVEC3& positions, bool ... @@ -642,9 +642,11 @@ void renderTopoMD3(typename PFP::MAP& map, typename PFP::TVEC3& positions, bool } } } // namespace GL1 } // endnamespace } // namespace Render } // endnamespace } // endnamespace } // namespace Algo } // endnamespace } // namespace CGoGN
 ... @@ -47,7 +47,7 @@ enum Intersection ... @@ -47,7 +47,7 @@ enum Intersection * test the intersection between a ray and a triangle * test the intersection between a ray and a triangle */ */ template template Intersection intersectionRayTriangle(const VEC3& P, const VEC3& Dir, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; Intersection intersectionRayTriangle(const VEC3& P, const VEC3& Dir, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; /** /** * test the intersection between a line and a triangle * test the intersection between a line and a triangle ... @@ -60,7 +60,7 @@ Intersection intersectionRayTriangle(const VEC3& P, const VEC3& Dir, const VEC3& ... @@ -60,7 +60,7 @@ Intersection intersectionRayTriangle(const VEC3& P, const VEC3& Dir, const VEC3& * @return the intersection * @return the intersection */ */ template template Intersection intersectionLineTriangle(const VEC3& P, const VEC3& Dir, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; Intersection intersectionLineTriangle(const VEC3& P, const VEC3& Dir, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; /** /** * test the intersection between a line and a triangle the line MUST be in the plane of the triangle, assumed to be CCW * test the intersection between a line and a triangle the line MUST be in the plane of the triangle, assumed to be CCW ... @@ -74,7 +74,7 @@ Intersection intersectionLineTriangle(const VEC3& P, const VEC3& Dir, const VEC3 ... @@ -74,7 +74,7 @@ Intersection intersectionLineTriangle(const VEC3& P, const VEC3& Dir, const VEC3 * @return the intersection * @return the intersection */ */ template template Intersection intersectionLineTriangle2D(const VEC3& P, const VEC3& Dir, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; Intersection intersectionLineTriangle2D(const VEC3& P, const VEC3& Dir, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; /** /** * test the intersection between a segment and a triangle * test the intersection between a segment and a triangle ... @@ -87,13 +87,13 @@ Intersection intersectionLineTriangle2D(const VEC3& P, const VEC3& Dir, const VE ... @@ -87,13 +87,13 @@ Intersection intersectionLineTriangle2D(const VEC3& P, const VEC3& Dir, const VE * @return the intersection * @return the intersection */ */ template template Intersection intersectionSegmentTriangle(const VEC3& PA, const VEC3& PB, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; Intersection intersectionSegmentTriangle(const VEC3& PA, const VEC3& PB, const VEC3& Ta, const VEC3& Tb, const VEC3& Tc, VEC3& Inter) ; template template Intersection intersectionPlaneRay(const PLANE3D& pl,const VEC3& p1,const VEC3& dir, VEC3& Inter); Intersection intersectionPlaneRay(const PLANE3D& pl,const VEC3& p1,const VEC3& dir, VEC3& Inter) ; template template Intersection intersection2DSegmentSegment(const VEC3& PA, const VEC3& PB, const VEC3& QA, const VEC3& QB, VEC3& Inter) ; Intersection intersection2DSegmentSegment(const VEC3& PA, const VEC3& PB, const VEC3& QA, const VEC3& QB, VEC3& Inter) ; } // namespace Geom } // namespace Geom ... ...