Reduce compiler.h to almost nothing (but it's worth keeping around I think, for

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

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 269a3fa2bf3116d51ba76c0ace74028f128455ed..9c96523b2460d03abcd2d518f3b1775edddd0c33 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -33,28 +33,28 @@
 
 #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 <plib/ssg.h>          // plib include
-
+#include <osg/Node>
+#include <osg/StateSet>
 
 class SGMaterial;
+class SGPropertyNode;
 
 SG_USING_STD(string);
 SG_USING_STD(map);
 SG_USING_STD(vector);
 SG_USING_STD(less);
 
-
 // Material management class
 class SGMaterialLib {
 
 private:
 
     // associative array of materials
-    typedef map < string, SGSharedPtr<SGMaterial>, less<string> > material_map;
+    typedef map < string, SGSharedPtr<SGMaterial> > material_map;
     typedef material_map::iterator material_map_iterator;
     typedef material_map::const_iterator const_material_map_iterator;
 
@@ -66,28 +66,24 @@ public:
     SGMaterialLib ( void );
 
     // Load a library of material properties
-    bool load( const string &fg_root, const string& mpath, const char *season );
+    bool load( const string &fg_root, const string& mpath, const char *season,
+            SGPropertyNode *prop_root );
 
     // 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, ssgSimpleState *state );
+    bool add_item( const string &mat_name, osg::StateSet *state );
 
     // 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(); }
 
-    bool find( ssgSimpleState*, string & material ) const;
+    const SGMaterial* findMaterial(const osg::StateSet* stateSet) const;
 
     // Destructor
     ~SGMaterialLib ( void );