Changeset 4312 for trunk

Timestamp:

Apr 1, 2014 7:22:56 PM (10 years ago)

Author:

ldelgass

Message:

Add protocol to save/restore named camera viewpoints

Location:

trunk/packages/vizservers/geovis

Files:

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

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -569 +569 @@
 }
 
+void Renderer::saveNamedViewpoint(const char *name)
+{
+    _viewpoints[name] = getViewpoint();
+}
+
+bool Renderer::restoreNamedViewpoint(const char *name, double durationSecs)
+{
+    ViewpointHashmap::iterator itr = _viewpoints.find(name);
+    if (itr != _viewpoints.end()) {
+        setViewpoint(itr->second, durationSecs);
+        return true;
+    } else {
+        ERROR("Unknown viewpoint: '%s'", name);
+        return false;
+    }
+}
+
 void Renderer::setViewpoint(const osgEarth::Viewpoint& v, double durationSecs)
 {

trunk/packages/vizservers/geovis/Renderer.h

@@ -149 +149 @@
 public:
     typedef std::string ColorMapId;
+    typedef std::string ViewpointId;
 
     enum GraticuleType {
@@ -300 +301 @@
     // Camera
 
+    void saveNamedViewpoint(const char *name);
+
+    bool restoreNamedViewpoint(const char *name, double durationSecs);
+
     osgEarth::Viewpoint getViewpoint();
 
@@ -357 +362 @@
 private:
     typedef std::tr1::unordered_map<ColorMapId, osg::ref_ptr<osg::TransferFunction1D> > ColorMapHashmap;
+    typedef std::tr1::unordered_map<ViewpointId, osgEarth::Viewpoint> ViewpointHashmap;
 
     void initViewer();
@@ -399 +405 @@
     osg::ref_ptr<osgGA::StateSetManipulator> _stateManip;
     osg::ref_ptr<osgEarth::Util::VerticalScale> _verticalScale;
+    ViewpointHashmap _viewpoints;
 };
 

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -209 +209 @@
 
 static int
+CameraSaveViewpointOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    char *name = Tcl_GetString(objv[2]);
+
+    g_renderer->saveNamedViewpoint(name);
+    return TCL_OK;
+}
+
+static int
+CameraRestoreViewpointOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                         Tcl_Obj *const *objv)
+{
+    char *name = Tcl_GetString(objv[2]);
+
+    double duration = 0.0;
+    if (objc > 3) {
+        if (Tcl_GetDoubleFromObj(interp, objv[3], &duration) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
+    if (!g_renderer->restoreNamedViewpoint(name, duration)) {
+        Tcl_AppendResult(interp, "camera viewpoint \"", name,
+                         "\" not found", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
 CameraThrowOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -237 +267 @@
 
 static CmdSpec cameraOps[] = {
-    {"orient", 1, CameraOrientOp, 6, 6, "qw qx qy qz"},
-    {"pan",    1, CameraPanOp, 4, 4, "panX panY"},
-    {"reset",  2, CameraResetOp, 2, 3, "?all?"},
-    {"rotate", 2, CameraRotateOp, 4, 4, "azimuth elevation"},
-    {"throw",  1, CameraThrowOp, 3, 3, "bool"},
-    {"zoom",   1, CameraZoomOp, 3, 3, "zoomAmount"}
+    {"orient",  1, CameraOrientOp,           6, 6, "qw qx qy qz"},
+    {"pan",     1, CameraPanOp,              4, 4, "panX panY"},
+    {"reset",   4, CameraResetOp,            2, 3, "?all?"},
+    {"restore", 4, CameraRestoreViewpointOp, 3, 4, "name ?duration?"},
+    {"rotate",  2, CameraRotateOp,           4, 4, "azimuth elevation"},
+    {"save",    1, CameraSaveViewpointOp,    3, 3, "name"},
+    {"throw",   1, CameraThrowOp,            3, 3, "bool"},
+    {"zoom",    1, CameraZoomOp,             3, 3, "zoomAmount"}
 };
 static int nCameraOps = NumCmdSpecs(cameraOps);