X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2Fmodelmgr.cxx;h=72d257368421b74b0041f3bd3aeb1ffa985c4bb9;hb=575b3ac98c2aad3fd80375cdfbe49c9180b8788e;hp=609f7abdfbdf8ebd98c8f3ddefc02c7a6fc56db9;hpb=2119db35c3f596268e2ee21d3cd8c359a85cd1ed;p=flightgear.git diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx index 609f7abdf..72d257368 100644 --- a/src/Model/modelmgr.cxx +++ b/src/Model/modelmgr.cxx @@ -8,8 +8,10 @@ #include
#include -#include "modelmgr.hxx" #include "model.hxx" +#include "placement.hxx" + +#include "modelmgr.hxx" FGModelMgr::FGModelMgr () @@ -36,12 +38,15 @@ FGModelMgr::init () SG_LOG(SG_GENERAL, SG_INFO, "Adding model " << node->getStringValue("name", "[unnamed]")); Instance * instance = new Instance; - FGModelPlacement * model = new FGModelPlacement; + FGModelPlacement *model = new FGModelPlacement; instance->model = model; - model->init( globals->get_fg_root(), - node->getStringValue("path", "Models/Geometry/glider.ac"), - globals->get_props(), - globals->get_sim_time_sec() ); + ssgBranch *object + = fgLoad3DModel( globals->get_fg_root(), + node->getStringValue("path", + "Models/Geometry/glider.ac"), + globals->get_props(), + globals->get_sim_time_sec() ); + model->init( object ); // Set position and orientation either // indirectly through property refs