Changeset 3583 for trunk

Timestamp:

Mar 25, 2013 6:00:23 PM (11 years ago)

Author:

ldelgass

Message:

Cherry-pick a few fixes from VTK head to allowing compiling against VTK head.

Location:

trunk/packages/vizservers/vtkvis

Files:

• vtkRpCubeAxesActor.cpp (modified) (4 diffs)
• vtkRpCubeAxesActor.h (modified) (1 diff)

trunk/packages/vizservers/vtkvis/vtkRpCubeAxesActor.cpp

@@ -2545 +2545 @@
 {
   // Loop over points and find the closest point to the camera
-  double min = VTK_LARGE_FLOAT;
+  double min = VTK_FLOAT_MAX;
   int idx = 0;
   for (int i=0; i < 8; i++)
@@ -2562 +2562 @@
 {
   // Loop over points and find the furthest point from the camera
-  double max = -VTK_LARGE_FLOAT;
+  double max = -VTK_FLOAT_MAX;
   int idx = 0;
   for (int i=0; i < 8; i++)
@@ -2587 +2587 @@
 
    // Find distance to origin
-   double d2Min = VTK_LARGE_FLOAT;
+   double d2Min = VTK_FLOAT_MAX;
    for (i=0; i < 8; i++)
      {
@@ -2600 +2600 @@
    // find minimum slope point connected to closest point and on
    // right side (in projected coordinates). This is the first edge.
-   minSlope = VTK_LARGE_FLOAT;
+   minSlope = VTK_FLOAT_MAX;
    for (xIdx=0, i=0; i<3; i++)
      {

trunk/packages/vizservers/vtkvis/vtkRpCubeAxesActor.h

@@ -199 +199 @@
   // many renders) the axes can switch position (jump from one axes
   // to another).
-  vtkSetClampMacro(Inertia, int, 1, VTK_LARGE_INTEGER);
+  vtkSetClampMacro(Inertia, int, 1, VTK_INT_MAX);
   vtkGetMacro(Inertia, int);