Changeset 4800 for vtkvis


Ignore:
Timestamp:
Dec 1, 2014 1:27:36 AM (6 years ago)
Author:
ldelgass
Message:

merge r4793 from trunk

Location:
vtkvis/branches/1.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • vtkvis/branches/1.7

  • vtkvis/branches/1.7/Renderer.cpp

    r4780 r4800  
    8080    _cameraMode(PERSPECTIVE),
    8181    _cameraAspect(ASPECT_NATIVE),
     82    _computeOnlyVisibleBounds(true),
    8283    _imgCameraPlane(PLANE_XY),
    8384    _imgCameraOffset(0),
     
    507508            _axesAutoBounds[Y_AXIS] ||
    508509            _axesAutoBounds[Z_AXIS]) {
    509             collectBounds(newBounds, false);
     510            collectBounds(newBounds, _computeOnlyVisibleBounds);
    510511        }
    511512    }
     
    742743    double bounds[6];
    743744    if (_cameraMode == IMAGE) {
    744         collectBounds(bounds, false);
     745        collectBounds(bounds, _computeOnlyVisibleBounds);
    745746    } else
    746747        _cubeAxesActor->GetBounds(bounds);
    747748
    748749    double unscaledBounds[6];
    749     collectUnscaledBounds(unscaledBounds, false);
     750    collectUnscaledBounds(unscaledBounds, _computeOnlyVisibleBounds);
    750751
    751752    if (_axesRangeMode[X_AXIS] == RANGE_AUTO) {
     
    27382739        //setViewAngle(_windowHeight);
    27392740        //double bounds[6];
    2740         //collectBounds(bounds, false);
     2741        //collectBounds(bounds, _computeOnlyVisibleBounds);
    27412742        //_renderer->ResetCamera(bounds);
    27422743        if (_needsAxesReset) {
     
    42694270
    42704271    double bounds[6];
    4271     collectBounds(bounds, false);
     4272    collectBounds(bounds, _computeOnlyVisibleBounds);
    42724273    bool twod = is2D(bounds, &_imgCameraPlane, &_imgCameraOffset);
    42734274    if (twod) {
     
    44934494{
    44944495    double bounds[6];
    4495     collectBounds(bounds, false);
     4496    collectBounds(bounds, _computeOnlyVisibleBounds);
    44964497
    44974498    switch (axis) {
  • vtkvis/branches/1.7/Renderer.h

    r4783 r4800  
    10761076    CameraMode _cameraMode;
    10771077    Aspect _cameraAspect;
     1078    bool _computeOnlyVisibleBounds;
    10781079    double _imgWorldOrigin[2];
    10791080    double _imgWorldDims[2];
Note: See TracChangeset for help on using the changeset viewer.