Changeset 1229 for trunk

Timestamp:

Nov 24, 2008 2:21:14 PM (15 years ago)

Author:

gah

Message:

adding panning to nanovisviewer

Location:

trunk

Files:

• gui/scripts/nanovisviewer.tcl (modified) (2 diffs)
• packages/vizservers/nanovis/Command.cpp (modified) (5 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -1272 +1272 @@
     # Experimental stuff
     if { $option == "set" } {
-        set dx $x
-        set dy $y
-        set view_(x) [expr $view_(x) + $dx]
-        set view_(y) [expr $view_(y) + $dy]
-        _send "pan $dx $dy"
+        set view_(x) $x
+        set view_(y) $y
+        _send "camera pan $view_(x) $view_(y)"
         return
     }
@@ -1285 +1283 @@
         set view_(x) [expr $view_(x) + $x]
         set view_(y) [expr $view_(y) + $y]
-        _send "camera pan $view_(x) $view_(y) 0"
+        _send "camera pan $view_(x) $view_(y)"
     }
     if { $option == "release" } {

trunk/packages/vizservers/nanovis/Command.cpp

@@ -693 +693 @@
 }
 
-static int
-CameraEyeOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *const *objv)
+
+static int
+CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+            Tcl_Obj *const *objv)
 {
     float x, y, z;
@@ -703 +704 @@
         return TCL_ERROR;
     }
-    NanoVis::cam->x(x);
-    NanoVis::cam->y(y);
-    NanoVis::cam->z(z);
-    return TCL_OK;
-}
-
-static int
-CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-            Tcl_Obj *const *objv)
-{
-    float x, y, z;
-    if ((GetFloatFromObj(interp, objv[2], &x) != TCL_OK) ||
-        (GetFloatFromObj(interp, objv[3], &y) != TCL_OK) ||
-        (GetFloatFromObj(interp, objv[4], &z) != TCL_OK)) {
-        return TCL_ERROR;
-    }
     NanoVis::cam->aim(x, y, z);
     return TCL_OK;
@@ -727 +712 @@
               Tcl_Obj *const *objv)
 {
-    double theta, phi, psi;
-    if ((Tcl_GetDoubleFromObj(interp, objv[2], &phi) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[3], &theta) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[4], &psi) != TCL_OK)) {
+    float theta, phi, psi;
+    if ((GetFloatFromObj(interp, objv[2], &phi) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[3], &theta) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[4], &psi) != TCL_OK)) {
         return TCL_ERROR;
     }
@@ -739 +724 @@
 
 static int
-CameraZoomOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
-{
-    double zoom;
-    if (Tcl_GetDoubleFromObj(interp, objv[2], &zoom) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    NanoVis::cam->z(-2.5 / zoom);
+CameraPanOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
+{
+    float x, y;
+    if ((GetFloatFromObj(interp, objv[2], &x) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[3], &y) != TCL_OK)) {
+        return TCL_ERROR;
+    }
+    /* Convert to normalized coordinates */
+    x = x / (float)NanoVis::win_width;
+    y = y / (float)NanoVis::win_height;
+    /* Move the camera and its target by equal amounts along the x and y
+     * axes. */
+    NanoVis::cam->x(NanoVis::cam->x() + x);
+    NanoVis::cam->y(NanoVis::cam->y() + y);
+    fprintf(stderr, "dx=%f, dy=%f\n", x, y);
+    fprintf(stderr, "set eye to %f %f\n", NanoVis::cam->x(), NanoVis::cam->y());
+    Vector3 target;
+    target = NanoVis::cam->aim();
+    x += target.x;
+    y += target.y;
+    NanoVis::cam->aim(x, y, target.z);
+    fprintf(stderr, "set aim to %f %f\n", x, y);
+    return TCL_OK;
+}
+
+static int
+CameraZoomOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
+{
+    float zoom;
+    if (GetFloatFromObj(interp, objv[2], &zoom) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    NanoVis::cam->z(-2.5f / zoom);
     return TCL_OK;
 }
@@ -752 +765 @@
     {"aim",     2, CameraAimOp,      5, 5, "x y z",},
     {"angle",   2, CameraAngleOp,    5, 5, "xAngle yAngle zAngle",},
-    {"eye",     1, CameraEyeOp,      5, 5, "x y z",},
+    {"pan",     1, CameraPanOp,      4, 4, "x y",},
     {"zoom",    1, CameraZoomOp,     3, 3, "factor",},
 };