Use a round-robin scheme rather than returning a random textured state.

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

diff --git a/simgear/scene/material/matmodel.hxx b/simgear/scene/material/matmodel.hxx
index a192259687147a2ce45693f63d02a4f11e8d3479..a0fba3ada66ef7b365fa7fccad327e6e4d9001f7 100644 (file)
--- a/simgear/scene/material/matmodel.hxx
+++ b/simgear/scene/material/matmodel.hxx
@@ -36,12 +36,12 @@
 #include <plib/ssg.h>
 
 #include <simgear/props/props.hxx>
-#include <simgear/scene/model/modellib.hxx>
 
 SG_USING_STD(string);
 
 
 class SGMatModelGroup;
+class SGModelLib;
 
 
 /**
@@ -71,7 +71,7 @@ public:
      *
      * @return The number of variant models.
      */
-    int get_model_count( SGModelLib *loader,
+    int get_model_count( SGModelLib *modellib,
                          const string &fg_root,
                          SGPropertyNode *prop_root,
                          double sim_time_sec );
@@ -84,7 +84,7 @@ public:
      * @return The model.
      */
     ssgEntity *get_model( int index,
-                          SGModelLib *loader,
+                          SGModelLib *modellib,
                           const string &fg_root,
                           SGPropertyNode *prop_root,
                           double sim_time_sec );
@@ -95,7 +95,7 @@ public:
      *
      * @return A randomly select model from the variants.
      */
-    ssgEntity *get_random_model( SGModelLib *loader,
+    ssgEntity *get_random_model( SGModelLib *modellib,
                                  const string &fg_root,
                                  SGPropertyNode *prop_root,
                                  double sim_time_sec );
@@ -132,7 +132,7 @@ private:
      * This class uses lazy loading so that models won't be held
      * in memory for materials that are never referenced.
      */
-    void load_models( SGModelLib *loader,
+    void load_models( SGModelLib *modellib,
                       const string &fg_root,
                       SGPropertyNode *prop_root,
                       double sim_time_sec );