Changeset 4036 for trunk/packages

Timestamp:

Nov 6, 2013, 12:50:36 AM (11 years ago)

Author:

ldelgass

Message:

Add type parameter to layer add, first pass at feature layers.

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (12 diffs)
• Renderer.h (modified) (7 diffs)
• RendererCmd.cpp (modified) (7 diffs)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -26 +26 @@
 #include <osgEarth/ModelLayer>
 #include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/MouseCoordsTool>
 
@@ -128 +129 @@
     _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(mapNode);
     _mouseCoordsTool->addCallback(_coordsCallback.get());
+    if (_clipPlaneCullCallback.valid()) {
+        _viewer->getCamera()->removeCullCallback(_clipPlaneCullCallback.get());
+        _clipPlaneCullCallback = NULL;
+    }
+    if (_map->isGeocentric()) {
+        _clipPlaneCullCallback = new osgEarth::Util::AutoClipPlaneCullCallback(mapNode);
+        _viewer->getCamera()->addCullCallback(_clipPlaneCullCallback.get());
+    }
     _viewer->addEventHandler(_mouseCoordsTool.get());
     _viewer->setSceneData(_sceneRoot.get());
@@ -162 +171 @@
     _mouseCoordsTool->addCallback(_coordsCallback.get());
     _viewer->addEventHandler(_mouseCoordsTool.get());
+
+    if (_clipPlaneCullCallback.valid()) {
+        _viewer->getCamera()->removeCullCallback(_clipPlaneCullCallback.get());
+        _clipPlaneCullCallback = NULL;
+    }
+    if (_map->isGeocentric()) {
+        _clipPlaneCullCallback = new osgEarth::Util::AutoClipPlaneCullCallback(mapNode);
+        _viewer->getCamera()->addCullCallback(_clipPlaneCullCallback.get());
+    }
     _viewer->setSceneData(_sceneRoot.get());
     _manipulator = new osgEarth::Util::EarthManipulator;
@@ -172 +190 @@
 }
 
+void Renderer::clearMap()
+{
+    if (_map.valid()) {
+        _map->clear();
+    }
+}
+
 bool Renderer::mapMouseCoords(float mouseX, float mouseY, osgEarth::GeoPoint& map)
 {
@@ -191 +216 @@
 {
     osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
-    _map->removeImageLayer(layer);
+    if (layer != NULL) {
+        _map->removeImageLayer(layer);
+    }
 }
 
@@ -197 +224 @@
 {
     osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
-    _map->moveImageLayer(layer, pos);
+    if (layer != NULL) {
+        _map->moveImageLayer(layer, pos);
+    }
 }
 
@@ -203 +232 @@
 {
     osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
-    layer->setOpacity(opacity);
+    if (layer != NULL) {
+        layer->setOpacity(opacity);
+    }
 }
 
@@ -210 +241 @@
 #if OSGEARTH_MIN_VERSION_REQUIRED(2, 4, 0)
     osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
-    layer->setVisible(state);
+    if (layer != NULL) {
+        layer->setVisible(state);
+    }
 #endif
 }
@@ -223 +256 @@
 {
     osgEarth::ElevationLayer *layer = _map->getElevationLayerByName(name);
-    _map->removeElevationLayer(layer);
+    if (layer != NULL) {
+        _map->removeElevationLayer(layer);
+    }
 }
 
@@ -229 +264 @@
 {
     osgEarth::ElevationLayer *layer = _map->getElevationLayerByName(name);
-    _map->moveElevationLayer(layer, pos);
+    if (layer != NULL) {
+        _map->moveElevationLayer(layer, pos);
+    }
+}
+
+void Renderer::setElevationLayerVisibility(const char *name, bool state)
+{
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 4, 0)
+    osgEarth::ElevationLayer *layer = _map->getElevationLayerByName(name);
+    if (layer != NULL) {
+        layer->setVisible(state);
+    }
+#endif
 }
 
@@ -241 +288 @@
 {
     osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
-    _map->removeModelLayer(layer);
+    if (layer != NULL) {
+        _map->removeModelLayer(layer);
+    }
 }
 
@@ -247 +296 @@
 {
     osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
-    _map->moveModelLayer(layer, pos);
+    if (layer != NULL) {
+        _map->moveModelLayer(layer, pos);
+    }
+}
+
+void Renderer::setModelLayerVisibility(const char *name, bool state)
+{
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 4, 0)
+    osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
+    if (layer != NULL) {
+        layer->setVisible(state);
+    }
+#endif
 }
 

trunk/packages/vizservers/geovis/Renderer.h

@@ -28 +28 @@
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/MouseCoordsTool>
+#include <osgEarthUtil/AutoClipPlaneHandler>
 
 #include "Types.h"
@@ -134 +135 @@
     void resetMap(osgEarth::MapOptions::CoordinateSystemType type, const char *profile = NULL);
 
+    void clearMap();
+
     // Map options
 
@@ -140 +143 @@
     // Image raster layers
 
+    int getNumImageLayers() const
+    {
+        return (_map.valid() ? _map->getNumImageLayers() : 0);
+    }
+
     void addImageLayer(const char *name, const osgEarth::TileSourceOptions& opts);
 
@@ -152 +160 @@
     // Elevation raster layers
 
+    int getNumElevationLayers() const
+    {
+        return (_map.valid() ? _map->getNumElevationLayers() : 0);
+    }
+
     void addElevationLayer(const char *name, const osgEarth::TileSourceOptions& opts);
 
@@ -158 +171 @@
     void moveElevationLayer(const char *name, unsigned int pos);
 
+    void setElevationLayerVisibility(const char *name, bool state);
+
     // Model layers
 
+    int getNumModelLayers() const
+    {
+        return (_map.valid() ? _map->getNumModelLayers() : 0);
+    }
+
     void addModelLayer(const char *name, const osgEarth::ModelSourceOptions& opts);
 
@@ -165 +185 @@
 
     void moveModelLayer(const char *name, unsigned int pos);
+
+    void setModelLayerVisibility(const char *name, bool state);
 
     // Render window
@@ -252 +274 @@
     osg::ref_ptr<osgViewer::Viewer> _viewer;
     osg::ref_ptr<ScreenCaptureCallback> _captureCallback;
+    osg::ref_ptr<osgEarth::Util::AutoClipPlaneCullCallback> _clipPlaneCullCallback;
     osg::ref_ptr<osgEarth::Util::MouseCoordsTool> _mouseCoordsTool;
     osg::ref_ptr<MouseCoordsCallback> _coordsCallback;

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -19 +19 @@
 #include <tcl.h>
 
+#include <osgEarthFeatures/FeatureModelSource>
+#include <osgEarthSymbology/Color>
+#include <osgEarthSymbology/Style>
+#include <osgEarthSymbology/StyleSheet>
+#include <osgEarthSymbology/LineSymbol>
+
 #include <osgEarthDrivers/gdal/GDALOptions>
+#include <osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions>
+#include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
 
 #include "Trace.h"
@@ -381 +389 @@
               Tcl_Obj *const *objv)
 {
-    osgEarth::Drivers::GDALOptions opts;
-    char *url =  Tcl_GetString(objv[3]);
-    char *name = Tcl_GetString(objv[4]);
-
-    opts.url() = url;
-
-    g_renderer->addImageLayer(name, opts);
-
+    char *type = Tcl_GetString(objv[3]);
+    if (type[0] == 'i' && strcmp(type, "image") == 0) {
+        osgEarth::Drivers::GDALOptions opts;
+        char *url =  Tcl_GetString(objv[4]);
+        char *name = Tcl_GetString(objv[5]);
+
+        opts.url() = url;
+
+        g_renderer->addImageLayer(name, opts);
+    } else if (type[0] == 'e' && strcmp(type, "elevation") == 0) {
+        osgEarth::Drivers::GDALOptions opts;
+        char *url =  Tcl_GetString(objv[4]);
+        char *name = Tcl_GetString(objv[5]);
+
+        opts.url() = url;
+
+        g_renderer->addElevationLayer(name, opts);
+    } else if (type[0] == 'm' && strcmp(type, "model") == 0) {
+        osgEarth::Drivers::OGRFeatureOptions opts;
+        char *url =  Tcl_GetString(objv[4]);
+        char *name = Tcl_GetString(objv[5]);
+        opts.url() = url;
+
+        osgEarth::Symbology::Style style;
+        osgEarth::Symbology::LineSymbol *ls = style.getOrCreateSymbol<osgEarth::Symbology::LineSymbol>();
+        ls->stroke()->color() = osgEarth::Symbology::Color::Black;
+        ls->stroke()->width() = 2.0f;
+
+        osgEarth::Drivers::FeatureGeomModelOptions geomOpts;
+        geomOpts.featureOptions() = opts;
+        geomOpts.styles() = new osgEarth::Symbology::StyleSheet();
+        geomOpts.styles()->addStyle(style);
+        geomOpts.enableLighting() = false;
+        g_renderer->addModelLayer(name, geomOpts);
+    } else {
+        Tcl_AppendResult(interp, "unknown map layer type \"", type,
+                         "\": should be 'image', 'elevation' or 'model'", (char*)NULL);
+        return TCL_ERROR;
+    }
     return TCL_OK;
 }
@@ -399 +438 @@
         char *name = Tcl_GetString(objv[3]);
         g_renderer->removeImageLayer(name);
+        g_renderer->removeElevationLayer(name);
+        g_renderer->removeModelLayer(name);
     } else {
-        g_renderer->removeImageLayer("all");
+        g_renderer->clearMap();
     }
 
@@ -421 +462 @@
     }
     g_renderer->moveImageLayer(name, (unsigned int)pos);
+    g_renderer->moveElevationLayer(name, (unsigned int)pos);
+    g_renderer->moveModelLayer(name, (unsigned int)pos);
 
     return TCL_OK;
@@ -455 +498 @@
 
     g_renderer->setImageLayerVisibility(name, visible);
+    g_renderer->setElevationLayerVisibility(name, visible);
+    g_renderer->setModelLayerVisibility(name, visible);
 
     return TCL_OK;
@@ -460 +505 @@
 
 static Rappture::CmdSpec mapLayerOps[] = {
-    {"add",     1, MapLayerAddOp,       5, 5, "type url name"},
+    {"add",     1, MapLayerAddOp,       6, 6, "type url name"},
     {"delete",  1, MapLayerDeleteOp,    3, 4, "?name?"},
     {"move",    1, MapLayerMoveOp,      5, 5, "pos name"},
@@ -548 +593 @@
 
 static Rappture::CmdSpec mapOps[] = {
-    {"layer",    2, MapLayerOp,       3, 5, "op ?params...?"},
+    {"layer",    2, MapLayerOp,       3, 6, "op ?params...?"},
     {"load",     2, MapLoadOp,        4, 5, "options"},
     {"reset",    1, MapResetOp,       3, 4, "type ?profile?"},