Changeset 6570

Timestamp:

Nov 6, 2016 12:00:27 AM (7 years ago)

Author:

ldelgass

Message:

First pass at porting to new Map layer API

Location:

geovis/branches/rex

Files:

• Makefile.in (modified) (3 diffs)
• MouseCoordsTool.h (modified) (1 diff)
• Picker.cpp (modified) (2 diffs)
• Placard.cpp (modified) (9 diffs)
• Placard.h (modified) (6 diffs)
• Renderer.cpp (modified) (39 diffs)
• Renderer.h (modified) (9 diffs)
• RendererCmd.cpp (modified) (5 diffs)

geovis/branches/rex/Makefile.in

@@ -3 +3 @@
 TRACE                   = #yes
 TRACE_FRAME             = #yes
-NEW_ANNOTATION_API      = #yes
 USE_OFFSCREEN_RENDERING = #yes
 USE_THREADS             = yes
@@ -11 +10 @@
 SLEEP_AFTER_QUEUE_FRAME = yes
 QUEUE_ONLY_ONE_FRAME    = yes
-USE_REX                 = #yes
+USE_REX                 = yes
 
 bindir          = @bindir@
@@ -99 +98 @@
 ifdef TRACE_FRAME
 DEFINES         += -DWANT_FRAME
-endif
-ifdef NEW_ANNOTATION_API
-DEFINES         += -DNEW_ANNOTATION_API
 endif
 ifdef USE_OFFSCREEN_RENDERING

geovis/branches/rex/MouseCoordsTool.h

@@ -42 +42 @@
         TRACE("%g %g %g", mapCoords.x(), mapCoords.y(), mapCoords.z());
         if (_label.valid()) {
-            if (mapNode->getMap()->getNumElevationLayers() > 0) {
-                _label->setText(osgEarth::Stringify()
-                                << _prefix
-                                <<  _formatter->format(mapCoords)
-                                << "\nElev: " << mapCoords.z() << " m");
-            } else {
-                _label->setText(osgEarth::Stringify()
-                                << _prefix
-                                <<  _formatter->format(mapCoords));
-            }
+            _label->setText(osgEarth::Stringify()
+                            << _prefix
+                            <<  _formatter->format(mapCoords)
+                            << "\nElev: " << mapCoords.z() << " m");
         }
         _pt = mapCoords;

geovis/branches/rex/Picker.cpp

@@ -164 +164 @@
          itr != toUnHover.end(); ++itr) {
         hovered.erase(*itr);
-#ifndef NEW_ANNOTATION_API
-        (*itr)->clearDecoration();
-#endif
         _renderer->eventuallyRender();
     }
@@ -285 +282 @@
             osgEarth::Registry::objectIndex()->get<osgEarth::Annotation::AnnotationNode>(id);
         std::set<osgEarth::Annotation::AnnotationNode*>& hovered = _renderer->getHovered();
-#ifndef NEW_ANNOTATION_API
-        anno->clearDecoration();
-#endif
         _renderer->getPlaceNodes()->removeChild(anno);
         if (hovered.find(anno) != hovered.end()) {

geovis/branches/rex/Placard.cpp

@@ -14 +14 @@
 #include <osgEarth/Registry>
 #include <osgEarth/ShaderGenerator>
-#ifdef NEW_ANNOTATION_API
 #include <osgEarth/ScreenSpaceLayout>
 #include <osgEarthSymbology/BBoxSymbol>
-#else
-#include <osgEarth/Decluttering>
-#endif
 #include <osgEarthSymbology/PolygonSymbol>
 #include <osgEarthSymbology/TextSymbol>
@@ -45 +41 @@
     _padding = (float)(charSize / 2.0);
 
-#ifdef NEW_ANNOTATION_API
     osgEarth::Symbology::BBoxSymbol *bbs = _textStyle.getOrCreateSymbol<osgEarth::Symbology::BBoxSymbol>();
     bbs->fill() = osgEarth::Symbology::Color(0.75, 0.75, 0.75, 0.75);
     bbs->margin() = _padding;
-#else
-    // Set backdrop quad color as PolygonSymbol fill
-    osgEarth::Symbology::PolygonSymbol *ps = _textStyle.getOrCreateSymbol<osgEarth::Symbology::PolygonSymbol>();
-    ps->fill() = osgEarth::Symbology::Color(0.75, 0.75, 0.75, 0.75);
-#endif
 }
 
@@ -108 +98 @@
                          const Placard& placardConf,
                          const osgEarth::Features::AttributeTable &attrs) :
-#ifdef NEW_ANNOTATION_API
     osgEarth::Annotation::GeoPositionNode(mapNode, position),
-#else
-    osgEarth::Annotation::OrthoNode(mapNode, position),
-#endif
     _placardConf(placardConf),
     _attrs(attrs)
@@ -160 +146 @@
 PlacardNode::init( const osgEarth::Symbology::Style& style )
 {
-#ifdef NEW_ANNOTATION_API
     osgEarth::ScreenSpaceLayout::activate(this->getOrCreateStateSet());
-#endif
     _backdropGeode = new osg::Geode();
     _backdropGeode->setComputeBoundingSphereCallback(new osgEarth::Annotation::ControlPointCallback());
-#ifdef NEW_ANNOTATION_API
     getPositionAttitudeTransform()->addChild( _backdropGeode.get() );
-#else
-    getAttachPoint()->addChild(_backdropGeode.get());
-#endif
+
     osg::StateSet* stateSet = _backdropGeode->getOrCreateStateSet();
     stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );
@@ -179 +160 @@
     _geode->setComputeBoundingSphereCallback(new osgEarth::Annotation::ControlPointCallback());
 
-#ifdef NEW_ANNOTATION_API
     getPositionAttitudeTransform()->addChild( _geode.get() );
-#else
-    getAttachPoint()->addChild( _geode.get() );
-#endif
     stateSet = _geode->getOrCreateStateSet();
     stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );
@@ -235 +212 @@
         return;
     }
-#ifndef NEW_ANNOTATION_API
-    this->clearDecoration();
-#endif
     _backdropGeode->removeDrawables( 0, _backdropGeode->getNumDrawables() );
 
@@ -272 +246 @@
         "osgEarth.PlacardNode",
         osgEarth::Registry::stateSetCache() );
-#ifdef NEW_ANNOTATION_API
+
     // Set to max priority to draw on top in decluttering sort
     setPriority(FLT_MAX);
     // setPriority calls updateLayoutData
     //updateLayoutData();
-#endif
-}
-
-#ifdef NEW_ANNOTATION_API
+}
+
 void
 PlacardNode::setPriority(float value)
@@ -317 +289 @@
     }
 }
-#else
-void
-PlacardNode::setAnnotationData( osgEarth::Annotation::AnnotationData* data )
-{
-    osgEarth::Annotation::OrthoNode::setAnnotationData( data );
-
-    if (!_geode.valid())
-        return;
-
-    // override this method so we can attach the anno data to the drawables.
-    for(unsigned i=0; i<_geode->getNumDrawables(); ++i)
-    {
-        _geode->getDrawable(i)->setUserData( data );
-    }
-}
-#endif
 
 void
 PlacardNode::setDynamic( bool dynamic )
 {
-#ifdef NEW_ANNOTATION_API
     osgEarth::Annotation::GeoPositionNode::setDynamic( dynamic );
-#else
-    osgEarth::Annotation::OrthoNode::setDynamic( dynamic );
-#endif
+
     osgText::Text* d = dynamic_cast<osgText::Text*>(_geode->getDrawable(0));
     if ( d )
@@ -356 +309 @@
 PlacardNode::getConfig() const
 {
-#ifdef NEW_ANNOTATION_API
     osgEarth::Config conf = osgEarth::Annotation::GeoPositionNode::getConfig();
-#else
-    osgEarth::Config conf = osgEarth::Annotation::OrthoNode::getConfig();
-#endif
+
     conf.key() = "placard";
 

geovis/branches/rex/Placard.h

@@ -13 +13 @@
 #include <algorithm>
 
-#ifdef NEW_ANNOTATION_API
 #include <osgEarth/ScreenSpaceLayout>
 #include <osgEarthAnnotation/GeoPositionNode>
-#else
-#include <osgEarthAnnotation/Decoration>
-#include <osgEarthAnnotation/OrthoNode>
-#endif
 #include <osgEarthAnnotation/LabelNode>
 #include <osgEarthFeatures/Feature>
@@ -93 +88 @@
 public:
     META_Node(osgEarthAnnotation, PlacardLabelNode);
-#ifndef NEW_ANNOTATION_API
-    virtual bool accept(osgEarth::Annotation::Decoration* ds, bool enable)
-    { return ds->apply(*this, enable); }
-#endif
+
     PlacardLabelNode() :
         osgEarth::Annotation::LabelNode()
@@ -121 +113 @@
 
 class PlacardNode :
-#ifdef NEW_ANNOTATION_API
 public osgEarth::Annotation::GeoPositionNode
-#else
-public osgEarth::Annotation::OrthoNode
-#endif
 {
 public:
     META_Node(osgEarthAnnotation, PlacardNode);
-#ifndef NEW_ANNOTATION_API
-    virtual bool accept(osgEarth::Annotation::Decoration* ds, bool enable)
-    { return ds->apply(*this, enable); }
-#endif
+
     PlacardNode() :
-#ifdef NEW_ANNOTATION_API
         osgEarth::Annotation::GeoPositionNode()
-#else
-        osgEarth::Annotation::OrthoNode()
-#endif
     {}
     PlacardNode(const PlacardNode& other, const osg::CopyOp& op = osg::CopyOp::DEEP_COPY_ALL) :
-#ifdef NEW_ANNOTATION_API
         osgEarth::Annotation::GeoPositionNode(other, op),
-#else
-        osgEarth::Annotation::OrthoNode(other, op),
-#endif
         _placardConf(other._placardConf)
     {
@@ -177 +154 @@
 
 public: // Ortho|GeoPositionNode override
-#ifdef NEW_ANNOTATION_API
     virtual void setPriority(float value);
-#else
-    virtual void setAnnotationData( osgEarth::Annotation::AnnotationData* data );
-#endif
+
     virtual void setDynamic( bool value );
 
@@ -188 +162 @@
 protected:
     void init(const osgEarth::Symbology::Style& style);
-#ifdef NEW_ANNOTATION_API
+
     void updateLayoutData();
-#endif
 
     std::string                _text;
@@ -196 +169 @@
     osg::ref_ptr<osg::Geode>   _geode;
     osg::ref_ptr<osg::Geode>   _backdropGeode;
-#ifdef NEW_ANNOTATION_API
     osg::ref_ptr<osgEarth::ScreenSpaceLayoutData> _dataLayout;
-#endif
 
     Placard _placardConf;

geovis/branches/rex/Renderer.cpp

@@ -67 +67 @@
 #include <osgEarthSymbology/IconSymbol>
 #include <osgEarthSymbology/LineSymbol>
-
 #include <osgEarthAnnotation/AnnotationNode>
 #include <osgEarthAnnotation/FeatureNode>
 #include <osgEarthAnnotation/PlaceNode>
-#ifdef NEW_ANNOTATION_API
 #include <osgEarth/ScreenSpaceLayout>
-#else
-#include <osgEarth/Decluttering>
-#include <osgEarthAnnotation/HighlightDecoration>
-#include <osgEarthAnnotation/ScaleDecoration>
-#endif
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/Sky>
@@ -1321 +1314 @@
 }
 
+void Renderer::setLayerOpacity(const char *name, double opacity)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return;
+    }
+    osgEarth::Layer *layer = _map->getLayerByName(name);
+    osgEarth::ImageLayer *ilayer = dynamic_cast<osgEarth::ImageLayer *>(layer);
+    if (ilayer != NULL) {
+        ilayer->setOpacity(opacity);
+        _needsRedraw = true;
+        return;
+    }
+    osgEarth::ModelLayer *mlayer = dynamic_cast<osgEarth::ModelLayer *>(layer);
+    if (mlayer != NULL) {
+        mlayer->setOpacity(opacity);
+        _needsRedraw = true;
+        return;
+    }
+    TRACE("Image layer not found: %s", name);
+}
+
+void Renderer::setLayerVisibility(const char *name, bool state)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return;
+    }
+    osgEarth::Layer *layer = _map->getLayerByName(name);
+    osgEarth::TerrainLayer *tlayer = dynamic_cast<osgEarth::TerrainLayer *>(layer);
+    if (tlayer != NULL) {
+        tlayer->setVisible(state);
+        _needsRedraw = true;
+        return;
+    }
+    osgEarth::ModelLayer *mlayer = dynamic_cast<osgEarth::ModelLayer *>(layer);
+    if (mlayer != NULL) {
+        mlayer->setVisible(state);
+        _needsRedraw = true;
+        return;
+    }
+    TRACE("Layer not found: %s", name);
+}
+
+void Renderer::moveLayer(const char *name, unsigned int pos)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return;
+    }
+    osgEarth::Layer *layer = _map->getLayerByName(name);
+    if (layer != NULL) {
+        _map->moveLayer(layer, pos);
+        _needsRedraw = true;
+    } else {
+        TRACE("Layer not found: %s", name);
+    }
+}
+
+void Renderer::removeLayer(const char *name)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return;
+    }
+    osgEarth::Layer *layer = _map->getLayerByName(name);
+    if (layer != NULL) {
+        _map->removeLayer(layer);
+        _needsRedraw = true;
+    } else {
+        TRACE("Layer not found: %s", name);
+    }
+}
+
 bool Renderer::addImageLayer(const char *name,
                              osgEarth::TileSourceOptions& opts,
@@ -1356 +1423 @@
     layerOpts.maxLevel() = maxLOD;
     osg::ref_ptr<osgEarth::ImageLayer> layer = new osgEarth::ImageLayer(layerOpts);
-    if (pos < (unsigned int)_map->getNumImageLayers()) {
+    if (pos < (unsigned int)getNumImageLayers()) {
         _map->insertImageLayer(layer.get(), pos);
     } else {
@@ -1377 +1444 @@
         return;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer == NULL) {
         TRACE("Image layer not found: %s", name);
@@ -1395 +1462 @@
         return;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer == NULL) {
         TRACE("Image layer not found: %s", name);
@@ -1416 +1483 @@
         return;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
-        _map->removeImageLayer(layer);
+        _map->removeLayer(layer);
         _needsRedraw = true;
     } else {
@@ -1431 +1498 @@
         return;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         _map->moveImageLayer(layer, pos);
@@ -1446 +1513 @@
         return;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         layer->setOpacity(opacity);
@@ -1461 +1528 @@
         return;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         layer->setMinVisibleRange(min);
@@ -1477 +1544 @@
         return;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = _map->getLayerByName<osgEarth::ImageLayer>(name);
     if (layer != NULL) {
         layer->setVisible(state);
@@ -1492 +1559 @@
         return false;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         osgEarth::SequenceControl *seq = layer->getSequenceControl();
@@ -1511 +1578 @@
         return false;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         osgEarth::SequenceControl *seq = layer->getSequenceControl();
@@ -1532 +1599 @@
         return false;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         osgEarth::SequenceControl *seq = layer->getSequenceControl();
@@ -1553 +1620 @@
         return false;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         osgEarth::SequenceControl *seq = layer->getSequenceControl();
@@ -1601 +1668 @@
     _map->addElevationLayer(layer);
     // Map API lacks an insertElevationLayer method, so need to move it
-    if (pos < (unsigned int)_map->getNumElevationLayers()) {
+    if (pos < (unsigned int)getNumElevationLayers()) {
         _map->moveElevationLayer(layer, pos);
     }
@@ -1613 +1680 @@
         return;
     }
-    osgEarth::ElevationLayer *layer = _map->getElevationLayerByName(name);
+    osgEarth::ElevationLayer *layer = getElevationLayerByName(name);
     if (layer != NULL) {
-        _map->removeElevationLayer(layer);
+        _map->removeLayer(layer);
         _needsRedraw = true;
     } else {
@@ -1628 +1695 @@
         return;
     }
-    osgEarth::ElevationLayer *layer = _map->getElevationLayerByName(name);
+    osgEarth::ElevationLayer *layer = getElevationLayerByName(name);
     if (layer != NULL) {
         _map->moveElevationLayer(layer, pos);
@@ -1643 +1710 @@
         return;
     }
-    osgEarth::ElevationLayer *layer = _map->getElevationLayerByName(name);
+    osgEarth::ElevationLayer *layer = getElevationLayerByName(name);
     if (layer != NULL) {
         layer->setVisible(state);
@@ -1676 +1743 @@
     osgEarth::MaskLayer *layer = getTerrainMaskLayerByName(name);
     if (layer != NULL) {
-        _map->removeTerrainMaskLayer(layer);
+        _map->removeLayer(layer);
         _needsRedraw = true;
     } else {
@@ -1691 +1758 @@
         _placeNodes = new osg::Group();
         _placeNodes->setName("Place Nodes");
-#ifdef NEW_ANNOTATION_API
         osgEarth::ScreenSpaceLayout::activate(_placeNodes->getOrCreateStateSet());
-#else
-        osgEarth::Decluttering::setEnabled(_placeNodes->getOrCreateStateSet(), true);
-#endif
         _annotations->addChild(_placeNodes.get());
         if (_picker.valid()) {
@@ -1735 +1798 @@
 void Renderer::enablePlacard(const char *layerName, bool state)
 {
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(layerName);
+    osgEarth::ModelLayer *layer = getModelLayerByName(layerName);
     if (layer == NULL) {
         ERROR("Unknown layer '%s'", layerName);
@@ -1745 +1808 @@
 void Renderer::setPlacardConfig(const Placard& placardConf, const char *layerName)
 {
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(layerName);
+    osgEarth::ModelLayer *layer = getModelLayerByName(layerName);
     if (layer == NULL) {
         ERROR("Unknown layer '%s'", layerName);
@@ -1785 +1848 @@
         return;
     }
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(layerName);
+    osgEarth::ModelLayer *layer = getModelLayerByName(layerName);
     if (layer == NULL) {
         ERROR("Unknown layer '%s'", layerName);
@@ -1815 +1878 @@
         for (size_t i = 0; i < visitor.nodes.size(); i++) {
             osgEarth::Features::FeatureIndex *index = visitor.nodes[i]->getIndex();
-#if OSGEARTH_MIN_VERSION_REQUIRED(3, 0, 0)
             osgEarth::ObjectID id = index->getObjectID(fid);
             if (doPlacard) {
@@ -1833 +1895 @@
             setHighlightByObjectID(id);
             TRACE("FID %lu = OID %d", fid, id);
-#endif
         }
         _needsRedraw = true;
@@ -1876 +1937 @@
     PlacardNode *label = 
         new PlacardNode(_mapNode.get(), location, placard, attrs);
-#ifndef NEW_ANNOTATION_API
-    label->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "RenderBin");
-#endif
     getAnnotations()->addChild(label);
 }
@@ -1904 +1962 @@
         osg::Node *node = nodes->getChild(i);
         // This can be Placard, PlacardLabel, Label, Place or Track Node
-#ifdef NEW_ANNOTATION_API
         if (dynamic_cast<osgEarth::Annotation::GeoPositionNode *>(node) != NULL) {
-#else
-        if (dynamic_cast<osgEarth::Annotation::OrthoNode *>(node) != NULL) {
-#endif
             toRemove.push_back(node);
         }
@@ -1978 +2032 @@
     (*geom)[3] = osg::Vec3d(longMin, latMax, 0);
     node->init();
-#ifndef NEW_ANNOTATION_API
-    for (std::set<osgEarth::Annotation::AnnotationNode *>::iterator itr = _selected.begin();
-         itr != _selected.end(); ++itr) {
-        (*itr)->clearDecoration();
-    }
-#endif
     _selected.clear();
     SelectPlaceNodesVisitor spnv(this, latMin, latMax, longMin, longMax);
@@ -2033 +2081 @@
                      pt.x(), pt.y(), placeNode->getName().c_str(),
                      placeNode->getText().c_str());
-#ifndef NEW_ANNOTATION_API
-                placeNode->setDecoration("select");
-#endif
             }
         }
@@ -2048 +2093 @@
         _selectionBox = NULL;
     }
-#ifndef NEW_ANNOTATION_API
-    for (std::set<osgEarth::Annotation::AnnotationNode *>::iterator itr = _selected.begin();
-         itr != _selected.end(); ++itr) {
-        (*itr)->clearDecoration();
-    }
-#endif
     _selected.clear();
     _needsRedraw = true;
@@ -2357 +2396 @@
     }
     osgEarth::ModelLayer *layer = new osgEarth::ModelLayer(layerOpts);
-    if (pos < (unsigned int)_map->getNumModelLayers()) {
+    if (pos < (unsigned int)getNumModelLayers()) {
         _map->insertModelLayer(layer, pos);
     } else {
@@ -2371 +2410 @@
         return;
     }
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
+    osgEarth::ModelLayer *layer = getModelLayerByName(name);
     if (layer != NULL) {
-        _map->removeModelLayer(layer);
+        _map->removeLayer(layer);
         _needsRedraw = true;
     } else {
@@ -2386 +2425 @@
         return;
     }
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
+    osgEarth::ModelLayer *layer = getModelLayerByName(name);
     if (layer != NULL) {
         _map->moveModelLayer(layer, pos);
@@ -2401 +2440 @@
         return;
     }
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
+    osgEarth::ModelLayer *layer = getModelLayerByName(name);
     if (layer != NULL) {
         layer->setOpacity(opacity);
@@ -2416 +2455 @@
         return;
     }
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
+    osgEarth::ModelLayer *layer = getModelLayerByName(name);
     if (layer != NULL) {
         layer->minVisibleRange(min);
@@ -2432 +2471 @@
         return;
     }
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
+    osgEarth::ModelLayer *layer = getModelLayerByName(name);
     if (layer != NULL) {
         layer->setVisible(state);
@@ -2633 +2672 @@
         return false;
     }
-    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    osgEarth::ImageLayer *layer = getImageLayerByName(name);
     if (layer != NULL) {
         osgEarth::TileSource *ts = layer->getTileSource();
@@ -2658 +2697 @@
         return false;
     }
-    osgEarth::ElevationLayer *layer = _map->getElevationLayerByName(name);
+    osgEarth::ElevationLayer *layer = getElevationLayerByName(name);
     if (layer != NULL) {
         osgEarth::TileSource *ts = layer->getTileSource();
@@ -2715 +2754 @@
         return false;
     }
-    osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
+    osgEarth::ModelLayer *layer = getModelLayerByName(name);
     if (layer != NULL) {
         osgEarth::ModelSource *ms = layer->getModelSource();

geovis/branches/rex/Renderer.h

@@ -244 +244 @@
     void setSkyAmbient(float ambientLevel);
 
+    // Generic layer API
+
+    void setLayerVisibility(const char *name, bool state);
+
+    void setLayerOpacity(const char *name, double opacity);
+
+    void removeLayer(const char *name);
+
+    void moveLayer(const char *name, unsigned int pos);
+
     // Image raster layers
-
     int getNumImageLayers() const
     {
-        return (_map.valid() ? _map->getNumImageLayers() : 0);
+        if (!_map.valid()) return 0;
+
+        osgEarth::LayerVector layers;
+        _map->getLayers(layers);
+        int count = 0;
+        osgEarth::LayerVector::const_iterator itr;
+        for (itr = layers.begin(); itr != layers.end(); ++itr) {
+            if (dynamic_cast<const osgEarth::ImageLayer *>((*itr).get())) {
+                count++;
+            }
+        }
+        return count;
     }
 
@@ -254 +274 @@
     {
         if (_map.valid()) {
-            osgEarth::ImageLayerVector layerVector;
-            _map->getImageLayers(layerVector);
-            osgEarth::ImageLayerVector::const_iterator itr;
+            osgEarth::LayerVector layerVector;
+            _map->getLayers(layerVector);
+            osgEarth::LayerVector::const_iterator itr;
             for (itr = layerVector.begin(); itr != layerVector.end(); ++itr) {
-                //osgEarth::UID uid = (*itr)->getUID();
-                names.push_back((*itr)->getName());
+                if (dynamic_cast<const osgEarth::ImageLayer *>((*itr).get())) {
+                    //osgEarth::UID uid = (*itr)->getUID();
+                    names.push_back((*itr)->getName());
+                }
             }
         }
+    }
+
+    osgEarth::ImageLayer *getImageLayerByName(const std::string& name)
+    {
+        if (!_map.valid())
+            return NULL;
+
+        return _map->getLayerByName<osgEarth::ImageLayer>(name);
     }
 
@@ -306 +336 @@
     int getNumElevationLayers() const
     {
-        return (_map.valid() ? _map->getNumElevationLayers() : 0);
+        if (!_map.valid()) return 0;
+
+        osgEarth::LayerVector layers;
+        _map->getLayers(layers);
+        int count = 0;
+        osgEarth::LayerVector::const_iterator itr;
+        for (itr = layers.begin(); itr != layers.end(); ++itr) {
+            if (dynamic_cast<const osgEarth::ElevationLayer *>((*itr).get())) {
+                count++;
+            }
+        }
+        return count;
     }
 
@@ -312 +353 @@
     {
         if (_map.valid()) {
-            osgEarth::ElevationLayerVector layerVector;
-            _map->getElevationLayers(layerVector);
-            osgEarth::ElevationLayerVector::const_iterator itr;
+            osgEarth::LayerVector layerVector;
+            _map->getLayers(layerVector);
+            osgEarth::LayerVector::const_iterator itr;
             for (itr = layerVector.begin(); itr != layerVector.end(); ++itr) {
-                //osgEarth::UID uid = (*itr)->getUID();
-                names.push_back((*itr)->getName());
+                if (dynamic_cast<osgEarth::ElevationLayer *>((*itr).get())) {
+                    //osgEarth::UID uid = (*itr)->getUID();
+                    names.push_back((*itr)->getName());
+                }
             }
         }
+    }
+
+    osgEarth::ElevationLayer *getElevationLayerByName(const std::string& name)
+    {
+        if (!_map.valid())
+            return NULL;
+
+        return _map->getLayerByName<osgEarth::ElevationLayer>(name);
     }
 
@@ -347 +398 @@
         if (!_map.valid()) return 0;
 
-        osgEarth::MaskLayerVector layers;
-        _map->getTerrainMaskLayers(layers);
-        return (int)layers.size();
+        osgEarth::LayerVector layers;
+        _map->getLayers(layers);
+        int count = 0;
+        osgEarth::LayerVector::const_iterator itr;
+        for (itr = layers.begin(); itr != layers.end(); ++itr) {
+            if (dynamic_cast<const osgEarth::MaskLayer *>((*itr).get())) {
+                count++;
+            }
+        }
+        return count;
     }
 
@@ -355 +413 @@
     {
         if (_map.valid()) {
-            osgEarth::MaskLayerVector layerVector;
-            _map->getTerrainMaskLayers(layerVector);
-            osgEarth::MaskLayerVector::const_iterator itr;
+            osgEarth::LayerVector layerVector;
+            _map->getLayers(layerVector);
+            osgEarth::LayerVector::const_iterator itr;
             for (itr = layerVector.begin(); itr != layerVector.end(); ++itr) {
-                //osgEarth::UID uid = (*itr)->getUID();
-                names.push_back((*itr)->getName());
+                if (dynamic_cast<const osgEarth::MaskLayer *>((*itr).get())) {
+                    //osgEarth::UID uid = (*itr)->getUID();
+                    names.push_back((*itr)->getName());
+                }
             }
         }
@@ -370 +430 @@
             return NULL;
 
-        osgEarth::MaskLayerVector layerVector;
-        _map->getTerrainMaskLayers(layerVector);
-        osgEarth::MaskLayerVector::iterator itr;
-        for (itr = layerVector.begin(); itr != layerVector.end(); ++itr) {
-            if ((*itr)->getName() == name) {
-                return (*itr).get();
-            }
-        }
-        return NULL;
+        return _map->getLayerByName<osgEarth::MaskLayer>(name);
     }
 
@@ -390 +442 @@
 
     // Model layers
-
     int getNumModelLayers() const
     {
-        return (_map.valid() ? _map->getNumModelLayers() : 0);
+        if (!_map.valid()) return 0;
+
+        osgEarth::LayerVector layers;
+        _map->getLayers(layers);
+        int count = 0;
+        osgEarth::LayerVector::const_iterator itr;
+        for (itr = layers.begin(); itr != layers.end(); ++itr) {
+            if (dynamic_cast<const osgEarth::ModelLayer *>((*itr).get())) {
+                count++;
+            }
+        }
+        return count;
     }
 
@@ -399 +461 @@
     {
         if (_map.valid()) {
-            osgEarth::ModelLayerVector layerVector;
-            _map->getModelLayers(layerVector);
-            osgEarth::ModelLayerVector::const_iterator itr;
+            osgEarth::LayerVector layerVector;
+            _map->getLayers(layerVector);
+            osgEarth::LayerVector::const_iterator itr;
             for (itr = layerVector.begin(); itr != layerVector.end(); ++itr) {
-                //osgEarth::UID uid = (*itr)->getUID();
-                names.push_back((*itr)->getName());
+                if (dynamic_cast<const osgEarth::ModelLayer *>((*itr).get())) {
+                    //osgEarth::UID uid = (*itr)->getUID();
+                    names.push_back((*itr)->getName());
+                }
             }
         }
+    }
+
+    osgEarth::ModelLayer *getModelLayerByName(const std::string& name)
+    {
+        if (!_map.valid())
+            return NULL;
+
+        return _map->getLayerByName<osgEarth::ModelLayer>(name);
     }
 

geovis/branches/rex/RendererCmd.cpp

@@ -2740 +2740 @@
     if (objc > 3) {
         char *name = Tcl_GetString(objv[3]);
-        g_renderer->removeImageLayer(name);
-        g_renderer->removeElevationLayer(name);
-        g_renderer->removeTerrainMaskLayer(name);
-        g_renderer->removeModelLayer(name);
+        g_renderer->removeLayer(name);
     } else {
         g_renderer->clearMap();
@@ -2765 +2762 @@
         return TCL_ERROR;
     }
-    g_renderer->moveImageLayer(name, (unsigned int)pos);
-    g_renderer->moveElevationLayer(name, (unsigned int)pos);
-    g_renderer->moveModelLayer(name, (unsigned int)pos);
+    g_renderer->moveLayer(name, (unsigned int)pos);
 
     return TCL_OK;
@@ -2786 +2781 @@
         return TCL_ERROR;
     }
-    g_renderer->setImageLayerOpacity(name, opacity);
-    g_renderer->setModelLayerOpacity(name, opacity);
+    g_renderer->setLayerOpacity(name, opacity);
 
     return TCL_OK;
@@ -2856 +2850 @@
     if (objc > 4) {
         char *name = Tcl_GetString(objv[4]);
-        g_renderer->setImageLayerVisibility(name, visible);
-        g_renderer->setElevationLayerVisibility(name, visible);
-        g_renderer->setModelLayerVisibility(name, visible);
+        g_renderer->setLayerVisibility(name, visible);
     } else {
         std::vector<std::string> layers;
@@ -2866 +2858 @@
         for (std::vector<std::string>::iterator itr = layers.begin();
              itr != layers.end(); ++itr) {
-            g_renderer->setImageLayerVisibility(itr->c_str(), visible);
-            g_renderer->setElevationLayerVisibility(itr->c_str(), visible);
-            g_renderer->setModelLayerVisibility(itr->c_str(), visible);
+            g_renderer->setLayerVisibility(itr->c_str(), visible);
         }
     }