Changeset 4813

Timestamp:

Dec 2, 2014, 2:13:50 PM (10 years ago)

Author:

ldelgass

Message:

Revert a few changes that were made in the trunk

Location:

vtkvis/branches/1.8

Files:

• Makefile.in (modified) (2 diffs)
• Renderer.cpp (modified) (2 diffs)
• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)

vtkvis/branches/1.8/Makefile.in

@@ -50 +50 @@
                 -lvtkIOCore-$(VTK_VERSION) \
                 -lvtkIOLegacy-$(VTK_VERSION) \
-                -lvtkIOXML-$(VTK_VERSION) \
                 -lvtkFiltersExtraction-$(VTK_VERSION) \
                 -lvtkFiltersModeling-$(VTK_VERSION) \
@@ -58 +57 @@
                 -lvtkFiltersGeneral-$(VTK_VERSION) \
                 -lvtkFiltersCore-$(VTK_VERSION) \
-                -lvtkImagingMath-$(VTK_VERSION) \
                 -lvtkImagingHybrid-$(VTK_VERSION) \
                 -lvtkImagingCore-$(VTK_VERSION) \

vtkvis/branches/1.8/Renderer.cpp

@@ -80 +80 @@
     _cameraMode(PERSPECTIVE),
     _cameraAspect(ASPECT_NATIVE),
-    _computeOnlyVisibleBounds(true),
+    _computeOnlyVisibleBounds(false),
     _imgCameraPlane(PLANE_XY),
     _imgCameraOffset(0),
@@ -4211 +4211 @@
     }
     *plane = PLANE_XY;
-    *offset = bounds[4] + (bounds[5] - bounds[4])/2.0;
+    *offset = 0; //bounds[4] + (bounds[5] - bounds[4])/2.0;
     return false;
 }

vtkvis/branches/1.8/configure

@@ -1323 +1323 @@
   --with-vtk-includes=DIR location of versioned VTK include dir
   --with-vtk-libs=DIR     VTK libraries are in DIR
-  --with-vtk=VERSION      Version of VTK required [default=6.1]
+  --with-vtk=VERSION      Version of VTK required [default=6.0]
   --with-statsdir=DIR     Write statistics in DIR
 
@@ -4145 +4145 @@
 
 # We are assuming that we're using VTK 6.0
-VTK_VERSION=6.1
+VTK_VERSION=6.0
 VTK_LIB_DIR=${libdir}
 VTK_INC_DIR=${incdir}

vtkvis/branches/1.8/configure.in

@@ -27 +27 @@
     [vtk],
     [AS_HELP_STRING([--with-vtk=VERSION],
-        [Version of VTK required @<:@default=6.1@:>@])],
+        [Version of VTK required @<:@default=6.0@:>@])],
     [with_vtk=$withval],
     [with_vtk=""])
@@ -104 +104 @@
 
 # We are assuming that we're using VTK 6.0
-VTK_VERSION=6.1
+VTK_VERSION=6.0
 VTK_LIB_DIR=${libdir}
 VTK_INC_DIR=${incdir}