Changeset 2200 for trunk/packages/vizservers/vtkvis

Timestamp:

Apr 12, 2011, 2:20:21 PM (13 years ago)

Author:

ldelgass

Message:

New commands to set and get absolute camera orientation/position, fix for
panning in 3D, better aspect ratio handling with 2D camera.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderer.cpp (modified) (9 diffs)
• RpVtkRenderer.h (modified) (2 diffs)
• RpVtkRendererCmd.cpp (modified) (5 diffs)
• protocol.txt (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -76 +76 @@
     _renderer = vtkSmartPointer<vtkRenderer>::New();
     _renderer->LightFollowCameraOn();
-    storeCameraOrientation();
     _cameraMode = PERSPECTIVE;
     initAxes();
     initCamera();
+    storeCameraOrientation();
     _renderWindow = vtkSmartPointer<vtkRenderWindow>::New();
     _renderWindow->DoubleBufferOff();
@@ -1635 +1635 @@
 }
 
+void Renderer::setCameraOrientation(double position[3],
+                                    double focalPoint[3],
+                                    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();
+    _needsRedraw = true;
+}
+
+void Renderer::getCameraOrientation(double position[3],
+                                    double focalPoint[3],
+                                    double viewUp[3])
+{
+    memcpy(position, _cameraPos, sizeof(double)*3);
+    memcpy(focalPoint, _cameraFocalPoint, sizeof(double)*3);
+    memcpy(viewUp, _cameraUp, sizeof(double)*3);
+}
+
 void Renderer::storeCameraOrientation()
 {
@@ -1677 +1698 @@
     _cameraPan[0] = 0;
     _cameraPan[1] = 0;
+
     _needsRedraw = true;
 }
@@ -1704 +1726 @@
  * \brief Perform a 2D translation of the camera
  *
- * \param[in] x [0,1] Viewport coordinate horizontal panning
- * \param[in] y [0,1] Viewport coordinate vertical panning (with origin at top)
+ * x,y pan amount are specified as signed absolute pan amount in viewport
+ * units -- i.e. 0 is no pan, .5 is half the viewport, 2 is twice the viewport,
+ * etc.
+ *
+ * \param[in] x Viewport coordinate horizontal panning
+ * \param[in] y Viewport coordinate vertical panning (with origin at top)
  * \param[in] absolute Control if pan amount is relative to current or absolute
  */
 void Renderer::panCamera(double x, double y, bool absolute)
 {
-    // Reverse x rather than y, since we are panning the camera, and client
-    // expects to be panning/moving the object
-    x = -x * _screenWorldCoords[2];
-    y = y * _screenWorldCoords[3];
-
-    if (absolute) {
-        double panAbs[2];
-        panAbs[0] = x;
-        panAbs[1] = y;
-        x -= _cameraPan[0];
-        y -= _cameraPan[1];
-        _cameraPan[0] = panAbs[0];
-        _cameraPan[1] = panAbs[1];
-    } else {
-        _cameraPan[0] += x;
-        _cameraPan[1] += y;
-    }
     if (_cameraMode == IMAGE) {
+        // Reverse x rather than y, since we are panning the camera, and client
+        // expects to be panning/moving the object
+        x = -x * _screenWorldCoords[2];
+        y = y * _screenWorldCoords[3];
+
+        if (absolute) {
+            double panAbs[2];
+            panAbs[0] = x;
+            panAbs[1] = y;
+            x -= _cameraPan[0];
+            y -= _cameraPan[1];
+            _cameraPan[0] = panAbs[0];
+            _cameraPan[1] = panAbs[1];
+        } else {
+            _cameraPan[0] += x;
+            _cameraPan[1] += y;
+        }
+
         _imgWorldOrigin[0] += x;
         _imgWorldOrigin[1] += y;
@@ -1733 +1760 @@
                             _imgWorldDims[0], _imgWorldDims[1]);
     } else {
+        y = -y;
+        if (absolute) {
+            double panAbs[2];
+            panAbs[0] = x;
+            panAbs[1] = y;
+            x -= _cameraPan[0];
+            y -= _cameraPan[1];
+            _cameraPan[0] = panAbs[0];
+            _cameraPan[1] = panAbs[1];
+        } else {
+            _cameraPan[0] += x;
+            _cameraPan[1] += y;
+        }
+
         vtkSmartPointer<vtkCamera> camera = _renderer->GetActiveCamera();
-        vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
-        trans->Translate(x, y, 0);
-        camera->ApplyTransform(trans);
+        double viewFocus[4], focalDepth, viewPoint[3];
+        double newPickPoint[4], oldPickPoint[4], motionVector[3];
+
+        camera->GetFocalPoint(viewFocus);
+        computeWorldToDisplay(viewFocus[0], viewFocus[1], viewFocus[2], 
+                              viewFocus);
+        focalDepth = viewFocus[2];
+
+        computeDisplayToWorld(( x * 2. + 1.) * _windowWidth / 2.0,
+                              ( y * 2. + 1.) * _windowHeight / 2.0,
+                              focalDepth, 
+                              newPickPoint);
+
+        computeDisplayToWorld(_windowWidth / 2.0,
+                              _windowHeight / 2.0,
+                              focalDepth, 
+                              oldPickPoint);
+ 
+        // Camera motion is reversed
+        motionVector[0] = oldPickPoint[0] - newPickPoint[0];
+        motionVector[1] = oldPickPoint[1] - newPickPoint[1];
+        motionVector[2] = oldPickPoint[2] - newPickPoint[2];
+
+        camera->GetFocalPoint(viewFocus);
+        camera->GetPosition(viewPoint);
+        camera->SetFocalPoint(motionVector[0] + viewFocus[0],
+                              motionVector[1] + viewFocus[1],
+                              motionVector[2] + viewFocus[2]);
+
+        camera->SetPosition(motionVector[0] + viewPoint[0],
+                            motionVector[1] + viewPoint[1],
+                            motionVector[2] + viewPoint[2]);
+
         _renderer->ResetCameraClippingRange();
         storeCameraOrientation();
@@ -1799 +1870 @@
     int imgHeightPx = _windowHeight - pxOffsetY - outerGutter;
     int imgWidthPx = _windowWidth - pxOffsetX - outerGutter;
+
+    double imgAspect = width / height;
+    double winAspect = (double)_windowWidth / _windowHeight;
+
     double pxToWorld;
-    if (height > width) 
+
+    if (imgAspect >= winAspect) {
+        pxToWorld = width / imgWidthPx;
+    } else {
         pxToWorld = height / imgHeightPx;
-    else
-        pxToWorld = width / imgWidthPx;
+    }
+
     double offsetX = pxOffsetX * pxToWorld;
     double offsetY = pxOffsetY * pxToWorld;
@@ -1853 +1931 @@
 }
 
+void Renderer::computeDisplayToWorld(double x, double y, double z, double worldPt[4])
+{
+    _renderer->SetDisplayPoint(x, y, z);
+    _renderer->DisplayToWorld();
+    _renderer->GetWorldPoint(worldPt);
+    if (worldPt[3]) {
+        worldPt[0] /= worldPt[3];
+        worldPt[1] /= worldPt[3];
+        worldPt[2] /= worldPt[3];
+        worldPt[3] = 1.0;
+    }
+}
+
+void Renderer::computeWorldToDisplay(double x, double y, double z, double displayPt[3])
+{
+    _renderer->SetWorldPoint(x, y, z, 1.0);
+    _renderer->WorldToDisplay();
+    _renderer->GetDisplayPoint(displayPt);
+}
+
 void Renderer::computeScreenWorldCoords()
 {
@@ -1858 +1956 @@
     double x0 = -1;
     double y0 = -1;
-    double z0 = 0;
+    double z0 = -1;
     double x1 = 1;
     double y1 = 1;
-    double z1 = 0;
+    double z1 = -1;
 
     vtkMatrix4x4 *mat = vtkMatrix4x4::New();
@@ -2100 +2198 @@
 void Renderer::printCameraInfo(vtkCamera *camera)
 {
-    TRACE("Parallel Scale: %g, Cam pos: %g %g %g, Clipping range: %g %g",
+    TRACE("Parallel Scale: %g, Cam pos: %g %g %g, focal pt: %g %g %g, view up: %g %g %g, Clipping range: %g %g",
           camera->GetParallelScale(),
           camera->GetPosition()[0],
           camera->GetPosition()[1],
           camera->GetPosition()[2], 
+          camera->GetFocalPoint()[0],
+          camera->GetFocalPoint()[1],
+          camera->GetFocalPoint()[2],
+          camera->GetViewUp()[0],
+          camera->GetViewUp()[1],
+          camera->GetViewUp()[2],
           camera->GetClippingRange()[0],
           camera->GetClippingRange()[1]);

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -110 +110 @@
     void rotateCamera(double yaw, double pitch, double roll);
 
+    void setCameraOrientation(double position[3],
+                              double focalPoint[3],
+                              double viewUp[3]);
+
+    void getCameraOrientation(double position[3],
+                              double focalPoint[3],
+                              double viewUp[3]);
+
     void panCamera(double x, double y, bool absolute = true);
 
@@ -239 +247 @@
 
     void updateRanges(bool useCumulative);
+
+    void computeDisplayToWorld(double x, double y, double z, double worldPt[4]);
+
+    void computeWorldToDisplay(double x, double y, double z, double displayPt[3]);
 
     void computeScreenWorldCoords();

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -212 +212 @@
 
 static int
+CameraGetOrientationOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    double pos[3];
+    double focalPt[3];
+    double viewUp[3];
+
+    g_renderer->getCameraOrientation(pos, focalPt, viewUp);
+
+    char buf[256];
+    snprintf(buf, sizeof(buf), "nv>camera orient %.12e %.12e %.12e %.12e %.12e %.12e %.12e %.12e %.12e", 
+             pos[0], pos[1], pos[2], focalPt[0], focalPt[1], focalPt[2], viewUp[0], viewUp[1], viewUp[2]);
+    ssize_t bytesWritten;
+    size_t len = strlen(buf);
+    size_t ofs = 0;
+    while ((bytesWritten = write(g_fdOut, buf + ofs, len - ofs)) > 0) {
+        ofs += bytesWritten;
+        if (ofs == len)
+            break;
+    }
+    if (bytesWritten < 0) {
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+CameraOrientationOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    double pos[3];
+    double focalPt[3];
+    double viewUp[3];
+
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &pos[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &pos[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &pos[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &focalPt[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[6], &focalPt[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[7], &focalPt[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[8], &viewUp[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[9], &viewUp[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[10], &viewUp[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->setCameraOrientation(pos, focalPt, viewUp);
+    return TCL_OK;
+}
+
+static int
 CameraOrthoOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
 {
-    float x, y, width, height;
-
-    if (GetFloatFromObj(interp, objv[2], &x) != TCL_OK ||
-        GetFloatFromObj(interp, objv[3], &y) != TCL_OK ||
-        GetFloatFromObj(interp, objv[4], &width) != TCL_OK ||
-        GetFloatFromObj(interp, objv[5], &height) != TCL_OK) {
+    double x, y, width, height;
+
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &width) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &height) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -232 +283 @@
             Tcl_Obj *const *objv)
 {
-    float x, y;
-
-    if (GetFloatFromObj(interp, objv[2], &x) != TCL_OK ||
-        GetFloatFromObj(interp, objv[3], &y) != TCL_OK) {
+    double x, y;
+
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -266 +317 @@
                Tcl_Obj *const *objv)
 {
-    float yaw, pitch, roll;
-
-    if (GetFloatFromObj(interp, objv[2], &yaw) != TCL_OK ||
-        GetFloatFromObj(interp, objv[3], &pitch) != TCL_OK ||
-        GetFloatFromObj(interp, objv[4], &roll) != TCL_OK) {
+    double yaw, pitch, roll;
+
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &yaw) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &pitch) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &roll) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -282 +333 @@
             Tcl_Obj *const *objv)
 {
-    float z;
-
-    if (GetFloatFromObj(interp, objv[2], &z) != TCL_OK) {
+    double z;
+
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &z) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -293 +344 @@
 
 static Rappture::CmdSpec cameraOps[] = {
+    {"get", 1, CameraGetOrientationOp, 2, 2, ""},
     {"mode", 1, CameraModeOp, 3, 3, "mode"},
+    {"orient", 3, CameraOrientationOp, 11, 11, "posX posY posZ focalPtX focalPtY focalPtZ viewUpX viewUpY viewUpZ"},
     {"ortho", 1, CameraOrthoOp, 6, 6, "x y width height"},
     {"pan", 1, CameraPanOp, 4, 4, "panX panY"},

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -17 +17 @@
      <axis> = x|y|z|all
 
+camera get
+       Request current camera orientation
 camera mode <mode>
        <mode> = persp|ortho|image
+camera orient <posX> <posY> <posZ> <focalPtX> <focalPtY> <focalPtZ> <viewUpX> <viewUpY> <viewUpZ>
+       Set camera orientation using camera position, focal point and view up 
+       vector
 camera ortho <x> <y> <width> <height>
        Supply world coordinate bounds of plot area for image camera mode
@@ -89 +94 @@
 Replies:
 
+nv>camera orient <posX> <posY> <posZ> <focalPtX> <focalPtY> <focalPtZ> <viewUpX> <viewUpY> <viewUpZ>
+   Reply to "camera get"
 nv>image -type image -bytes <nbytes>
   <binary RGB data>