Random buildings - initial commit.

[simgear.git] / simgear / scene / material / matlib.hxx

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 14a0a8d10bd04364729ca4cc0b33a7bd3e1d62fe..7d52e5c133539857f4fa491c0ec4130b49c9d69a 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -33,19 +33,24 @@
 
 #include <simgear/structure/SGSharedPtr.hxx>
 
-#include STL_STRING            // Standard C++ string library
+#include <string>              // Standard C++ string library
 #include <map>                 // STL associative "array"
 #include <vector>              // STL "array"
 
-#include <osg/Node>
-#include <osg/StateSet>
+#include <osg/Geode>
 
 class SGMaterial;
+class SGPropertyNode;
 
-SG_USING_STD(string);
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(less);
+using std::string;
+using std::map;
+using std::vector;
+using std::less;
+
+namespace simgear
+{
+class Effect;
+}
 
 // Material management class
 class SGMaterialLib {
@@ -53,7 +58,9 @@ class SGMaterialLib {
 private:
 
     // associative array of materials
-    typedef map < string, SGSharedPtr<SGMaterial>, less<string> > material_map;
+    typedef std::vector< SGSharedPtr<SGMaterial> > material_list;    
+    typedef material_list::iterator material_list_iterator;
+    typedef map < string,  material_list> material_map;
     typedef material_map::iterator material_map_iterator;
     typedef material_map::const_iterator const_material_map_iterator;
 
@@ -65,28 +72,18 @@ public:
     SGMaterialLib ( void );
 
     // Load a library of material properties
-    bool load( const string &fg_root, const string& mpath, const char *season );
-
-    // Add the named texture with default properties
-    bool add_item( const string &tex_path );
-    bool add_item( const string &mat_name, const string &tex_path );
-    bool add_item( const string &mat_name, osg::StateSet *state );
-
+    bool load( const string &fg_root, const string& mpath,
+            SGPropertyNode *prop_root );
     // find a material record by material name
     SGMaterial *find( const string& material );
 
-    /**
-     * Load the next deferred texture, if there is any.
-     */
-    void load_next_deferred();
-
     material_map_iterator begin() { return matlib.begin(); }
     const_material_map_iterator begin() const { return matlib.begin(); }
 
     material_map_iterator end() { return matlib.end(); }
     const_material_map_iterator end() const { return matlib.end(); }
 
-    const SGMaterial* findMaterial(const osg::Node* leaf) const;
+    static const SGMaterial *findMaterial(const osg::Geode* geode);
 
     // Destructor
     ~SGMaterialLib ( void );