Add support for seasons.

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 6bded1509c86b3a8b57ffd615d385aa35a33b017..0c493ce82800ea36babfe43e8d4186fffa1687bf 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -1,4 +1,4 @@
-// mat.cxx -- class to handle material properties
+// e mat.cxx -- class to handle material properties
 //
 // Written by Curtis Olson, started May 1998.
 //
@@ -27,6 +27,7 @@
 
 #include <simgear/compiler.h>
 
+#include <string.h>
 #include <map>
 SG_USING_STD(map);
 
@@ -48,10 +49,10 @@ SG_USING_STD(map);
 ////////////////////////////////////////////////////////////////////////
 
 
-SGMaterial::SGMaterial( const string &fg_root, const SGPropertyNode *props )
+SGMaterial::SGMaterial( const string &fg_root, const SGPropertyNode *props, const char *season )
 {
     init();
-    read_properties( fg_root, props );
+    read_properties( fg_root, props, season );
     build_ssg_state( false );
 }
 
@@ -86,13 +87,16 @@ SGMaterial::~SGMaterial (void)
 ////////////////////////////////////////////////////////////////////////
 
 void
-SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props )
+SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props, const char *season )
 {
                                // Gather the path(s) to the texture(s)
   vector<SGPropertyNode_ptr> textures = props->getChildren("texture");
   for (unsigned int i = 0; i < textures.size(); i++)
   {
     string tname = textures[i]->getStringValue();
+    if (strncmp(season, "summer", 6) && tname.substr(0,7) == "Terrain")
+       tname.insert(7,"."+string(season));
+
     if (tname == "") {
         tname = "unknown.rgb";
     }

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index a32bde3220cd450a9b1bbe22b9d2d31fcad3d1d3..9c2284ef4f07a2b9833ceb2daf4d41b4e4c35f2e 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -71,7 +71,7 @@ public:
    * state information for the material.  This node is usually
    * loaded from the $FG_ROOT/materials.xml file.
    */
-  SGMaterial( const string &fg_root, const SGPropertyNode *props );
+  SGMaterial( const string &fg_root, const SGPropertyNode *props, const char *season = "summer" );
 
 
   /**
@@ -249,7 +249,7 @@ private:
 
   SGMaterial( const string &fg_root, const SGMaterial &mat ); // unimplemented
 
-  void read_properties( const string &fg_root, const SGPropertyNode *props );
+  void read_properties( const string &fg_root, const SGPropertyNode *props, const char *season );
   void build_ssg_state( bool defer_tex_load );
   void set_ssg_state( ssgSimpleState *s );
 

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 83074ca00c4f979f654470870a41cc5990050698..3347aa850c5d2ac06c5cc42bbd2c616a7d95bb6f 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -175,7 +175,7 @@ static int gen_taxiway_dir_light_map( int r, int g, int b, int alpha ) {
 
 
 // Load a library of material properties
-bool SGMaterialLib::load( const string &fg_root, const string& mpath ) {
+bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char *season ) {
 
     SGPropertyNode materials;
 

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 28fe6906be7f9c83c0cc587375bcdaa84d6c50c1..460a723ce73e36c8dc7d58086c120d219829fd67 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -64,7 +64,7 @@ public:
     SGMaterialLib ( void );
 
     // Load a library of material properties
-    bool load( const string &fg_root, const string& mpath );
+    bool load( const string &fg_root, const string& mpath, const char *season = "summer" );
 
     // Add the named texture with default properties
     bool add_item( const string &tex_path );