Some small fixes

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

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index 084f736ff54cb5db2dc29868a5580ac87ddcdc7f..22cbe5346e98791b399a963231235f4ca541aa48 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -39,7 +39,6 @@
 #include <plib/ssg.h>
 
 #include <simgear/props/props.hxx>
-#include <simgear/math/sg_random.h>
 
 #include "matmodel.hxx"
 
@@ -118,7 +117,7 @@ public:
   /**
    * Get the textured state.
    */
-  virtual ssgSimpleState *get_state (int n = -1) const;
+  virtual ssgSimpleState *get_state (int n = -1);
 
 
   /**
@@ -199,11 +198,13 @@ protected:
 
 protected:
 
-  typedef struct {
+  struct _internal_state {
+     _internal_state( ssgSimpleState *s, const string &t, bool l )
+                  : state(s), texture_path(t), texture_loaded(l) {}
       ssgSimpleState *state;
       string texture_path;
       bool texture_loaded;
-  } _internal_state;
+  };
 
 private:
 
@@ -215,6 +216,9 @@ private:
   // texture status
   vector<_internal_state> _status;
 
+  // Round-robin counter
+  int _current_ptr;
+
   // texture size
   double xsize, ysize;