songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not delete clipping plane frame, but only hide it, to keep its position.

This commit is contained in:
Guillaume Damiand 2021-06-29 17:39:30 +02:00
parent 1ab891ee35
commit 53cdabe0c3
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
View File

@ -962,7 +962,7 @@ protected:
if(m_frame_plane) if(m_frame_plane)
{ {
for(int i=0; i< 16 ; i++) for(int i=0; i< 16 ; i++)
clipping_mMatrix.data()[i] = m_frame_plane->matrix()[i]; { clipping_mMatrix.data()[i] = m_frame_plane->matrix()[i]; }
} }
rendering_program_clipping_plane.bind(); rendering_program_clipping_plane.bind();
@ -986,11 +986,11 @@ protected:
QMatrix4x4 clipping_mMatrix; QMatrix4x4 clipping_mMatrix;
clipping_mMatrix.setToIdentity(); clipping_mMatrix.setToIdentity();
if(m_frame_plane) if(m_frame_plane==nullptr)
{ { m_frame_plane=new CGAL::qglviewer::ManipulatedFrame; }
for(int i=0; i< 16 ; i++) for(int i=0; i< 16 ; i++)
clipping_mMatrix.data()[i] = m_frame_plane->matrix()[i]; { clipping_mMatrix.data()[i] = m_frame_plane->matrix()[i]; }
}
QVector4D clipPlane = clipping_mMatrix * QVector4D(0.0, 0.0, 1.0, 0.0); QVector4D clipPlane = clipping_mMatrix * QVector4D(0.0, 0.0, 1.0, 0.0);
QVector4D plane_point = clipping_mMatrix * QVector4D(0,0,0,1); QVector4D plane_point = clipping_mMatrix * QVector4D(0,0,0,1);
if(!m_are_buffers_initialized) if(!m_are_buffers_initialized)
@ -1426,17 +1426,10 @@ protected:
{ {
// toggle clipping plane // toggle clipping plane
m_use_clipping_plane = (m_use_clipping_plane + 1) % CLIPPING_PLANE_END_INDEX; m_use_clipping_plane = (m_use_clipping_plane + 1) % CLIPPING_PLANE_END_INDEX;
if (m_use_clipping_plane==CLIPPING_PLANE_OFF && m_frame_plane) if (m_use_clipping_plane==CLIPPING_PLANE_OFF)
{ { setManipulatedFrame(nullptr); }
setManipulatedFrame(nullptr); else
delete m_frame_plane; { setManipulatedFrame(m_frame_plane); }
m_frame_plane=nullptr;
}
else if (m_frame_plane==nullptr)
{
m_frame_plane=new CGAL::qglviewer::ManipulatedFrame;
setManipulatedFrame(m_frame_plane);
}
switch(m_use_clipping_plane) switch(m_use_clipping_plane)
{ {