FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly update the seasonal texture support code.

Browse Source
This commit is contained in:
ehofman
2005-10-23 13:47:46 +00:00
parent fb69d790ce
commit 21c64dd60f
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/mat.cxx
+6 -2
View File
@@ -94,8 +94,12 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
for (unsigned int i = 0; i < textures.size(); i++) for (unsigned int i = 0; i < textures.size(); i++)
{ {
string tname = textures[i]->getStringValue(); string tname = textures[i]->getStringValue();
if (strncmp(season, "summer", 6) && tname.substr(0,7) == "Terrain") string otname = tname;
tname.insert(7,"."+string(season)); if (season && strncmp(season, "summer", 6))
{
if (tname.substr(0,7) == "Terrain")
tname.insert(7,"."+string(season));
}
if (tname == "") { if (tname == "") {
tname = "unknown.rgb"; tname = "unknown.rgb";
simgear/scene/material/mat.hxx
+1 -1
View File
@@ -71,7 +71,7 @@ public:
* state information for the material. This node is usually * state information for the material. This node is usually
* loaded from the $FG_ROOT/materials.xml file. * loaded from the $FG_ROOT/materials.xml file.
*/ */
SGMaterial( const string &fg_root, const SGPropertyNode *props, const char *season = "summer" ); SGMaterial( const string &fg_root, const SGPropertyNode *props, const char *season );
/** /**
simgear/scene/material/matlib.cxx
+1 -1
View File
@@ -192,7 +192,7 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char
for (int i = 0; i < nMaterials; i++) { for (int i = 0; i < nMaterials; i++) {
const SGPropertyNode * node = materials.getChild(i); const SGPropertyNode * node = materials.getChild(i);
if (!strcmp(node->getName(), "material")) { if (!strcmp(node->getName(), "material")) {
SGMaterial *m = new SGMaterial( fg_root, node ); SGMaterial *m = new SGMaterial( fg_root, node, season );
vector<SGPropertyNode_ptr>names = node->getChildren("name"); vector<SGPropertyNode_ptr>names = node->getChildren("name");
for ( unsigned int j = 0; j < names.size(); j++ ) { for ( unsigned int j = 0; j < names.size(); j++ ) {
simgear/scene/material/matlib.hxx
+1 -1
View File
@@ -64,7 +64,7 @@ public:
SGMaterialLib ( void ); SGMaterialLib ( void );
// Load a library of material properties // Load a library of material properties
bool load( const string &fg_root, const string& mpath, const char *season = "summer" ); bool load( const string &fg_root, const string& mpath, const char *season );
// Add the named texture with default properties // Add the named texture with default properties
bool add_item( const string &tex_path ); bool add_item( const string &tex_path );