Commit f6eda487 authored by Sylvain Thery's avatar Sylvain Thery

tempo modif for topo3 correction

parent c1dc9b62
...@@ -75,17 +75,17 @@ void MyQT::clipping_onoff(bool x) ...@@ -75,17 +75,17 @@ void MyQT::clipping_onoff(bool x)
Geom::Vec3f normal = m_PlanePick->getAxisScale(2, pipo); // 2 = Z axis = plane normal Geom::Vec3f normal = m_PlanePick->getAxisScale(2, pipo); // 2 = Z axis = plane normal
m_sh1->setClipPlaneParamsAll(clip_id1, normal, pos); m_sh1->setClipPlaneParamsAll(clip_id1, normal, pos);
m_sh2->setClipPlaneParamsAll(clip_id2, normal, pos); m_sh2->setClipPlaneParamsAll(clip_id2, normal, pos);
m_sh3->setClipPlaneParamsAll(clip_id3, normal, pos); // m_sh3->setClipPlaneParamsAll(clip_id3, normal, pos);
} }
else else
{ {
m_sh1->setClipPlaneParamsAll(clip_id1, Geom::Vec3f(0,0,1), Geom::Vec3f(0,0,999999.9f)); m_sh1->setClipPlaneParamsAll(clip_id1, Geom::Vec3f(0,0,1), Geom::Vec3f(0,0,999999.9f));
m_sh2->setClipPlaneParamsAll(clip_id2, Geom::Vec3f(0,0,1), Geom::Vec3f(0,0,999999.9f)); m_sh2->setClipPlaneParamsAll(clip_id2, Geom::Vec3f(0,0,1), Geom::Vec3f(0,0,999999.9f));
m_sh3->setClipPlaneParamsAll(clip_id3, Geom::Vec3f(0,0,1), Geom::Vec3f(0,0,999999.9f)); // m_sh3->setClipPlaneParamsAll(clip_id3, Geom::Vec3f(0,0,1), Geom::Vec3f(0,0,999999.9f));
m_sh1->setClipColorAttenuationFactorRelative(0.0f,0.0f); m_sh1->setClipColorAttenuationFactorRelative(0.0f,0.0f);
m_sh2->setClipColorAttenuationFactorRelative(0.0f,0.0f); m_sh2->setClipColorAttenuationFactorRelative(0.0f,0.0f);
m_sh3->setClipColorAttenuationFactorRelative(0.0f,0.0f); // m_sh3->setClipColorAttenuationFactorRelative(0.0f,0.0f);
} }
updateMap(); updateMap();
...@@ -380,19 +380,19 @@ void MyQT::cb_initGL() ...@@ -380,19 +380,19 @@ void MyQT::cb_initGL()
m_sh1 = static_cast<Utils::ClippingShader*>(m_render_topo->shader1()); m_sh1 = static_cast<Utils::ClippingShader*>(m_render_topo->shader1());
m_sh2 = static_cast<Utils::ClippingShader*>(m_render_topo->shader2()); m_sh2 = static_cast<Utils::ClippingShader*>(m_render_topo->shader2());
m_sh3 = static_cast<Utils::ClippingShader*>(m_render_topo_boundary->shader1()); // m_sh3 = static_cast<Utils::ClippingShader*>(m_render_topo_boundary->shader1());
m_sh1->insertClippingCode(); m_sh1->insertClippingCode();
m_sh2->insertClippingCode(); m_sh2->insertClippingCode();
m_sh3->insertClippingCode(); // m_sh3->insertClippingCode();
clip_id1 = m_sh1->addClipPlane(); clip_id1 = m_sh1->addClipPlane();
clip_id2 = m_sh2->addClipPlane(); clip_id2 = m_sh2->addClipPlane();
clip_id3 = m_sh3->addClipPlane(); // clip_id3 = m_sh3->addClipPlane();
m_sh1->setClipPlaneParamsAll(clip_id1, Geom::Vec3f(0,0,1), bb.center()); m_sh1->setClipPlaneParamsAll(clip_id1, Geom::Vec3f(0,0,1), bb.center());
m_sh2->setClipPlaneParamsAll(clip_id2, Geom::Vec3f(0,0,1), bb.center()); m_sh2->setClipPlaneParamsAll(clip_id2, Geom::Vec3f(0,0,1), bb.center());
m_sh3->setClipPlaneParamsAll(clip_id3, Geom::Vec3f(0,0,1), bb.center()); // m_sh3->setClipPlaneParamsAll(clip_id3, Geom::Vec3f(0,0,1), bb.center());
} }
...@@ -557,7 +557,7 @@ void MyQT::cb_mouseMove(int buttons, int x, int y) ...@@ -557,7 +557,7 @@ void MyQT::cb_mouseMove(int buttons, int x, int y)
m_sh1->setClipPlaneParamsAll(clip_id1, normal, pos); m_sh1->setClipPlaneParamsAll(clip_id1, normal, pos);
m_sh2->setClipPlaneParamsAll(clip_id2, normal, pos); m_sh2->setClipPlaneParamsAll(clip_id2, normal, pos);
m_sh3->setClipPlaneParamsAll(clip_id3, normal, pos); // m_sh3->setClipPlaneParamsAll(clip_id3, normal, pos);
m_begX = x; m_begX = x;
......
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