Commit d7105b9b authored by Sylvain Thery's avatar Sylvain Thery

restore file

parent 9ec64050
...@@ -129,6 +129,7 @@ void MyQT::cb_initGL() ...@@ -129,6 +129,7 @@ void MyQT::cb_initGL()
m_sprite = new Utils::PointSprite(); m_sprite = new Utils::PointSprite();
m_sprite->setAttributePosition(m_positionVBO); m_sprite->setAttributePosition(m_positionVBO);
m_sprite->setColor(Geom::Vec4f(1.0f, 0.0f , 0.0f, 1.0f));
m_strings = new Utils::Strings3D(true, Geom::Vec3f(0.1f,0.0f,0.3f)); m_strings = new Utils::Strings3D(true, Geom::Vec3f(0.1f,0.0f,0.3f));
storeVerticesInfo(); storeVerticesInfo();
...@@ -200,9 +201,7 @@ void MyQT::cb_redraw() ...@@ -200,9 +201,7 @@ void MyQT::cb_redraw()
if (render_balls) if (render_balls)
{ {
m_sprite->predraw(Geom::Vec3f(1.0f, 0.0f ,0.0f));
m_render->draw(m_sprite, Algo::Render::GL2::POINTS); m_render->draw(m_sprite, Algo::Render::GL2::POINTS);
m_sprite->postdraw();
} }
if (render_vectors) if (render_vectors)
...@@ -237,13 +236,13 @@ void MyQT::cb_keyPress(int code) ...@@ -237,13 +236,13 @@ void MyQT::cb_keyPress(int code)
{ {
std::string filename = selectFileSave("Export SVG file ",".","(*.svg)"); std::string filename = selectFileSave("Export SVG file ",".","(*.svg)");
Utils::SVG::SVGOut svg(filename, modelViewMatrix(), projectionMatrix()); Utils::SVG::SVGOut svg(filename, modelViewMatrix(), projectionMatrix());
svg.setWidth(1.0f); // svg.setWidth(1.0f);
svg.setColor(Geom::Vec3f(0.0f,0.0f,0.5f)); // svg.setColor(Geom::Vec3f(0.0f,0.0f,0.5f));
Algo::Render::SVG::renderEdges<PFP>(svg, myMap, position); Algo::Render::SVG::renderEdges<PFP>(svg, myMap, position);
svg.setColor(Geom::Vec3f(0.0f,0.8f,0.0f)); // svg.setColor(Geom::Vec3f(0.0f,0.8f,0.0f));
svg.setWidth(5.0f); // svg.setWidth(5.0f);
Algo::Render::SVG::renderVertices<PFP>(svg, myMap, position); Algo::Render::SVG::renderVertices<PFP>(svg, myMap, position);
svg.setColor(Geom::Vec3f(1.0f,0.0f,0.0f)); // svg.setColor(Geom::Vec3f(1.0f,0.0f,0.0f));
m_strings->toSVG(svg); m_strings->toSVG(svg);
//svg destruction close the file //svg destruction close the file
} }
...@@ -301,7 +300,7 @@ int main(int argc, char **argv) ...@@ -301,7 +300,7 @@ int main(int argc, char **argv)
CGoGNout << "CGoGNOut dans la console" << Geom::Vec3f(2.5f, 2.2f, 4.3f) << CGoGNendl; CGoGNout << "CGoGNOut dans la console" << Geom::Vec3f(2.5f, 2.2f, 4.3f) << CGoGNendl;
CGoGNout.noStatusBar(); CGoGNout.noStatusBar();
// bounding box // bounding box
Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position); Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment