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

Silently ignore texture files that are not present.

Browse Source
This commit is contained in:
ehofman
2004-03-07 18:47:37 +00:00
parent 3b3baa996b
commit a34ac6a596
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/mat.cxx
+12 -7
View File
@@ -93,19 +93,23 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
for (int i = 0; i < textures.size(); i++) for (int i = 0; i < textures.size(); i++)
{ {
string tname = textures[i]->getStringValue(); string tname = textures[i]->getStringValue();
if (tname == "") if (tname == "") {
tname = "unknown.rgb"; tname = "unknown.rgb";
}
SGPath tpath( fg_root ); SGPath tpath( fg_root );
tpath.append("Textures.high"); tpath.append("Textures.high");
tpath.append(tname); tpath.append(tname);
if (!ulFileExists(tpath.c_str())) { if ( !ulFileExists(tpath.c_str()) ) {
tpath = SGPath( fg_root ); tpath = SGPath( fg_root );
tpath.append("Textures"); tpath.append("Textures");
tpath.append(tname); tpath.append(tname);
} }
_internal_state st( NULL, tpath.str(), false );
_status.push_back( st ); if ( ulFileExists(tpath.c_str()) ) {
_internal_state st( NULL, tpath.str(), false );
_status.push_back( st );
}
} }
if (textures.size() == 0) { if (textures.size() == 0) {
@@ -208,11 +212,12 @@ SGMaterial::get_state (int n) const
return NULL; return NULL;
} }
if ( _current_ptr >= _status.size()) ssgSimpleState *st = (n >= 0) ? _status[n].state
: _status[_current_ptr].state;
((SGMaterial *)this)->_current_ptr += 1;
if (_current_ptr >= _status.size())
((SGMaterial *)this)->_current_ptr = 0; ((SGMaterial *)this)->_current_ptr = 0;
ssgSimpleState *st = (n >= 0) ? _status[n].state : _status[_current_ptr].state;
((SGMaterial *)this)->_current_ptr += 1;
return st; return st;
} }