add support for the max visible range to the simple pager

Author: gwaldron

src/osgEarth/ImGui/ImGui

@@ -403,6 +403,16 @@ namespace ImGuiLTable
         return ImGui::ColorEdit4(label, col, flags);
     }
 
+    static void PlotLines(const char* label, float(*getter)(void*, int), void* data, int values_count, int values_offset, const char* overlay = nullptr,
+        float scale_min = FLT_MAX, float scale_max = FLT_MAX)
+    {
+        ImGui::TableNextColumn();
+        ImGui::Text(label);
+        ImGui::TableNextColumn();
+        ImGui::SetNextItemWidth(-1);
+        ImGui::PlotLines("", getter, data, values_count, values_offset, overlay, scale_min, scale_max);
+    }
+
     static void End()
     {
         ImGui::EndTable();

src/osgEarth/NodeUtils

@@ -192,6 +192,30 @@ namespace osgEarth { namespace Util
         std::vector<T*> _results;
     };
 
+    template<typename T, typename FUNC>
+    struct NodeFunctorVisitor : public osg::NodeVisitor
+    {
+        NodeFunctorVisitor(FUNC& func) : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN), _func(func) { }
+
+        void apply(osg::Node& node) override
+        {
+            T* result = dynamic_cast<T*>( &node );
+            if ( result )
+                _func( result );
+            traverse(node);
+        }
+
+        FUNC _func;
+    };  
+
+    template<typename T, typename FUNC>
+    inline void forEachNodeOfType(osg::Node* root, FUNC& functor)
+    {
+        NodeFunctorVisitor<T, FUNC> visitor(functor);
+        if (root)
+            root->accept( visitor );
+    }
+
     /**
      * Searchs the scene graph downward starting at [node] and returns the first node found
      * that matches the template parameter type.

src/osgEarth/SimplePager

@@ -59,6 +59,9 @@ namespace osgEarth { namespace Util
         float getRangeFactor() const { return _rangeFactor; }
         void setRangeFactor(float value) { _rangeFactor = value; }
 
+        float getMaxRange() const { return _maxRange; }
+        void setMaxRange(float value);
+
         float getPriorityScale() const { return _priorityScale; }
         void setPriorityScale(float value) { _priorityScale = value; }
 
@@ -120,6 +123,7 @@ namespace osgEarth { namespace Util
 
         bool _additive;
         double _rangeFactor;
+        float _maxRange = FLT_MAX;
         unsigned int _minLevel;
         unsigned int _maxLevel;
         osg::ref_ptr<const Profile> _profile;

src/osgEarth/SimplePager.cpp

@@ -6,6 +6,7 @@
 #include <osgEarth/PagedNode>
 #include <osgEarth/ElevationLayer>
 #include <osgEarth/ElevationRanges>
+#include <osgEarth/NodeUtils>
 #include <osgDB/Registry>
 #include <osgDB/FileNameUtils>
 #include <osg/ShapeDrawable>
@@ -52,6 +53,16 @@ bool SimplePager::getEnableCancelation() const
     return _canCancel;
 }
 
+void SimplePager::setMaxRange(float value)
+{
+    _maxRange = value;
+
+    forEachNodeOfType<PagedNode2>(this, [&](PagedNode2* node)
+    {
+        node->setMaxRange(value);
+    });
+}
+
 void SimplePager::setDone()
 {
     _done = true;
@@ -232,11 +243,13 @@ SimplePager::createPagedNode(const TileKey& key, ProgressCallback* progress)
                 return result;
             }
         );
+
         loadRange = (float)(tileRadius * _rangeFactor);
+
         pagedNode->setRefinePolicy(_additive ? REFINE_ADD : REFINE_REPLACE);
     }
 
-    pagedNode->setMaxRange(loadRange);
+    pagedNode->setMaxRange(std::min(loadRange, _maxRange));
 
     //OE_INFO << "PagedNode2: key="<<key.str()<<" hasChildren=" << hasChildren << ", range=" << loadRange << std::endl;
 

src/osgEarth/VisibleLayer.cpp

@@ -19,7 +19,9 @@
 #include "VisibleLayer"
 #include "VirtualProgram"
 #include "Utils"
+#include "NodeUtils"
 #include "ShaderLoader"
+#include "SimplePager"
 
 #include <osg/BlendFunc>
 #include <osgUtil/RenderBin>
@@ -442,7 +444,14 @@ VisibleLayer::setMaxVisibleRange( float maxVisibleRange )
         (float)options().minVisibleRange().get(),
         (float)options().maxVisibleRange().get(),
         (float)options().attenuationRange().get()));
-    fireCallback( &VisibleLayerCallback::onVisibleRangeChanged );
+
+    forEachNodeOfType<SimplePager>(getNode(), 
+        [&](SimplePager* node) {
+            node->setMaxRange(maxVisibleRange);
+        }
+    );
+
+    fireCallback(&VisibleLayerCallback::onVisibleRangeChanged);
 }
 
 float

src/osgEarth/XYZModelLayer.cpp

@@ -113,7 +113,7 @@ void XYZModelLayer::setProfile(const Profile* profile)
 void
 XYZModelLayer::init()
 {
-    TiledModelLayer::init();
+    super::init();
 
     _root = new osg::Group();
 
@@ -151,7 +151,7 @@ XYZModelLayer::getNode() const
 Status
 XYZModelLayer::openImplementation()
 {
-    Status parent = TiledModelLayer::openImplementation();
+    Status parent = super::openImplementation();
     if (parent.isError())
         return parent;
 
@@ -171,7 +171,7 @@ void
 XYZModelLayer::addedToMap(const Map* map)
 {
     OE_TEST << LC << "addedToMap" << std::endl;
-    TiledModelLayer::addedToMap(map);
+    super::addedToMap(map);
 
     _map = map;
 
@@ -184,7 +184,7 @@ XYZModelLayer::addedToMap(const Map* map)
 void
 XYZModelLayer::removedFromMap(const Map* map)
 {
-    TiledModelLayer::removedFromMap(map);
+    super::removedFromMap(map);
 
     if (_root.valid())
     {