Changeset 1219 for trunk/packages/vizservers

Timestamp:

Nov 17, 2008 2:18:41 PM (15 years ago)

Author:

gah

Message:

Add pan command to nanovis and pymolproxy

Location:

trunk/packages/vizservers

Files:

• nanovis/Command.cpp (modified) (3 diffs)
• nanovis/nanovis.cpp (modified) (2 diffs)
• pymolproxy/pymolproxy.c (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -694 +694 @@
 
 static int
-CameraPanOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+CameraEyeOp(ClientData cdata, Tcl_Interp *interp, int objc, 
              Tcl_Obj *const *objv)
 {
-    double dx, dy, dz;
-    if ((Tcl_GetDoubleFromObj(interp, objv[2], &dx) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[3], &dy) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[4], &dz) != TCL_OK)) {
-        return TCL_ERROR;
-    }
-    NanoVis::cam->aim(dx, dy, dz);
-    NanoVis::cam->x(dx);
-    NanoVis::cam->y(dy);
-    NanoVis::cam->z(dz);
+    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->x(x);
+    NanoVis::cam->y(y);
+    NanoVis::cam->z(z);
     return TCL_OK;
 }
@@ -714 +713 @@
             Tcl_Obj *const *objv)
 {
-    double x, y, z;
-    if ((Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[4], &z) != TCL_OK)) {
+    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;
     }
@@ -753 +752 @@
     {"aim",     2, CameraAimOp,      5, 5, "x y z",},
     {"angle",   2, CameraAngleOp,    5, 5, "xAngle yAngle zAngle",},
-    {"pan",     1, CameraPanOp,      5, 5, "x y z",},
+    {"eye",     1, CameraEyeOp,      5, 5, "x y z",},
     {"zoom",    1, CameraZoomOp,     3, 3, "factor",},
 };

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -170 +170 @@
 // Variables for mouse events
 
-// Object rotation angles
-const float def_rot_x = 90.;
-const float def_rot_y = 180.;
-const float def_rot_z = -135;
-
-// Object translation location from the origin
-const float def_obj_x = -0.0;
-const float def_obj_y = -0.0;
-const float def_obj_z = -2.5;
+// Default camera rotation angles.
+const float def_rot_x = 90.0f;
+const float def_rot_y = 180.0f;
+const float def_rot_z = -135.0f;
+
+// Default camera target.
+const float def_target_x = 0.0f;
+const float def_target_y = 0.0f;
+const float def_target_z = 100.0f; 
+
+// Default camera location.
+const float def_eye_x = -0.0f;
+const float def_eye_y = -0.0f;
+const float def_eye_z = -2.5f;
 
 
@@ -877 +882 @@
    //create the camera with default setting
    cam = new NvCamera(0, 0, win_width, win_height,
-                      def_obj_x, def_obj_y, def_obj_z,
-                      0., 0., 100.,
-                      def_rot_x, def_rot_y, def_rot_z);
+                      def_eye_x, def_eye_y, def_eye_z,          /* location. */
+                      def_target_x, def_target_y, def_target_z, /* target. */
+                      def_rot_x, def_rot_y, def_rot_z);         /* angle. */
 
    glEnable(GL_TEXTURE_2D);

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -1139 +1139 @@
     proxyPtr->invalidate_cache = 1;
     if (x != 0.0) {
-        Send(proxyPtr,"move x,%f\n", x * 0.005);
+        Send(proxyPtr,"move x,%f\n", x * 0.05);
     }   
     if (y != 0.0) {
-        Send(proxyPtr,"move y,%f\n", -y * 0.005);
+        Send(proxyPtr,"move y,%f\n", -y * 0.05);
     }   
     return proxyPtr->status;