Changeset 5584 for nanovis/branches/1.2/nanovis.cpp

Timestamp:

May 20, 2015 3:22:40 PM (9 years ago)

Author:

ldelgass

Message:

Syncing with trunk: update clipping range in all camera methods

File:

• nanovis/branches/1.2/nanovis.cpp (modified) (10 diffs)

nanovis/branches/1.2/nanovis.cpp

@@ -176 +176 @@
     _camera->y(def_eye.y + dy);
     TRACE("set eye to %f %f", _camera->x(), _camera->y());
+
+    collectBounds();
+    _camera->resetClippingRange(sceneBounds.min, sceneBounds.max);
 }
 
@@ -189 +192 @@
 
     collectBounds();
-
     _camera->resetClippingRange(sceneBounds.min, sceneBounds.max);
 }
@@ -197 +199 @@
 {
     _camera->orient(phi, theta, psi);
+
+    collectBounds();
+    _camera->resetClippingRange(sceneBounds.min, sceneBounds.max);
 }
 
@@ -203 +208 @@
 {
     _camera->orient(quat);
+
+    collectBounds();
+    _camera->resetClippingRange(sceneBounds.min, sceneBounds.max);
 }
 
@@ -209 +217 @@
 {
     _camera->setPosition(pos);
+
+    collectBounds();
+    _camera->resetClippingRange(sceneBounds.min, sceneBounds.max);
 }
 
@@ -215 +226 @@
 {
     _camera->setUpdir(dir);
+
+    collectBounds();
+    _camera->resetClippingRange(sceneBounds.min, sceneBounds.max);
 }
 
@@ -754 +768 @@
     if (Flow::updatePending) {
         setFlowRanges();
-        grid->xAxis.setRange(xMin, xMax);
-        grid->yAxis.setRange(yMin, yMax);
-        grid->zAxis.setRange(zMin, zMax);
     }
 
@@ -934 +945 @@
         }
     }
+    if ((xMin < DBL_MAX) && (xMax > -DBL_MAX)) {
+        grid->xAxis.setRange(xMin, xMax);
+    }
+    if ((yMin < DBL_MAX) && (yMax > -DBL_MAX)) {
+        grid->yAxis.setRange(yMin, yMax);
+    }
+    if ((zMin < DBL_MAX) && (zMax > -DBL_MAX)) {
+        grid->zAxis.setRange(zMin, zMax);
+    }
 
     TRACE("magMin=%g magMax=%g", Flow::magMin, Flow::magMax);
@@ -1007 +1027 @@
     if (Flow::updatePending) {
         setFlowRanges();
-        grid->xAxis.setRange(xMin, xMax);
-        grid->yAxis.setRange(yMin, yMax);
-        grid->zAxis.setRange(zMin, zMax);
     }
     if (HeightMap::updatePending) {
@@ -1017 +1034 @@
         setVolumeRanges();
     }
+
+    collectBounds();
 
     // Start final rendering