improve auto camera changed

JacquesOlivierLachaud · Apr 6, 2017 · 2893bec · 2893bec
1 parent 8edc911
commit 2893bec
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 9 deletions.
diff --git a/src/DGtal/io/Display3D.h b/src/DGtal/io/Display3D.h
@@ -896,6 +896,8 @@ namespace DGtal
     ///
     std::set<SelectCallbackFctStore> mySelectCallBackFcts;
 
+    bool myBoundingPtChangedTag = false;
+
     //----end of protected datas
 
     // ------------------------- Internals ------------------------------------

diff --git a/src/DGtal/io/Display3D.ih b/src/DGtal/io/Display3D.ih
@@ -1191,16 +1191,42 @@ DGtal::Display3D< Space ,KSpace >::updateBoundingBox(const RealPoint &p)
       myBoundingPtUp[1]= p[1];
       myBoundingPtUp[2]= p[2];
       myBoundingPtEmptyTag = false;
+      myBoundingPtChangedTag = true;
     }
   else
     {
-      if(p[0] <myBoundingPtLow[0]) myBoundingPtLow[0]= p[0];
-      if(p[1] <myBoundingPtLow[1]) myBoundingPtLow[1]= p[1];
-      if(p[2] <myBoundingPtLow[2]) myBoundingPtLow[2]= p[2];
-
-      if(p[0] >myBoundingPtUp[0]) myBoundingPtUp[0]= p[0];
-      if(p[1] >myBoundingPtUp[1]) myBoundingPtUp[1]= p[1];
-      if(p[2] >myBoundingPtUp[2]) myBoundingPtUp[2]= p[2];
+      if(p[0] <myBoundingPtLow[0])
+        {
+          myBoundingPtLow[0]= p[0];
+          myBoundingPtChangedTag = true;
+        }
+      if(p[1] <myBoundingPtLow[1])
+        {
+          myBoundingPtLow[1]= p[1];
+          myBoundingPtChangedTag = true;
+        }
+
+      if(p[2] <myBoundingPtLow[2])
+        {
+          myBoundingPtLow[2]= p[2];
+          myBoundingPtChangedTag = true;
+        }
+
+      if(p[0] >myBoundingPtUp[0])
+        {
+          myBoundingPtUp[0]= p[0];
+          myBoundingPtChangedTag = true;
+        }
+      if(p[1] >myBoundingPtUp[1])
+        {
+          myBoundingPtUp[1]= p[1];
+          myBoundingPtChangedTag = true;
+        }
+      if(p[2] >myBoundingPtUp[2])
+        {
+          myBoundingPtUp[2]= p[2];
+          myBoundingPtChangedTag = true;
+        }
     }
 }
 

diff --git a/src/DGtal/io/viewers/Viewer3D.ih b/src/DGtal/io/viewers/Viewer3D.ih
@@ -1098,8 +1098,7 @@ DGtal::Viewer3D<TSpace, TKSpace>::updateList ( bool needToUpdateBoundingBox )
   // Seventh list: Textured images.
   glUpdateTextureImages(myGSImageList);
 
-
-  if ( needToUpdateBoundingBox )
+  if ( needToUpdateBoundingBox && Viewer3D<TSpace, TKSpace>::myBoundingPtChangedTag )
     {
       setSceneBoundingBox ( qglviewer::Vec ( Viewer3D<TSpace, TKSpace>::myBoundingPtLow[0],
                                              Viewer3D<TSpace, TKSpace>::myBoundingPtLow[1],
@@ -1108,7 +1107,9 @@ DGtal::Viewer3D<TSpace, TKSpace>::updateList ( bool needToUpdateBoundingBox )
                                              Viewer3D<TSpace, TKSpace>::myBoundingPtUp[1],
                                              Viewer3D<TSpace, TKSpace>::myBoundingPtUp[2] ) );
       showEntireScene();
+      Viewer3D<TSpace, TKSpace>::myBoundingPtChangedTag = false;
     }
+  updateGL();
   glPopMatrix();
 }