Changeset 4800 for vtkvis

Timestamp:

Dec 1, 2014 1:27:36 AM (6 years ago)

Author:

ldelgass

Message:

merge r4793 from trunk

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• Renderer.cpp (modified) (6 diffs)
• Renderer.h (modified) (1 diff)

vtkvis/branches/1.7/Renderer.cpp

@@ -80 +80 @@
     _cameraMode(PERSPECTIVE),
     _cameraAspect(ASPECT_NATIVE),
+    _computeOnlyVisibleBounds(true),
     _imgCameraPlane(PLANE_XY),
     _imgCameraOffset(0),
@@ -507 +508 @@
             _axesAutoBounds[Y_AXIS] ||
             _axesAutoBounds[Z_AXIS]) {
-            collectBounds(newBounds, false);
+            collectBounds(newBounds, _computeOnlyVisibleBounds);
         }
     }
@@ -742 +743 @@
     double bounds[6];
     if (_cameraMode == IMAGE) {
-        collectBounds(bounds, false);
+        collectBounds(bounds, _computeOnlyVisibleBounds);
     } else
         _cubeAxesActor->GetBounds(bounds);
 
     double unscaledBounds[6];
-    collectUnscaledBounds(unscaledBounds, false);
+    collectUnscaledBounds(unscaledBounds, _computeOnlyVisibleBounds);
 
     if (_axesRangeMode[X_AXIS] == RANGE_AUTO) {
@@ -2738 +2739 @@
         //setViewAngle(_windowHeight);
         //double bounds[6];
-        //collectBounds(bounds, false);
+        //collectBounds(bounds, _computeOnlyVisibleBounds);
         //_renderer->ResetCamera(bounds);
         if (_needsAxesReset) {
@@ -4269 +4270 @@
 
     double bounds[6];
-    collectBounds(bounds, false);
+    collectBounds(bounds, _computeOnlyVisibleBounds);
     bool twod = is2D(bounds, &_imgCameraPlane, &_imgCameraOffset);
     if (twod) {
@@ -4493 +4494 @@
 {
     double bounds[6];
-    collectBounds(bounds, false);
+    collectBounds(bounds, _computeOnlyVisibleBounds);
 
     switch (axis) {

vtkvis/branches/1.7/Renderer.h

@@ -1076 +1076 @@
     CameraMode _cameraMode;
     Aspect _cameraAspect;
+    bool _computeOnlyVisibleBounds;
     double _imgWorldOrigin[2];
     double _imgWorldDims[2];