fly/flightgear
1
0
Fork 0
Code Activity

Patch from Frederic Bouvier:

Browse source 
I noticed that textures for scenery static objects are not loaded
anymore for a few weeks.  Static objects have absolute path while
random objects and aircraft have relative path but fgLoad3DModel
unconditionally prepend fg_root to the model path. This patch test the
beginning of the model path to choose if fg_root has to be prepended
to the model path.
This commit is contained in:
david 2002-10-13 10:43:57 +00:00
parent 76cda01641
commit b66a6c75b3
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Model/model.cxx
View file

@ -229,9 +229,15 @@ fgLoad3DModel (const string &path)
SGPropertyNode props;
// Load the 3D aircraft object itself
SGPath xmlpath = globals->get_fg_root();
SGPath xmlpath;
SGPath modelpath = path;
xmlpath.append(modelpath.str());
if ( path[ 0 ] == '/' || path[ 0 ] == '\\' || ( isalpha( path[ 0 ] ) && path[ 1 ] == ':' ) ) {
xmlpath = modelpath;
}
else {
xmlpath = globals->get_fg_root();
xmlpath.append(modelpath.str());
}
// Check for an XML wrapper
if (xmlpath.str().substr(xmlpath.str().size() - 4, 4) == ".xml") {