Make return type from loadPagedModel explicit.

- explicitly return osg::PagedLOD instead of Node, so callers
don't need to rely on documentation + cast to get the LOD
settings on the result.

diff --git a/simgear/scene/model/modellib.cxx b/simgear/scene/model/modellib.cxx
index 8a55151090905f6eab95996d73406eed93c3da69..efbcd1361b2fb7af5f32fb308cfb742c2a7b0349 100644 (file)
--- a/simgear/scene/model/modellib.cxx
+++ b/simgear/scene/model/modellib.cxx
@@ -152,7 +152,7 @@ SGModelLib::loadDeferredModel(const string &path, SGPropertyNode *prop_root,
     return proxyNode;
 }
 
-osg::Node*
+osg::PagedLOD*
 SGModelLib::loadPagedModel(const string &path, SGPropertyNode *prop_root,
                            SGModelData *data)
 {

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index 7e8a5a8ed56ba675ad3c8d6c0ad0fa6a4065d3d7..cdd6d820440a50f6c337d0c04f79f4b45b42b5fe 100644 (file)
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -32,6 +32,10 @@
 #include <simgear/props/props.hxx>
 #include <simgear/misc/sg_path.hxx>
 
+namespace osg {
+    class PagedLOD;
+}
+
 namespace simgear {
 
 class SGModelData; // defined below
@@ -68,7 +72,7 @@ public:
     // the model file. Once the viewer steps onto that node the
     // model will be loaded. When the viewer does no longer reference this
     // node for a long time the node is unloaded again.
-    static osg::Node* loadPagedModel(const std::string &path,
+    static osg::PagedLOD* loadPagedModel(const std::string &path,
                                      SGPropertyNode *prop_root = NULL,
                                      SGModelData *data=0);