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

Error reporting for animations / conditions

Browse Source 
Don’t report errors for each condition parse failure, but do 
aggregate them at the animation level in ReaderWriterXML

Sentry-Id: FLIGHTGEAR-DD
This commit is contained in:
James Turner 2021-06-26 16:27:22 +01:00 committed by Automatic Release Builder
parent d6400e3737
commit 0a6091eeeb
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
simgear/props/condition.cxx
View File

@ -535,7 +535,8 @@ readComparison( SGPropertyNode *prop_root,
{
SGComparisonCondition * condition = new SGComparisonCondition(type, reverse);
if (node->nChildren() < 2 || node->nChildren() > 3 ) {
throw sg_exception("condition: comparison without two or three children");
throw sg_exception("condition: comparison without two or three children",
{}, {}, false);
}
const SGPropertyNode* left = node->getChild(0),
@ -551,7 +552,8 @@ readComparison( SGPropertyNode *prop_root,
SGExpressiond* exp = SGReadDoubleExpression(prop_root, left->getChild(0));
condition->setLeftDExpression(exp);
} else {
throw sg_exception("Unknown condition comparison left child:" + leftName);
throw sg_exception("Unknown condition comparison left child:" + leftName,
{}, {}, false);
}
}
@ -565,7 +567,8 @@ readComparison( SGPropertyNode *prop_root,
SGExpressiond* exp = SGReadDoubleExpression(prop_root, right->getChild(0));
condition->setRightDExpression(exp);
} else {
throw sg_exception("Unknown condition comparison right child:" + rightName);
throw sg_exception("Unknown condition comparison right child:" + rightName,
{}, {}, false);
}
}
@ -580,7 +583,8 @@ readComparison( SGPropertyNode *prop_root,
SGExpressiond* exp = SGReadDoubleExpression(prop_root, n->getChild(0));
condition->setPrecisionDExpression(exp);
} else {
throw sg_exception("Unknown condition comparison precision child:" + name );
throw sg_exception("Unknown condition comparison precision child:" + name,
{}, {}, false);
}
}

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

@ -574,13 +574,22 @@ sgLoad3DModel_internal(const SGPath& path,
} // of object-names in the animation
continue;
}
/*
* Setup the model data for the node currently being animated.
*/
modelData.LoadAnimationValuesForElement(animation_nodes[i], i);
try {
/*
* Setup the model data for the node currently being animated.
*/
modelData.LoadAnimationValuesForElement(animation_nodes[i], i);
/// OSGFIXME: duh, why not only model?????
SGAnimation::animate(modelData);
/// OSGFIXME: duh, why not only model?????
SGAnimation::animate(modelData);
} catch (sg_exception& e) {
simgear::reportFailure(simgear::LoadFailure::NotFound, simgear::ErrorCode::XMLModelLoad,
"Couldn't load animation " + animation_nodes[i]->getNameString()
+ ":" + e.getFormattedMessage(),
modelpath);
throw;
}
}
animationcount += animation_nodes.size();