#include <plib/ssg.h>
#include <Main/fg_props.hxx>
+#include <Scenery/scenery.hxx>
#include "modelmgr.hxx"
#include "model.hxx"
FGModelMgr::~FGModelMgr ()
{
- for (int i = 0; i < _instances.size(); i++) {
- globals->get_models_branch()
+ for (unsigned int i = 0; i < _instances.size(); i++) {
+ globals->get_scenery()->get_models_branch()
->removeKid(_instances[i]->model->getSceneGraph());
delete _instances[i];
}
void
FGModelMgr::init ()
{
- vector<SGPropertyNode *> model_nodes =
+ vector<SGPropertyNode_ptr> model_nodes =
fgGetNode("/models", true)->getChildren("model");
- for (int i = 0; i < model_nodes.size(); i++) {
+ for (unsigned int i = 0; i < model_nodes.size(); i++) {
SGPropertyNode * node = model_nodes[i];
SG_LOG(SG_GENERAL, SG_INFO,
"Adding model " << node->getStringValue("name", "[unnamed]"));
Instance * instance = new Instance;
- FG3DModel * model = new FG3DModel;
+ FGModelPlacement * model = new FGModelPlacement;
instance->model = model;
model->init(node->getStringValue("path", "Models/Geometry/glider.ac"));
model->setHeadingDeg(node->getDoubleValue("heading-deg"));
// Add this model to the global scene graph
- globals->get_scene_graph()->addKid(model->getSceneGraph());
+ globals->get_scenery()->get_scene_graph()->addKid(model->getSceneGraph());
// Save this instance for updating
_instances.push_back(instance);
}
void
-FGModelMgr::update (int dt)
+FGModelMgr::update (double dt)
{
- for (int i = 0; i < _instances.size(); i++) {
+ for (unsigned int i = 0; i < _instances.size(); i++) {
Instance * instance = _instances[i];
- FG3DModel * model = instance->model;
+ FGModelPlacement * model = instance->model;
// Optionally set position from properties
if (instance->lon_deg_node != 0)