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

Update basic viewer to set camera mode ealier (following Efi issue). TODO: test if this solves the bug.

This commit is contained in:
Guillaume Damiand 2022-06-30 15:44:33 +02:00 committed by Sébastien Loriot
parent 10f5fa4f1e
commit 1d9280afae
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,6 +605,7 @@ protected:
void initialize_buffers() void initialize_buffers()
{ {
set_camera_mode();
rendering_program_p_l.bind(); rendering_program_p_l.bind();
// 1) POINT SHADER // 1) POINT SHADER
@ -989,19 +990,8 @@ protected:
(has_zero_x() || has_zero_y() || has_zero_z())); (has_zero_x() || has_zero_y() || has_zero_z()));
} }
virtual void draw() void set_camera_mode()
{ {
glEnable(GL_DEPTH_TEST);
QMatrix4x4 clipping_mMatrix;
clipping_mMatrix.setToIdentity();
for(int i=0; i< 16 ; i++)
{ clipping_mMatrix.data()[i] = m_frame_plane->matrix()[i]; }
QVector4D clipPlane = clipping_mMatrix * QVector4D(0.0, 0.0, 1.0, 0.0);
QVector4D plane_point = clipping_mMatrix * QVector4D(0,0,0,1);
if(!m_are_buffers_initialized)
{ initialize_buffers(); }
if (is_two_dimensional()) if (is_two_dimensional())
{ {
camera()->setType(CGAL::qglviewer::Camera::ORTHOGRAPHIC); camera()->setType(CGAL::qglviewer::Camera::ORTHOGRAPHIC);
@ -1023,6 +1013,20 @@ protected:
camera()->setType(CGAL::qglviewer::Camera::PERSPECTIVE); camera()->setType(CGAL::qglviewer::Camera::PERSPECTIVE);
camera()->frame()->setConstraint(nullptr); camera()->frame()->setConstraint(nullptr);
} }
}
virtual void draw()
{
glEnable(GL_DEPTH_TEST);
QMatrix4x4 clipping_mMatrix;
clipping_mMatrix.setToIdentity();
for(int i=0; i< 16 ; i++)
{ clipping_mMatrix.data()[i] = m_frame_plane->matrix()[i]; }
QVector4D clipPlane = clipping_mMatrix * QVector4D(0.0, 0.0, 1.0, 0.0);
QVector4D plane_point = clipping_mMatrix * QVector4D(0,0,0,1);
if(!m_are_buffers_initialized)
{ initialize_buffers(); }
QColor color; QColor color;
attrib_buffers(this); attrib_buffers(this);
@ -1356,6 +1360,7 @@ protected:
virtual void init() virtual void init()
{ {
set_camera_mode();
initializeOpenGLFunctions(); initializeOpenGLFunctions();
// Light default parameters // Light default parameters