Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit f551d7fc by Sylvain Thery

Merge branch 'master' of cgogn:/home/cgogn/CGoGN

parents e9501a68 20f4b60f
 ... ... @@ -54,6 +54,11 @@ add_executable( texturesExampleD ../texturesExample.cpp \${texturesExample_moc} ) target_link_libraries( texturesExampleD \${CGoGN_LIBS_D} \${COMMON_LIBS} \${QT_LIBRARIES} ) QT4_WRAP_CPP(simpleMap3_moc ../simpleMap3.h) add_executable( simpleMap3D ../simpleMap3.cpp \${simpleMap3_moc} ) target_link_libraries( simpleMap3D \${CGoGN_LIBS_D} \${COMMON_LIBS} \${QT_LIBRARIES} ) QT4_WRAP_CPP(simpleGMap2_moc ../simpleGMap2.h) add_executable( simpleGMap2D ../simpleGMap2.cpp \${simpleGMap2_moc} ) target_link_libraries( simpleGMap2D ... ...
 ... ... @@ -26,14 +26,37 @@ #include "Utils/GLSLShader.h" #include "Algo/Geometry/boundingbox.h" #include "Algo/Modelisation/primitives3d.h" #include "Algo/Modelisation/subdivision3.h" SimpleGMap3::SimpleGMap3() { position = myMap.addAttribute(VERTEX, "position"); normal = myMap.addAttribute(VERTEX, "position"); Algo::Modelisation::Primitive3D primCat(myMap,position); Dart d = primCat.hexaGrid_topo(2,1,1); primCat.embedHexaGrid(1,1,1); myMap.check(); DartMarker markOrient(myMap); std::vector orient; FunctorStore fs(orient); myMap.foreach_dart_of_oriented_volume(d,fs); for(std::vector::iterator it = orient.begin() ; it != orient.end() ; ++it) markOrient.mark(*it); SelectorMarked sm(markOrient); Algo::Modelisation::catmullClarkVol(myMap,position,sm); for(unsigned int i = position.begin() ; i != position.end() ; position.next(i)) position[i] += VEC3(2,0,0); Algo::Modelisation::Primitive3D prim(myMap,position); Dart d = prim.hexaGrid_topo(2,2,1); d = prim.hexaGrid_topo(2,2,1); prim.embedHexaGrid(1,1,1); Dart d1 = myMap.phi1(myMap.phi1(myMap.phi2(myMap.phi1(myMap.phi1(d))))); ... ... @@ -51,7 +74,7 @@ SimpleGMap3::SimpleGMap3() position[myMap.phi1(d)] = mid; for(unsigned int i = position.begin() ; i != position.end() ; position.next(i)) position[i] += VEC3(2,0,0); position[i] += VEC3(0,2,0); Algo::Modelisation::Primitive3D prim2(myMap,position); d = prim2.hexaGrid_topo(2,1,1); ... ... @@ -59,6 +82,8 @@ SimpleGMap3::SimpleGMap3() d = myMap.phi2(myMap.phi1(myMap.phi1(myMap.phi2(d)))); myMap.unsewVolumes(d); myMap.check(); } void SimpleGMap3::initGUI() ... ... @@ -84,6 +109,12 @@ void SimpleGMap3::cb_redraw() glDisable(GL_LIGHTING); glLineWidth(1.0f); Algo::Render::GL1::renderTopoGMD3(myMap, position, true, true, true, true, 0.9f, 0.9f, 0.9f, 0.9f); glDisable(GL_LIGHTING); glColor3f(1.0f, 1.0f, 1.0f); glLineWidth(1.0f); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); Algo::Render::GL1::renderTriQuadPoly(myMap, Algo::Render::GL1::LINE, 1.0,position, normal); } ... ...
 ... ... @@ -31,6 +31,7 @@ #include "Geometry/vector_gen.h" #include "Algo/Render/GL1/map_glRender.h" #include "Algo/Render/GL1/topo_render.h" using namespace CGoGN ; ... ... @@ -53,6 +54,7 @@ public: SelectorTrue allDarts ; PFP::TVEC3 position ; PFP::TVEC3 normal ; SimpleGMap3() ; ... ...