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

- better error message when submodel loading failed

Browse Source 
- use alignmainmodel node in callback (not used anywhere yet)
This commit is contained in:
mfranz
2006-03-17 19:01:52 +00:00
parent 33e01e431d
commit ed20ce388a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/model.cxx
+10 -3
View File
@@ -319,8 +319,15 @@ sgLoad3DModel( const string &fg_root, const string &path,
node->getFloatValue("offsets/z-m", 0.0)); node->getFloatValue("offsets/z-m", 0.0));
align->setTransform(res_matrix); align->setTransform(res_matrix);
ssgBranch * kid = sgLoad3DModel( fg_root, node->getStringValue("path"), ssgBranch * kid;
prop_root, sim_time_sec, load_panel ); const char * submodel = node->getStringValue("path");
try {
kid = sgLoad3DModel( fg_root, submodel, prop_root, sim_time_sec, load_panel );
} catch (const sg_throwable &t) {
SG_LOG(SG_INPUT, SG_ALERT, "Failed to load submodel: " << t.getFormattedMessage());
throw;
}
align->addKid(kid); align->addKid(kid);
align->setName(node->getStringValue("name", "")); align->setName(node->getStringValue("name", ""));
model->addKid(align); model->addKid(align);
@@ -340,7 +347,7 @@ sgLoad3DModel( const string &fg_root, const string &path,
if (data) { if (data) {
alignmainmodel->setUserData(data); alignmainmodel->setUserData(data);
data->modelLoaded(path, &props, model); data->modelLoaded(path, &props, alignmainmodel);
} }
// Load animations // Load animations
set<ssgBranch *> ignore_branches; set<ssgBranch *> ignore_branches;