Changeset 2351 for trunk

Timestamp:

Aug 13, 2011 2:44:22 PM (13 years ago)

Author:

ldelgass

Message:

Use same code path for setting relative/absolute camera orientation, as with
pan/zoom, compute a relative setting from the previous and current absolute
settings. This fixes interaction between pan/zoom/rotate when using absolute
settings from client. Rotation now always occurs about the focal point. With
the current client implementation, the camera settings after a loss of
connection may not be correct, since the decomposition into orientation, pan,
and zoom will not necessarily reproduce the same camera matrix. To fix this,
the client will probably need to keep track of the concatented camera matrix in order to properly restore the camera settings after a reconnect.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderer.cpp (modified) (11 diffs)
• RpVtkRenderer.h (modified) (2 diffs)
• protocol.txt (modified) (4 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -65 +65 @@
     _cameraPan[0] = 0;
     _cameraPan[1] = 0;
+    _cameraOrientation[0] = 1.0;
+    _cameraOrientation[1] = 0.0;
+    _cameraOrientation[2] = 0.0;
+    _cameraOrientation[3] = 0.0;
     _cumulativeDataRange[0] = 0.0;
     _cumulativeDataRange[1] = 1.0;
@@ -125 +129 @@
     initAxes();
     initCamera();
-    storeCameraOrientation();
     addColorMap("default", ColorMap::getDefault());
     addColorMap("volumeDefault", ColorMap::getVolumeDefault());
@@ -6556 +6559 @@
 }
 
+inline double *quatMult(double q1[4], double q2[4], double result[4])
+{
+    double q1w = q1[0];
+    double q1x = q1[1];
+    double q1y = q1[2];
+    double q1z = q1[3];
+    double q2w = q2[0];
+    double q2x = q2[1];
+    double q2y = q2[2];
+    double q2z = q2[3];
+    result[0] = (q1w*q2w) - (q1x*q2x) - (q1y*q2y) - (q1z*q2z);
+    result[1] = (q1w*q2x) + (q1x*q2w) + (q1y*q2z) - (q1z*q2y);
+    result[2] = (q1w*q2y) + (q1y*q2w) + (q1z*q2x) - (q1x*q2z);
+    result[3] = (q1w*q2z) + (q1z*q2w) + (q1x*q2y) - (q1y*q2x);
+    return result;
+}
+
+inline double *quatConjugate(double quat[4], double result[4])
+{
+    result[1] = -quat[1];
+    result[2] = -quat[2];
+    result[3] = -quat[3];
+    return result;
+}
+
+inline double *quatReciprocal(double quat[4], double result[4])
+{
+    double denom = 
+        quat[0]*quat[0] + 
+        quat[1]*quat[1] + 
+        quat[2]*quat[2] + 
+        quat[3]*quat[3];
+    quatConjugate(quat, result);
+    for (int i = 0; i < 4; i++) {
+        result[i] /= denom;
+    }
+    return result;
+}
+
+inline double *quatReciprocal(double quat[4])
+{
+    return quatReciprocal(quat, quat);
+}
+
+inline void copyQuat(double quat[4], double result[4])
+{
+    memcpy(result, quat, sizeof(double)*4);
+}
+
 /**
  * \brief Set the orientation of the camera from a quaternion
@@ -6571 +6623 @@
 
     if (absolute) {
-        quaternionToMatrix4x4(quat, *mat4);
+        double abs[4];
+        // Save absolute rotation
+        copyQuat(quat, abs);
+        // Compute relative rotation
+        quatMult(quatReciprocal(_cameraOrientation), quat, quat);
+        // Store absolute rotation
+        copyQuat(abs, _cameraOrientation);
+    } else {
+        // Compute new absolute rotation
+        quatMult(_cameraOrientation, quat, _cameraOrientation);
+    }
+
+    quaternionToTransposeMatrix4x4(quat, *mat4);
 #ifdef DEBUG
-        TRACE("Arcball camera matrix:\n %g %g %g\n %g %g %g\n %g %g %g",
-              (*mat4)[0][0], (*mat4)[0][1], (*mat4)[0][2],
-              (*mat4)[1][0], (*mat4)[1][1], (*mat4)[1][2],
-              (*mat4)[2][0], (*mat4)[2][1], (*mat4)[2][2]);
+    TRACE("Arcball camera matrix:\n %g %g %g\n %g %g %g\n %g %g %g",
+          (*mat4)[0][0], (*mat4)[0][1], (*mat4)[0][2],
+          (*mat4)[1][0], (*mat4)[1][1], (*mat4)[1][2],
+          (*mat4)[2][0], (*mat4)[2][1], (*mat4)[2][2]);
+    vtkSmartPointer<vtkMatrix4x4> mat2 = vtkSmartPointer<vtkMatrix4x4>::New();
+    mat2->DeepCopy(camera->GetViewTransformMatrix());
+    TRACE("camera matrix:\n %g %g %g %g\n %g %g %g %g\n %g %g %g %g\n %g %g %g %g",
+          (*mat2)[0][0], (*mat2)[0][1], (*mat2)[0][2], (*mat2)[0][3],
+          (*mat2)[1][0], (*mat2)[1][1], (*mat2)[1][2], (*mat2)[1][3],
+          (*mat2)[2][0], (*mat2)[2][1], (*mat2)[2][2], (*mat2)[2][3],
+          (*mat2)[3][0], (*mat2)[3][1], (*mat2)[3][2], (*mat2)[3][3]);
+    printCameraInfo(camera);
 #endif
-        camera->SetPosition(0, 0, 1);
-        camera->SetFocalPoint(0, 0, 0);
-        camera->SetViewUp(0, 1, 0);
-        double bounds[6];
-        collectBounds(bounds, false);
-        _renderer->ResetCamera(bounds);
-        camera->GetFocalPoint(_cameraFocalPoint);
-        trans->Translate(+_cameraFocalPoint[0], +_cameraFocalPoint[1], +_cameraFocalPoint[2]);
-        trans->Concatenate(mat4);
-        trans->Translate(-_cameraFocalPoint[0], -_cameraFocalPoint[1], -_cameraFocalPoint[2]);
-        camera->ApplyTransform(trans);
-    } else {
-        quaternionToTransposeMatrix4x4(quat, *mat4);
-#ifdef DEBUG
-        vtkSmartPointer<vtkMatrix4x4> mat2 = vtkSmartPointer<vtkMatrix4x4>::New();
-        mat2->DeepCopy(camera->GetViewTransformMatrix());
-        TRACE("camera matrix:\n %g %g %g %g\n %g %g %g %g\n %g %g %g %g\n %g %g %g %g",
-              (*mat2)[0][0], (*mat2)[0][1], (*mat2)[0][2], (*mat2)[0][3],
-              (*mat2)[1][0], (*mat2)[1][1], (*mat2)[1][2], (*mat2)[1][3],
-              (*mat2)[2][0], (*mat2)[2][1], (*mat2)[2][2], (*mat2)[2][3],
-              (*mat2)[3][0], (*mat2)[3][1], (*mat2)[3][2], (*mat2)[3][3]);
-        printCameraInfo(camera);
-#endif
-        trans->Translate(0, 0, -camera->GetDistance());
-        trans->Concatenate(mat4);
-        trans->Translate(0, 0, camera->GetDistance());
-        trans->Concatenate(camera->GetViewTransformMatrix());
-        setCameraFromMatrix(camera, *trans->GetMatrix());
-    }
-    storeCameraOrientation();
-    if (absolute) {
-        if (_cameraZoomRatio != 1.0) {
-            double z = _cameraZoomRatio;
-            _cameraZoomRatio = 1.0;
-            zoomCamera(z, true);
-        }
-        if (_cameraPan[0] != 0.0 || _cameraPan[1] != 0.0) {
-            double panx = _cameraPan[0];
-            double pany = -_cameraPan[1];
-            _cameraPan[0] = 0;
-            _cameraPan[1] = 0;
-            panCamera(panx, pany, true);
-        }
-    }
+    trans->Translate(0, 0, -camera->GetDistance());
+    trans->Concatenate(mat4);
+    trans->Translate(0, 0, camera->GetDistance());
+    trans->Concatenate(camera->GetViewTransformMatrix());
+    setCameraFromMatrix(camera, *trans->GetMatrix());
+
     _renderer->ResetCameraClippingRange();
     printCameraInfo(camera);
@@ -6638 +6672 @@
                                                double viewUp[3])
 {
-    memcpy(_cameraPos, position, sizeof(double)*3);
-    memcpy(_cameraFocalPoint, focalPoint, sizeof(double)*3);
-    memcpy(_cameraUp, viewUp, sizeof(double)*3);
-    // Apply the new parameters to the VTK camera
-    restoreCameraOrientation();
+    vtkSmartPointer<vtkCamera> camera = _renderer->GetActiveCamera();
+    camera->SetPosition(position);
+    camera->SetFocalPoint(focalPoint);
+    camera->SetViewUp(viewUp);
+    _renderer->ResetCameraClippingRange();
     _needsRedraw = true;
 }
@@ -6657 +6691 @@
                                                double viewUp[3])
 {
-    memcpy(position, _cameraPos, sizeof(double)*3);
-    memcpy(focalPoint, _cameraFocalPoint, sizeof(double)*3);
-    memcpy(viewUp, _cameraUp, sizeof(double)*3);
-}
-
-/**
- * \brief Saves the current camera orientation and position in order to
- * be able to later restore the saved orientation and position
- */
-void Renderer::storeCameraOrientation()
-{
     vtkSmartPointer<vtkCamera> camera = _renderer->GetActiveCamera();
-    camera->GetPosition(_cameraPos);
-    camera->GetFocalPoint(_cameraFocalPoint);
-    camera->GetViewUp(_cameraUp);
-}
-
-/**
- * \brief Use the stored orientation and position to set the camera's
- * current state
- */
-void Renderer::restoreCameraOrientation()
-{
-    vtkSmartPointer<vtkCamera> camera = _renderer->GetActiveCamera();
-    camera->SetPosition(_cameraPos);
-    camera->SetFocalPoint(_cameraFocalPoint);
-    camera->SetViewUp(_cameraUp);
+    camera->GetPosition(position);
+    camera->GetFocalPoint(focalPoint);
+    camera->GetViewUp(viewUp);
 }
 
@@ -6701 +6712 @@
             camera->SetFocalPoint(0, 0, 0);
             camera->SetViewUp(0, 1, 0);
-            storeCameraOrientation();
-        } else {
-            restoreCameraOrientation();
+            _cameraOrientation[0] = 1.0;
+            _cameraOrientation[1] = 0.0;
+            _cameraOrientation[2] = 0.0;
+            _cameraOrientation[3] = 0.0;
         }
         setViewAngle(_windowHeight);
@@ -6738 +6750 @@
     camera->Roll(roll); // Roll about camera view axis
     _renderer->ResetCameraClippingRange();
-    storeCameraOrientation();
     //computeScreenWorldCoords();
     _needsRedraw = true;
@@ -6750 +6761 @@
  * etc.
  *
- * \param[in] x Viewport coordinate horizontal panning
- * \param[in] y Viewport coordinate vertical panning (with origin at top)
+ * \param[in] x Viewport coordinate horizontal panning (positive number pans
+ * camera left, object right)
+ * \param[in] y Viewport coordinate vertical panning (positive number pans 
+ * camera up, object down)
  * \param[in] absolute Control if pan amount is relative to current or absolute
  */
@@ -6832 +6845 @@
 
         _renderer->ResetCameraClippingRange();
-        storeCameraOrientation();
         //computeScreenWorldCoords();
     }
@@ -6877 +6889 @@
         camera->Zoom(z); // Change ortho parallel scale (Dolly has no effect in ortho)
         _renderer->ResetCameraClippingRange();
-        storeCameraOrientation();
     } else {
         camera->Dolly(z); // Move camera forward/back
         _renderer->ResetCameraClippingRange();
-        storeCameraOrientation();
         //computeScreenWorldCoords();
     }

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -650 +650 @@
     void computeScreenWorldCoords();
 
-    void storeCameraOrientation();
-    void restoreCameraOrientation();
     void initCamera();
     void initAxes();
@@ -662 +660 @@
     double _imgWorldDims[2];
     double _screenWorldCoords[4];
-    double _cameraPos[3];
-    double _cameraFocalPoint[3];
-    double _cameraUp[3];
+    double _cameraOrientation[4];
     double _cameraZoomRatio;
     double _cameraPan[2];

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -42 +42 @@
 
 camera get
-       Request current camera orientation
+       Request current camera parameters
 camera mode <mode>
        <mode> = persp|ortho|image
@@ -51 +51 @@
        Data is assumed to lie in XY plane (z = 0)
 camera pan <x> <y>
-       <x,y> world coordinates
+       <x,y> viewport coordinates (window center at 0,0).  Positive x pan
+       means pan object to right (camera to left).  Positive y pan means
+       pan object down (camera up).  For example a pan of 0.5, 0.5 would
+       move the object center to the lower right corner of the window
 camera reset <?all?>
        Option all resets orientation/rotation as well as pan/zoom/clip range
@@ -57 +60 @@
        Specify relative rotation in Euler angles
 camera set <posX> <posY> <posZ> <focalPtX> <focalPtY> <focalPtZ> <viewUpX> <viewUpY> <viewUpZ>
-       Set camera orientation using camera position, focal point and view up 
-       vector
+       Set camera parameters: camera position, focal point and view up vector
 camera zoom <z>
-       Specify zoom ratio
+       Specify zoom ratio.  z > 1 is a zoom in, z < 1 is zoom out. z = 1
+       resets to default.
 
 colormap add <colorMapName> <colorMap> <opacityMap>
@@ -251 +254 @@
 streamlines seed color <r> <g> <b> <?datasetName?>
 streamlines seed disk <centerX> <centerY> <centerZ> <normalX> <normalY> <normalZ> <radius> <innerRadius> <numPoints> <?dataSetName?>
-            Create a disk seed area with optional hole, filled with randomly placed points
+            Create a disk seed area with optional hole, filled with randomly 
+            placed points
 streamlines seed fpoly <centerX> <centerY> <centerZ> <normalX> <normalY> <normalZ> <angle> <radius> <numSides> <numPoints> <?dataSetName?>
-            Create a regular n-sided polygonal seed area filled with randomly placed points
+            Create a regular n-sided polygonal seed area filled with randomly 
+            placed points
 streamlines seed polygon <centerX> <centerY> <centerZ> <normalX> <normalY> <normalZ> <angle> <radius> <numSides> <?dataSetName?>
             Create seed points from vertices of a regular n-sided polygon