fly/flightgear
1
0
Fork 0
Code Activity

don't crash if model contains personality branch (sgLoad3DModel doesn't

Browse source 
care for that -- SGModelLib::load_model does)
This commit is contained in:
mfranz 2006-03-22 13:46:10 +00:00
parent 746fe74838
commit ff32e30390
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Model/modelmgr.cxx
View file

@ -14,7 +14,7 @@
#include <plib/ssg.h>
#include <simgear/scene/model/placement.hxx>
#include <simgear/scene/model/model.hxx>
#include <simgear/scene/model/modellib.hxx>
#include <simgear/structure/exception.hxx>
#include <Main/fg_props.hxx>
@ -69,12 +69,14 @@ FGModelMgr::add_model (SGPropertyNode * node)
SGModelPlacement *model = new SGModelPlacement;
instance->model = model;
instance->node = node;
ssgBranch *object
= sgLoad3DModel( globals->get_fg_root(),
node->getStringValue("path",
"Models/Geometry/glider.ac"),
globals->get_props(),
globals->get_sim_time_sec() );
SGModelLib *model_lib = globals->get_model_lib();
ssgBranch *object = (ssgBranch *)model_lib->load_model(
globals->get_fg_root(),
node->getStringValue("path",
"Models/Geometry/glider.ac"),
globals->get_props(),
globals->get_sim_time_sec(), /*cache_object=*/false);
model->init( object );
// Set position and orientation either