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 ad9ef450aa7a0cc443c4a29ad04692a617f3b5b9..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"
@@ -63,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;
 
@@ -86,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(); }