Replaced some debugging structure David inadvertantly removed.

[flightgear.git] / src / Objects / matlib.hxx

diff --git a/src/Objects/matlib.hxx b/src/Objects/matlib.hxx
index b97e64388ba21d665e1fd1e1bc830008a75cb123..ee1f65017cda6e46921d5506e1560f48f8142c60 100644 (file)
--- a/src/Objects/matlib.hxx
+++ b/src/Objects/matlib.hxx
@@ -40,7 +40,7 @@
 #include <simgear/compiler.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include STL_STRING            // Standard C++ string library
 #include <map>                 // STL associative "array"
@@ -51,44 +51,10 @@
 #include "newmat.hxx"
 
 
-FG_USING_STD(string);
-FG_USING_STD(map);
-FG_USING_STD(vector);
-FG_USING_STD(less);
-
-
-#if 0
-// Material property class
-class FGMaterialSlotold {
-
-private:
-
-    FGMaterial m;
-
-    // ssg stage structure
-    ssgStateSelector *state;
-    bool state_valid;
-
-public:
-
-    // Constructor
-    FGMaterialSlotold ( void );
-
-    // Destructor
-    ~FGMaterialSlotold ( void );
-
-    // friend istream& operator >> ( istream& in, FGMaterialSlot& m );
-
-    inline FGMaterial get_m() const { return m; }
-    inline void set_m( FGMaterial new_m ) { m = new_m; }
-
-    // ssg state
-    inline ssgStateSelector *get_state() { return state; }
-    inline void set_state( ssgStateSelector *s ) { state = s; }
-    inline bool get_state_valid() const { return state_valid; }
-    inline void set_state_valid( bool flag ) { state_valid = flag; }
-};
-#endif
+SG_USING_STD(string);
+SG_USING_STD(map);
+SG_USING_STD(vector);
+SG_USING_STD(less);
 
 
 // Material management class
@@ -97,7 +63,7 @@ class FGMaterialLib {
 private:
 
     // associative array of materials
-    typedef map < string, FGNewMat, less<string> > material_map;
+    typedef map < string, FGNewMat *, less<string> > material_map;
     typedef material_map::iterator material_map_iterator;
     typedef material_map::const_iterator const_material_map_iterator;
 
@@ -120,6 +86,12 @@ public:
     FGNewMat *find( const string& material );
 
     void set_step (int step);
+    int get_step ();
+
+    /**
+     * 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(); }