FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make return type from loadPagedModel explicit.

Browse Source 
- 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.
This commit is contained in:
James Turner
2014-02-22 16:24:47 -08:00
parent b2cedc5332
commit 32a6bd78d8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/modellib.cxx
+1 -1
View File
@@ -152,7 +152,7 @@ SGModelLib::loadDeferredModel(const string &path, SGPropertyNode *prop_root,
return proxyNode; return proxyNode;
} }
osg::Node* osg::PagedLOD*
SGModelLib::loadPagedModel(const string &path, SGPropertyNode *prop_root, SGModelLib::loadPagedModel(const string &path, SGPropertyNode *prop_root,
SGModelData *data) SGModelData *data)
{ {
simgear/scene/model/modellib.hxx
+5 -1
View File
@@ -32,6 +32,10 @@
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
namespace osg {
class PagedLOD;
}
namespace simgear { namespace simgear {
class SGModelData; // defined below class SGModelData; // defined below
@@ -68,7 +72,7 @@ public:
// the model file. Once the viewer steps onto that node the // the model file. Once the viewer steps onto that node the
// model will be loaded. When the viewer does no longer reference this // model will be loaded. When the viewer does no longer reference this
// node for a long time the node is unloaded again. // 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, SGPropertyNode *prop_root = NULL,
SGModelData *data=0); SGModelData *data=0);