Improved tile cache priority scheme.

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

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index 7e093db3f714994f64ffe9a608fe4d7b0562e9c0..63358855b31a07a7f4a1893421713f91fa1aa92e 100644 (file)
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -44,21 +44,17 @@ class SGModelLib
 public:
     typedef osg::Node *(*panel_func)(SGPropertyNode *);
 
-    typedef SGPath (*resolve_func)(const std::string& path);
-
     static void init(const std::string &root_dir);
 
     static void setPropRoot(SGPropertyNode* root);
     
     static void setPanelFunc(panel_func pf);
     
-    static void setResolveFunc(resolve_func rf);
-
     // Load a 3D model (any format)
     // data->modelLoaded() will be called after the model is loaded
     static osg::Node* loadModel(const std::string &path,
                                 SGPropertyNode *prop_root = NULL,
-                                SGModelData *data=0);
+                                SGModelData *data=0, bool load2DPanels=false);
 
     // Load a 3D model (any format) through the DatabasePager.
     // Most models should be loaded using this function!
@@ -70,7 +66,9 @@ public:
                                      SGPropertyNode *prop_root = NULL,
                                      SGModelData *data=0);
 
-    static std::string findDataFile(const std::string& file, const osgDB::ReaderWriter::Options* opts = NULL); 
+    static std::string findDataFile(const std::string& file, 
+      const osgDB::ReaderWriter::Options* opts = NULL,
+      SGPath currentDir = SGPath()); 
 protected:
     SGModelLib();
     ~SGModelLib ();
@@ -78,7 +76,6 @@ protected:
 private:
   static SGPropertyNode_ptr static_propRoot;
   static panel_func static_panelFunc;
-  static resolve_func static_resolver;
 };