Make return type from loadPagedModel explicit.

[simgear.git] / simgear / scene / model / modellib.hxx

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index 61091085f057900063b796ea3af929ed1153583e..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
@@ -46,6 +50,8 @@ public:
 
     static void init(const std::string &root_dir, SGPropertyNode* root);
 
+    static void resetPropertyRoot();
+    
     static void setPanelFunc(panel_func pf);
     
     // Load a 3D model (any format)
@@ -55,17 +61,23 @@ public:
                                 SGModelData *data=0, bool load2DPanels=false);
 
     // Load a 3D model (any format) through the DatabasePager.
-    // Most models should be loaded using this function!
-    // This function will initially return an SGPagedLOD node.
-    // data->modelLoaded() will be called after the model is loaded and
-    // connected to the scene graph. See AIModelData on how to use this.
-    // NOTE: AIModelData uses observer_ptr to avoid circular references.
-    static osg::Node* loadPagedModel(const std::string &path,
+    // This function initially just returns a proxy node that refers to
+    // the model file. Once the viewer steps onto that node the
+    // model will be loaded.
+    static osg::Node* loadDeferredModel(const std::string &path,
+                                        SGPropertyNode *prop_root = NULL,
+                                        SGModelData *data=0);
+    // Load a 3D model (any format) through the DatabasePager.
+    // This function initially just returns a PagedLOD node that refers to
+    // 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::PagedLOD* loadPagedModel(const std::string &path,
                                      SGPropertyNode *prop_root = NULL,
                                      SGModelData *data=0);
 
     static std::string findDataFile(const std::string& file, 
-      const osgDB::ReaderWriter::Options* opts = NULL,
+      const osgDB::Options* opts = NULL,
       SGPath currentDir = SGPath()); 
 protected:
     SGModelLib();
@@ -87,6 +99,7 @@ public:
     virtual ~SGModelData() {}
     virtual void modelLoaded(const std::string& path, SGPropertyNode *prop,
                              osg::Node* branch) = 0;
+    virtual SGModelData* clone() const = 0;
 };
 
 }