Memory leak fixes from Till Busch

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

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 44a12ff7c679d944d88e73b436b4d3a35828ba8a..1407e44f5b3680a6745564b9cdc39435c0ea3dec 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -25,9 +25,9 @@
 #define _MATLIB_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 #include <simgear/compiler.h>
 
@@ -37,8 +37,8 @@
 #include <map>                 // STL associative "array"
 #include <vector>              // STL "array"
 
-#include <plib/ssg.h>          // plib include
-
+#include <osg/Node>
+#include <osg/StateSet>
 
 class SGMaterial;
 
@@ -47,14 +47,13 @@ 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;
 
@@ -71,22 +70,19 @@ public:
     // 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(); }
 
+    const SGMaterial* findMaterial(const osg::StateSet* stateSet) const;
+
     // Destructor
     ~SGMaterialLib ( void );
 };