A patch from Frederic Bouvier to correct a naming problem caused bu Curts work. This...

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 0e505de5f9d05bbf6cb9595faff059ee4bead355..2c45c322b26fbccf13321a93a6511d4edaa5e74a 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -40,7 +40,7 @@ SG_USING_STD(map);
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sgstream.hxx>
-#include <simgear/scene/model/loader.hxx>
+#include <simgear/scene/model/modellib.hxx>
 
 #include "mat.hxx"
 

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index 98697f0ef8f3fa22c00fde8393fccabb026536e3..fea29c55807634c892f2dd0eb598f903f6965edd 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -38,7 +38,7 @@
 #include <plib/ssg.h>
 
 #include <simgear/props/props.hxx>
-#include <simgear/scene/model/loader.hxx>
+#include <simgear/scene/model/modellib.hxx>
 
 #include "matmodel.hxx"
 

diff --git a/simgear/scene/material/matmodel.cxx b/simgear/scene/material/matmodel.cxx
index 24f8c8637b1690e0539beee1e8127fdbc79ec346..6bc8f6b45e34709e58eab0e6f2265e42bfa88b41 100644 (file)
--- a/simgear/scene/material/matmodel.cxx
+++ b/simgear/scene/material/matmodel.cxx
@@ -40,7 +40,7 @@ SG_USING_STD(map);
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sgstream.hxx>
-#include <simgear/scene/model/loader.hxx>
+#include <simgear/scene/model/modellib.hxx>
 
 #include "matmodel.hxx"
 
@@ -117,7 +117,7 @@ SGMatModel::~SGMatModel ()
 }
 
 int
-SGMatModel::get_model_count( SGModelLoader *loader,
+SGMatModel::get_model_count( SGModelLib *loader,
                                    const string &fg_root,
                                    SGPropertyNode *prop_root,
                                    double sim_time_sec )
@@ -127,7 +127,7 @@ SGMatModel::get_model_count( SGModelLoader *loader,
 }
 
 inline void
-SGMatModel::load_models ( SGModelLoader *loader,
+SGMatModel::load_models ( SGModelLib *loader,
                                 const string &fg_root,
                                 SGPropertyNode *prop_root,
                                 double sim_time_sec )
@@ -164,7 +164,7 @@ SGMatModel::load_models ( SGModelLoader *loader,
 
 ssgEntity *
 SGMatModel::get_model( int index,
-                               SGModelLoader *loader,
+                               SGModelLib *loader,
                                const string &fg_root,
                                SGPropertyNode *prop_root,
                                double sim_time_sec )
@@ -174,7 +174,7 @@ SGMatModel::get_model( int index,
 }
 
 ssgEntity *
-SGMatModel::get_random_model( SGModelLoader *loader,
+SGMatModel::get_random_model( SGModelLib *loader,
                                       const string &fg_root,
                                       SGPropertyNode *prop_root,
                                       double sim_time_sec )

diff --git a/simgear/scene/material/matmodel.hxx b/simgear/scene/material/matmodel.hxx
index 33d769e8b476baa46315d245577ddd80fe87236b..a192259687147a2ce45693f63d02a4f11e8d3479 100644 (file)
--- a/simgear/scene/material/matmodel.hxx
+++ b/simgear/scene/material/matmodel.hxx
@@ -36,7 +36,7 @@
 #include <plib/ssg.h>
 
 #include <simgear/props/props.hxx>
-#include <simgear/scene/model/loader.hxx>
+#include <simgear/scene/model/modellib.hxx>
 
 SG_USING_STD(string);
 
@@ -71,7 +71,7 @@ public:
      *
      * @return The number of variant models.
      */
-    int get_model_count( SGModelLoader *loader,
+    int get_model_count( SGModelLib *loader,
                          const string &fg_root,
                          SGPropertyNode *prop_root,
                          double sim_time_sec );
@@ -84,7 +84,7 @@ public:
      * @return The model.
      */
     ssgEntity *get_model( int index,
-                          SGModelLoader *loader,
+                          SGModelLib *loader,
                           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( SGModelLoader *loader,
+    ssgEntity *get_random_model( SGModelLib *loader,
                                  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( SGModelLoader *loader,
+    void load_models( SGModelLib *loader,
                       const string &fg_root,
                       SGPropertyNode *prop_root,
                       double sim_time_sec );