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

Fred: include more check against null pointers and a raise in log level for missing objects.

Browse Source
This commit is contained in:
ehofman
2004-05-15 12:45:51 +00:00
parent 1436be9699
commit 0c24b78573
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/model.cxx
+8 -6
View File
@@ -170,7 +170,7 @@ sgMakeAnimation( ssgBranch * model,
if (name_nodes.size() > 0) { if (name_nodes.size() > 0) {
object = find_named_node(model, name_nodes[0]->getStringValue()); object = find_named_node(model, name_nodes[0]->getStringValue());
if (object == 0) { if (object == 0) {
SG_LOG(SG_INPUT, SG_WARN, "Object " << name_nodes[0]->getStringValue() SG_LOG(SG_INPUT, SG_ALERT, "Object " << name_nodes[0]->getStringValue()
<< " not found"); << " not found");
delete animation; delete animation;
animation = 0; animation = 0;
@@ -189,7 +189,7 @@ sgMakeAnimation( ssgBranch * model,
const char * name = name_nodes[i]->getStringValue(); const char * name = name_nodes[i]->getStringValue();
object = find_named_node(model, name); object = find_named_node(model, name);
if (object == 0) { if (object == 0) {
SG_LOG(SG_INPUT, SG_WARN, "Object " << name << " not found"); SG_LOG(SG_INPUT, SG_ALERT, "Object " << name << " not found");
delete animation; delete animation;
animation = 0; animation = 0;
} else { } else {
@@ -199,10 +199,12 @@ sgMakeAnimation( ssgBranch * model,
} }
} }
animation->init(); if ( animation != 0 ) {
branch->setUserData(animation); animation->init();
branch->setTravCallback(SSG_CALLBACK_PRETRAV, animation_callback); branch->setUserData(animation);
branch->setTravCallback(SSG_CALLBACK_POSTTRAV, restore_callback); branch->setTravCallback(SSG_CALLBACK_PRETRAV, animation_callback);
branch->setTravCallback(SSG_CALLBACK_POSTTRAV, restore_callback);
}
} }