Changeset 1238 for trunk/packages

Timestamp:

Nov 25, 2008, 10:08:15 AM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• nanovis.cpp (modified) (1 diff)
• nanovis.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -727 +727 @@
              Tcl_Obj *const *objv)
 {
-    int x, y;
-    if ((Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK) ||
-        (Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK)) {
+    float x, y;
+    if ((GetFloatFromObj(interp, objv[2], &x) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[3], &y) != TCL_OK)) {
         return TCL_ERROR;
     }

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -444 +444 @@
 
 static void
-NanoVis::pan(int x, int y)
-{
-    float x, y;
-
-    /* Normalize coordinates */
-    x = (float)dx / (float)win_width;
-    y = (float)dy / (float)win_height;
-
+NanoVis::pan(float dx, float dy)
+{
     /* Move the camera and its target by equal amounts along the x and y
      * axes. */
-    fprintf(stderr, "x=%f, y=%f\n", x, y);
+    fprintf(stderr, "x=%f, y=%f\n", dx, dy);
     
-    cam->x(def_eye_x + x);
-    cam->y(def_eye_y + y);
+    cam->x(def_eye_x + dx);
+    cam->y(def_eye_y + dy);
     fprintf(stderr, "set eye to %f %f\n", cam->x(), cam->y());
 
-    cam->xAim(def_target_x + x);
-    cam->yAim(def_target_y + y);
+    cam->xAim(def_target_x + dx);
+    cam->yAim(def_target_y + dy);
     fprintf(stderr, "set aim to %f %f\n", cam->xAim(), cam->yAim());
 }

trunk/packages/vizservers/nanovis/nanovis.h

@@ -169 +169 @@
     static void xinetd_listen(void);
     static int render_2d_contour(HeightMap* heightmap, int width, int height);
+    static void pan(float dx, float dy);
 
 #ifndef XINETD