Changeset 6273 for geovis

Timestamp:

Apr 19, 2016 9:05:15 AM (8 years ago)

Author:

ldelgass

Message:

Fix placard to work with osgearth trunk refactor (Decluttering -> ScreenSpaceLayout?)

Location:

geovis/trunk

Files:

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

geovis/trunk/Placard.cpp

@@ -14 +14 @@
 #include <osgEarth/Registry>
 #include <osgEarth/ShaderGenerator>
+#ifdef NEW_ANNOTATION_API
+#include <osgEarth/ScreenSpaceLayout>
+#else
 #include <osgEarth/Decluttering>
+#endif
 #include <osgEarthSymbology/PolygonSymbol>
 #include <osgEarthSymbology/TextSymbol>
@@ -151 +155 @@
 {
 #ifdef NEW_ANNOTATION_API
-    osgEarth::Decluttering::setEnabled(this->getOrCreateStateSet(), false);
+    osgEarth::ScreenSpaceLayout::activate(this->getOrCreateStateSet());
 #endif
     _backdropGeode = new osg::Geode();
@@ -263 +267 @@
         osgEarth::Registry::stateSetCache() );
 #ifdef NEW_ANNOTATION_API
-    updateLayoutData();
+    // Set to max priority to draw on top in decluttering sort
+    setPriority(FLT_MAX);
+    // setPriority calls updateLayoutData
+    //updateLayoutData();
 #endif
 }
@@ -281 +288 @@
         return;
 
-    osg::ref_ptr<osgEarth::LayoutData> data = new osgEarth::LayoutData();
-    data->_priority = getPriority();
+    if (!_dataLayout.valid())
+    {
+        _dataLayout = new osgEarth::ScreenSpaceLayoutData();
+    }
+
+    // re-apply annotation drawable-level stuff as neccesary.
+    for (unsigned i = 0; i < _backdropGeode->getNumDrawables(); ++i)
+    {
+        _backdropGeode->getDrawable(i)->setUserData(_dataLayout.get());
+    }
+    // re-apply annotation drawable-level stuff as neccesary.
+    for (unsigned i = 0; i < _geode->getNumDrawables(); ++i)
+    {
+        _geode->getDrawable(i)->setUserData(_dataLayout.get());
+    }
+
+    _dataLayout->setPriority(getPriority());
     const osgEarth::Symbology::TextSymbol *ts = getStyle().get<osgEarth::Symbology::TextSymbol>();
-    if (ts) data->_pixelOffset = ts->pixelOffset().get();
-
-    // re-apply annotation drawable-level stuff as neccesary.
-    for (unsigned i = 0; i<_backdropGeode->getNumDrawables(); ++i)
-    {
-        _backdropGeode->getDrawable(i)->setUserData(data.get());
-    }
-    // re-apply annotation drawable-level stuff as neccesary.
-    for (unsigned i = 0; i<_geode->getNumDrawables(); ++i)
-    {
-        _geode->getDrawable(i)->setUserData(data.get());
+    if (ts)
+    {
+        _dataLayout->setPixelOffset(ts->pixelOffset().get());
     }
 }

geovis/trunk/Placard.h

@@ -195 +195 @@
     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/trunk/Renderer.cpp

@@ -1732 +1732 @@
     PlacardNode *label = 
         new PlacardNode(_mapNode.get(), location, placard, attrs);
+#ifndef NEW_ANNOTATION_API
     label->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "RenderBin");
+#endif
     getAnnotations()->addChild(label);
 }