Commit 6131a7fd authored by pitiot's avatar pitiot

merging

parent 2a31c5a6
......@@ -382,7 +382,7 @@ void MyQT::cb_initGL()
m_sh2 = static_cast<Utils::ClippingShader*>(m_render_topo->shader2());
m_sh3 = static_cast<Utils::ClippingShader*>(m_render_topo_boundary->shader1());
m_sh1->insertClippingCode();
/* m_sh1->insertClippingCode();
m_sh2->insertClippingCode();
m_sh3->insertClippingCode();
......@@ -393,7 +393,7 @@ void MyQT::cb_initGL()
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_sh3->setClipPlaneParamsAll(clip_id3, Geom::Vec3f(0,0,1), bb.center());
*/
}
// redraw GL callback (clear and swap already done)
......
This diff is collapsed.
0
\ No newline at end of file
-DGLM_FORCE_RADIANS
-DCGOGN_ASSERT_BOOL=OFF
-DSHADERPATH="/tmp/CGoGN_P/lib/Shaders/"
-DCGOGN_WITH_QT
/tmp/CGoGN_P/ThirdParty/include
/usr/include
/usr/include/suitesparse
/usr/include/qt4
/tmp/CGoGN_P/ThirdParty/libQGLViewer/
/tmp/CGoGN_P/ThirdParty/OpenNL/src
/tmp/CGoGN_P/ThirdParty/tetgen
/tmp/CGoGN_P/ThirdParty/Zinri
/tmp/CGoGN_P/ThirdParty/Assimp/include/
/tmp/CGoGN_P/ThirdParty/TinyXml2
/tmp/CGoGN_P/ThirdParty/libuuid
QGLViewer
nl
tinyxml2
/usr/lib/x86_64-linux-gnu/libGLU.so
/usr/lib/x86_64-linux-gnu/libGL.so
/usr/lib/x86_64-linux-gnu/libSM.so
/usr/lib/x86_64-linux-gnu/libICE.so
/usr/lib/x86_64-linux-gnu/libX11.so
/usr/lib/x86_64-linux-gnu/libXext.so
/usr/lib/x86_64-linux-gnu/libGLEW.so
/usr/lib/x86_64-linux-gnu/libz.so
/usr/lib/x86_64-linux-gnu/libamd.so
/usr/lib/x86_64-linux-gnu/libcamd.so
/usr/lib/x86_64-linux-gnu/libccolamd.so
/usr/lib/x86_64-linux-gnu/libcolamd.so
/usr/lib/x86_64-linux-gnu/libcholmod.so
/usr/lib/x86_64-linux-gnu/libspqr.so
/usr/lib/x86_64-linux-gnu/libldl.so
/usr/lib/x86_64-linux-gnu/libbtf.so
/usr/lib/x86_64-linux-gnu/libklu.so
/usr/lib/x86_64-linux-gnu/libcxsparse.so
/usr/lib/x86_64-linux-gnu/libumfpack.so
pthread
4
\ No newline at end of file
0
\ No newline at end of file
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