Changeset 1236 for trunk/packages/vizservers/nanovis

Timestamp:

Nov 25, 2008, 9:56:29 AM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• NvCamera.h (modified) (4 diffs)
• nanovis.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -732 +732 @@
         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);
+    NanoVis::pan(x, y);
     return TCL_OK;
 }

trunk/packages/vizservers/nanovis/NvCamera.h

@@ -42 +42 @@
 
     //move location of camera
-    void x(double loc_x) {
+    void x(float loc_x) {
         location_.x = loc_x;
     }
@@ -48 +48 @@
         return location_.x;
     }
-    void y(double loc_y) {
+    void y(float loc_y) {
         location_.y = loc_y;
     }
@@ -54 +54 @@
         return location_.y;
     }
-    void z(double loc_z) {
+    void z(float loc_z) {
         location_.z = loc_z;
     }
@@ -61 +61 @@
     }
 
-    void aim(double target_x, double target_y, double target_z) {
-        target_ = Vector3(target_x, target_y, target_z);
+    //move location of target
+    void xAim(float x) {
+        aim_.x = x;
     }
-    Vector3 aim(void) { 
-        return target_;
+    float xAim(void) {
+        return aim_.x;
     }
-    void rotate(double angle_x, double angle_y, double angle_z) { 
+    void yAim(float y) {
+        aim_.y = y;
+    }
+    float yAim(void) {
+        return aim_.y;
+    }
+    void zAim(float z) {
+        aim_.z = z;
+    }
+    float zAim(void) {
+        return aim_.z;
+    }
+
+    void rotate(float angle_x, float angle_y, float angle_z) { 
         angle_ = Vector3(angle_x, angle_y, angle_z);
     }

trunk/packages/vizservers/nanovis/nanovis.cpp

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