Changeset 4315 for trunk/packages/vizservers

Timestamp:

Apr 2, 2014, 12:27:36 AM (10 years ago)

Author:

ldelgass

Message:

Add command to set explicit camera distance

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (2 diffs)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -984 +984 @@
 void Renderer::zoomCamera(double z)
 {
-    TRACE("Enter: z: %g", z);
+    TRACE("Enter: z: %g camDist: %g", z, _manipulator->getDistance());
 
     if (_manipulator.valid()) {
@@ -992 +992 @@
         double dist = _manipulator->getDistance();
         dist *= (1.0 + z);
+        _manipulator->setDistance(dist);
+
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Dolly camera to set distance from focal point
+ *
+ * \param[in] dist distance in map? coordinates
+ */
+void Renderer::setCameraDistance(double dist)
+{
+    TRACE("Enter: dist: %g camDist: %g", dist, _manipulator->getDistance());
+
+    if (_manipulator.valid()) {
         _manipulator->setDistance(dist);
 

trunk/packages/vizservers/geovis/Renderer.h

@@ -319 +319 @@
     void zoomCamera(double z);
 
+    void setCameraDistance(double dist);
+
     // Keyboard events
 

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -329 +329 @@
 
 static int
+CameraSetDistanceOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    double dist;
+
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &dist) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->setCameraDistance(dist);
+    return TCL_OK;
+}
+
+static int
 CameraZoomOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-            Tcl_Obj *const *objv)
+             Tcl_Obj *const *objv)
 {
     double z;
@@ -343 +357 @@
 
 static CmdSpec cameraOps[] = {
+    {"dist",    1, CameraSetDistanceOp,      3, 3, "dist"},
     {"get",     1, CameraGetViewpointOp,     2, 2, ""},
     {"orient",  1, CameraOrientOp,           6, 6, "qw qx qy qz"},