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

Model animation loading errors

Browse Source 
Another fix, for a different exception type, spotted by Michael D.

SF-ID: https://sourceforge.net/p/flightgear/codetickets/2702/
This commit is contained in:
James Turner 2022-02-06 10:55:58 +00:00
parent f17bd77030
commit 8722ea0fb6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
simgear/scene/model/SGReaderWriterXML.cxx
View File

@ -824,12 +824,20 @@ sgLoad3DModel_internal(const SGPath& path,
/// OSGFIXME: duh, why not only model????? /// OSGFIXME: duh, why not only model?????
SGAnimation::animate(modelData); SGAnimation::animate(modelData);
// note from James: we used to re-throw these errors, and they
// were caught one level up as an SG_DEV_ALERT log message and
// loading an empty osg::Node for the entire model.
// Chosing instead to trap them there, since a single failed animation
// isn't necessarily a reason to abandon the model load.
} catch (sg_exception& e) { } catch (sg_exception& e) {
simgear::reportFailure(simgear::LoadFailure::NotFound, simgear::ErrorCode::XMLModelLoad, simgear::reportFailure(simgear::LoadFailure::Misconfigured, simgear::ErrorCode::XMLModelLoad,
"Couldn't load animation " + animation_nodes[i]->getNameString() "Couldn't load animation " + animation_nodes[i]->getNameString() + ":" + e.getFormattedMessage(),
+ ":" + e.getFormattedMessage(), modelpath);
} catch (std::exception& e) { // needed because props throws std::runtime_error sometimes
simgear::reportFailure(simgear::LoadFailure::Misconfigured, simgear::ErrorCode::XMLModelLoad,
"Couldn't load animation " + animation_nodes[i]->getNameString() + ":" + e.what(),
modelpath); modelpath);
throw;
} }
} }