#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"
#include "newmat.hxx"
-FG_USING_STD(string);
-FG_USING_STD(map);
-FG_USING_STD(vector);
-FG_USING_STD(less);
+SG_USING_STD(string);
+SG_USING_STD(map);
+SG_USING_STD(vector);
+SG_USING_STD(less);
// Material management class
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;
void set_step (int step);
+ // Load one pending "deferred" texture. Return true if a texture
+ // loaded successfully, false if no pending, or error.
+ void load_next_deferred();
+
material_map_iterator begin() { return matlib.begin(); }
const_material_map_iterator begin() const { return matlib.begin(); }