From 1d9280afae14bd78f961a16b0b055d1040a5a216 Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Thu, 30 Jun 2022 15:44:33 +0200
Subject: [PATCH] Update basic viewer to set camera mode ealier (following Efi
 issue). TODO: test if this solves the bug.

---
 .../include/CGAL/Qt/Basic_viewer_qt.h         | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
index 111b70f0fd3..46ab076cc7f 100644
--- a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
+++ b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
@@ -605,6 +605,7 @@ protected:
 
   void initialize_buffers()
   {
+    set_camera_mode();
     rendering_program_p_l.bind();
 
     // 1) POINT SHADER
@@ -989,19 +990,8 @@ protected:
             (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())
     {
       camera()->setType(CGAL::qglviewer::Camera::ORTHOGRAPHIC);
@@ -1023,6 +1013,20 @@ protected:
       camera()->setType(CGAL::qglviewer::Camera::PERSPECTIVE);
       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;
     attrib_buffers(this);
@@ -1356,6 +1360,7 @@ protected:
 
   virtual void init()
   {
+    set_camera_mode();
     initializeOpenGLFunctions();
 
     // Light default parameters