Changeset 1215 for trunk/packages/vizservers

Timestamp:

Nov 13, 2008 3:24:00 PM (16 years ago)

Author:

gah

Message:

changes to allow panning and zooming (via scrollwhell)

Location:

trunk/packages/vizservers

Files:

• nanovis/Command.cpp (modified) (4 diffs)
• nanovis/NvCamera.cpp (modified) (2 diffs)
• nanovis/NvCamera.h (modified) (1 diff)
• nanovis/nanovis.cpp (modified) (9 diffs)
• nanovis/nanovis.h (modified) (1 diff)
• pymolproxy/pymolproxy.c (modified) (5 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -694 +694 @@
 
 static int
-CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
-{
-    double x0, y0, z0;
-    if ((Tcl_GetDoubleFromObj(interp, objv[2], &x0) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[3], &y0) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[4], &z0) != TCL_OK)) {
-        return TCL_ERROR;
-    }
-    NanoVis::cam->aim(x0, y0, z0);
-    return TCL_OK;
-}
-
-static int
-CameraAngleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
-{
-    double xangle, yangle, zangle;
-    if ((Tcl_GetDoubleFromObj(interp, objv[2], &xangle) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[3], &yangle) != TCL_OK) ||
-        (Tcl_GetDoubleFromObj(interp, objv[4], &zangle) != TCL_OK)) {
-        return TCL_ERROR;
-    }
-    NanoVis::cam->rotate(xangle, yangle, zangle);
-    return TCL_OK;
-}
+CameraPanOp(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);
+    return TCL_OK;
+}
+
+static int
+CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+            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)) {
+        return TCL_ERROR;
+    }
+    NanoVis::cam->aim(x, y, z);
+    return TCL_OK;
+}
+
+static int
+CameraAngleOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+              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)) {
+        return TCL_ERROR;
+    }
+    NanoVis::cam->rotate(phi, theta, psi);
+    return TCL_OK;
+}
+
 
 static int
@@ -726 +746 @@
         return TCL_ERROR;
     }
-    NanoVis::zoom(zoom);
+    NanoVis::cam->z(-2.5 / zoom);
     return TCL_OK;
 }
@@ -733 +753 @@
     {"aim",     2, CameraAimOp,      5, 5, "x y z",},
     {"angle",   2, CameraAngleOp,    5, 5, "xAngle yAngle zAngle",},
+    {"pan",     1, CameraPanOp,      5, 5, "x y z",},
     {"zoom",    1, CameraZoomOp,     3, 3, "factor",},
 };
@@ -2128 +2149 @@
 
     // the variables below should be reassigned
-    int heightmap_index = 0;
     int image_width = 512;
     int image_height = 512;

trunk/packages/vizservers/nanovis/NvCamera.cpp

@@ -20 +20 @@
 
 NvCamera::NvCamera(int startx, int starty, int w, int h,
-                   double loc_x, double loc_y, double loc_z, 
-                   double target_x, double target_y, double target_z,
-                   int angle_x, int angle_y, int angle_z):
-    location(Vector3(loc_x, loc_y, loc_z)),
-    target(Vector3(target_x, target_y, target_z)),
-    angle(Vector3(angle_x, angle_y, angle_z)),
-    width(w),
-    height(h),
-    startX(startx),
-    startY(starty)
+                   float loc_x, float loc_y, float loc_z, 
+                   float target_x, float target_y, float target_z,
+                   float angle_x, float angle_y, float angle_z):
+    location_(Vector3(loc_x, loc_y, loc_z)),
+    target_(Vector3(target_x, target_y, target_z)),
+    angle_(Vector3(angle_x, angle_y, angle_z)),
+    width_(w),
+    height_(h),
+    startX_(startx),
+    startY_(starty)
 { 
     /*empty*/
 }
 
-NvCamera::~NvCamera()
-{
-    /*empty*/
-}        
-
-void 
-NvCamera::move(double loc_x, double loc_y, double loc_z)
-{ 
-    location = Vector3(loc_x, loc_y, loc_z); 
-}
-
-void 
-NvCamera::aim(double target_x, double target_y, double target_z)
-{ 
-    target = Vector3(target_x, target_y, target_z);
-}
-
-void 
-NvCamera::rotate(double angle_x, double angle_y, double angle_z)
-{ 
-    angle = Vector3(angle_x, angle_y, angle_z);
-}
 
 void 
@@ -61 +39 @@
 {
     //fprintf(stderr, "camera: %d, %d\n", width, height);
-    glViewport(startX, startY, width, height);
+    glViewport(startX_, startY_, width_, height_);
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    gluPerspective(30, (GLdouble)(width - startX)/(GLdouble)(height - startY), 
-        0.1, 50.0);
+    gluPerspective(30, 
+                   (GLdouble)(width_ - startX_)/(GLdouble)(height_ - startY_), 
+                   0.1, 50.0);
 
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
 
-    gluLookAt(location.x, location.y, location.z,
-              target.x, target.y, target.z,
+    gluLookAt(location_.x, location_.y, location_.z,
+              target_.x, target_.y, target_.z,
               0., 1., 0.);
 
-    glRotated(angle.x, 1., 0., 0.);
-    glRotated(angle.y, 0., 1., 0.);
-    glRotated(angle.z, 0., 0., 1.);
+    glRotated(angle_.x, 1., 0., 0.);
+    glRotated(angle_.y, 0., 1., 0.);
+    glRotated(angle_.z, 0., 0., 1.);
 }
 
-void 
-NvCamera::set_screen_size(int sx, int sy, int w, int h)
-{
-    width = w, height = h;
-    startX = sx, startY = sy;
-}

trunk/packages/vizservers/nanovis/NvCamera.h

@@ -22 +22 @@
 class NvCamera {
 
-public:
-    Vector3 location;           //Location of the camera in the scene
-    Vector3 target;             //Location the camera is looking at.  
+    Vector3 location_;          //Location of the camera in the scene
+    Vector3 target_;            //Location the camera is looking at.  
                                 //location and target: two points define the
                                 //line-of-sight
-    Vector3 angle;              //rotation angles of camera along x, y, z
-    int width;                  //screen size
-    int height;                 //screen size
-    int startX;
-    int startY;
+    Vector3 angle_;             //rotation angles of camera along x, y, z
+    int width_;                 //screen width
+    int height_;                //screen height
+    int startX_;
+    int startY_;
 
-    ~NvCamera();
+public:
+    ~NvCamera(void) {
+        /*empty*/
+    }    
     NvCamera(int startx, int starty, int w, int h,
-             double loc_x, double loc_y, double loc_z, 
-             double target_x, double target_y, double target_z,
-             int angle_x, int angle_y, int angle_z);
-    void move(double loc_x, double loc_y, double loc_z); //move location of camera
-    void aim(double target_x, double target_y, double target_z); //change target point
-    void rotate(double angle_x, double angle_y, double angle_z); //change target point
-    void activate(); //make the camera setting active, this has to be called
-                     //before drawing things.
-    void set_screen_size(int startx, int starty, int w, int h);
+             float loc_x, float loc_y, float loc_z, 
+             float target_x, float target_y, float target_z,
+             float angle_x, float angle_y, float angle_z);
+
+    //move location of camera
+    void x(double loc_x) {
+        location_.x = loc_x;
+    }
+    float x(void) {
+        return location_.x;
+    }
+    void y(double loc_y) {
+        location_.y = loc_y;
+    }
+    float y(void) {
+        return location_.y;
+    }
+    void z(double loc_z) {
+        location_.z = loc_z;
+    }
+    float z(void) {
+        return location_.z;
+    }
+
+    void aim(double target_x, double target_y, double target_z) {
+        target_ = Vector3(target_x, target_y, target_z);
+    }
+    Vector3 aim(void) { 
+        return target_;
+    }
+    void rotate(double angle_x, double angle_y, double angle_z) { 
+        angle_ = Vector3(angle_x, angle_y, angle_z);
+    }
+    void rotate(Vector3 angle) { 
+        angle_ = angle;
+    }
+    Vector3 rotate(void) { 
+        return angle_;
+    }
+    void set_screen_size(int sx, int sy, int w, int h) {
+        width_ = w, height_ = h;
+        startX_ = sx, startY_ = sy;
+    }
+    void activate(void); //make the camera setting active, this has to be
+                         //called before drawing things.
 };
 

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -171 +171 @@
 
 // Object rotation angles
-static float live_rot_x = 90.;
-static float live_rot_y = 180.;
-static float live_rot_z = -135;
+const float def_rot_x = 90.;
+const float def_rot_y = 180.;
+const float def_rot_z = -135;
 
 // Object translation location from the origin
-static float live_obj_x = -0.0;
-static float live_obj_y = -0.0;
-static float live_obj_z = -2.5;
+const float def_obj_x = -0.0;
+const float def_obj_y = -0.0;
+const float def_obj_z = -2.5;
 
 
@@ -507 +507 @@
     }
     return tf;
-}
-
-void
-NanoVis::zoom(double zoom)
-{
-    live_obj_z = -2.5 / zoom;
-    cam->move(live_obj_x, live_obj_y, live_obj_z);
 }
 
@@ -884 +877 @@
    //create the camera with default setting
    cam = new NvCamera(0, 0, win_width, win_height,
-                   live_obj_x, live_obj_y, live_obj_z,
-                   0., 0., 100.,
-                   (int)live_rot_x, (int)live_rot_y, (int)live_rot_z);
+                      def_obj_x, def_obj_y, def_obj_z,
+                      0., 0., 100.,
+                      def_rot_x, def_rot_y, def_rot_z);
 
    glEnable(GL_TEXTURE_2D);
@@ -1336 +1329 @@
         float y = vert[3*i+1];
         float z = vert[3*i+2];
-
-        float dis = (x-live_obj_x)*(x-live_obj_x) + (y-live_obj_y)*(y-live_obj_y) + (z-live_obj_z)*(z-live_obj_z);
+        float dx, dy, dz;
+        dx = x - cam->x();
+        dy = y - cam->y();
+        dz = z - cam->z();
+        float dis = (dx * dx) + (dy * dy) + (dz * dz);
         p[i].x = x;
         p[i].y = y;
@@ -1929 +1925 @@
 NanoVis::update_rot(int delta_x, int delta_y)
 {
-    live_rot_x += delta_x;
-    live_rot_y += delta_y;
-
-    if (live_rot_x > 360.0) {
-        live_rot_x -= 360.0;
-    } else if(live_rot_x < -360.0) {
-        live_rot_x += 360.0;
-    }
-    if (live_rot_y > 360.0) {
-        live_rot_y -= 360.0;
-    } else if(live_rot_y < -360.0) {
-        live_rot_y += 360.0;
-    }
-    cam->rotate(live_rot_x, live_rot_y, live_rot_z);
+    Vector3 angle;
+
+    angle = cam->rotate();
+    angle.x += delta.x;
+    angle.y += delta.y;
+
+    if (angle.x > 360.0) {
+        angle.x -= 360.0;
+    } else if(angle.x < -360.0) {
+        angle.x += 360.0;
+    }
+    if (angle.y > 360.0) {
+        angle.y -= 360.0;
+    } else if(angle.y < -360.0) {
+        angle.y += 360.0;
+    }
+    cam->rotate(angle);
 }
 
@@ -1948 +1947 @@
 NanoVis::update_trans(int delta_x, int delta_y, int delta_z)
 {
-    live_obj_x += delta_x*0.03;
-    live_obj_y += delta_y*0.03;
-    live_obj_z += delta_z*0.03;
+    cam->x(cam->x() + delta_x * 0.03);
+    cam->y(cam->y() + delta_y * 0.03);
+    cam->z(cam->z() + delta_z * 0.03);
 }
 
@@ -1988 +1987 @@
        break;
    case 'w': //zoom out
-       live_obj_z-=0.05;
+       cam->z(cam->z() - 0.05);
        log = true;
-       cam->move(live_obj_x, live_obj_y, live_obj_z);
        break;
    case 's': //zoom in
-       live_obj_z+=0.05;
+       cam->z(cam->z() + 0.05);
        log = true;
-       cam->move(live_obj_x, live_obj_y, live_obj_z);
        break;
    case 'a': //left
-       live_obj_x-=0.05;
+       cam->x(cam->x() - 0.05);
        log = true;
-       cam->move(live_obj_x, live_obj_y, live_obj_z);
        break;
    case 'd': //right
-       live_obj_x+=0.05;
+       cam->x(cam->x() + 0.05);
        log = true;
-       cam->move(live_obj_x, live_obj_y, live_obj_z);
        break;
    case 'i':
@@ -2027 +2022 @@
 #ifdef EVENTLOG
    if(log){
-       float param[3] = {live_obj_x, live_obj_y, live_obj_z};
+       float param[3];
+       param[0] = cam->x();
+       param[1] = cam->y();
+       param[2] = cam->z();
        Event* tmp = new Event(EVENT_MOVE, param, NvGetTimeInterval());
        tmp->write(event_log);
@@ -2070 +2068 @@
 
 #ifdef EVENTLOG
-    float param[3] = {live_rot_x, live_rot_y, live_rot_z};
-    Event* tmp = new Event(EVENT_ROTATE, param, NvGetTimeInterval());
+    Vector3 angle = cam->rotate();
+    Event* tmp = new Event(EVENT_ROTATE, &angle, NvGetTimeInterval());
     tmp->write(event_log);
     delete tmp;

trunk/packages/vizservers/nanovis/nanovis.h

@@ -163 +163 @@
     static void update(void);
     static void display_offscreen_buffer();
-    static void zoom(double zoom);
     static int render_legend(TransferFunction *tf, double min, double max, 
         int width, int height, const char* volArg);

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -1087 +1087 @@
 {
     double factor = 0.0;
-    double zmove = 0.0;
     PymolProxy *proxyPtr = clientData;
     int defer = 0, push = 0, arg, varg = 1;
@@ -1103 +1102 @@
         }
     }
-    zmove = factor * -75;
- 
     proxyPtr->need_update = !defer || push;
     proxyPtr->immediate_update  |= push;
     proxyPtr->invalidate_cache = 1;
-
-    if (zmove != 0.0)
-        Send(proxyPtr,"move z, %f\n", factor);
-
+    if (factor != 0.0) {
+        Send(proxyPtr,"move z,%f\n", factor);
+    }
+    return proxyPtr->status;
+}
+
+static int
+PanCmd(ClientData clientData, Tcl_Interp *interp, int argc, 
+        const char *argv[])
+{
+    PymolProxy *proxyPtr = clientData;
+    double x, y;
+    int i;
+    int defer, push;
+
+    clear_error(proxyPtr);
+    defer = push = FALSE;
+    for (i = 1; i < argc; i++) {
+        if (strcmp(argv[i],"-defer") == 0) {
+            defer = 1;
+        } else if (strcmp(argv[i],"-push") == 0) {
+            push = 1;
+        } else { 
+            break;
+        }
+    }
+    if ((Tcl_GetDouble(interp, argv[i], &x) != TCL_OK) ||
+        (Tcl_GetDouble(interp, argv[i+1], &y) != TCL_OK)) {
+        return TCL_ERROR;
+    }
+    proxyPtr->need_update = !defer || push;
+    proxyPtr->immediate_update  |= push;
+    proxyPtr->invalidate_cache = 1;
+    if (x != 0.0) {
+        Send(proxyPtr,"move x,%f\n", x * 0.005);
+    }   
+    if (y != 0.0) {
+        Send(proxyPtr,"move y,%f\n", -y * 0.005);
+    }   
     return proxyPtr->status;
 }
@@ -1326 +1358 @@
     Tcl_CreateCommand(interp, "disable", DisableCmd,    &proxy, NULL);
     Tcl_CreateCommand(interp, "enable",  EnableCmd,     &proxy, NULL);
+    Tcl_CreateCommand(interp, "pan",     PanCmd,        &proxy, NULL);
 
     // Main Proxy Loop
@@ -1355 +1388 @@
         if (!proxy.immediate_update) {
             status = poll(ufd, 3, timeout);
-            trace("result of poll = %d: %s", status, strerror(errno));
         }
         if ( status < 0 ) {
@@ -1405 +1437 @@
                 if (nRead <= 0) {
                     /* It's possible to have already drained the channel in
-                     * response to a client command (handled above). Skip
+                     * response to a client command handled above. Skip
                      * it if we're blocking. */
                     if ((errno == EAGAIN) || (errno == EINTR)) {