fly/flightgear
1
0
Fork 0
Code Activity

extract loop body into separate function to later allow model addition

Browse source 
at runtime; remove Nasal support for now (the model loader is currently
initialized before the Nasal subsystem is available)
This commit is contained in:
mfranz 2006-03-20 12:10:20 +00:00
parent 7845f33c74
commit 40f2294539
2 changed files with 57 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/Model/modelmgr.cxx
View file

@ -18,7 +18,6 @@
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Scenery/scenery.hxx> #include <Scenery/scenery.hxx>
#include <Scripting/NasalSys.hxx>
#include "modelmgr.hxx" #include "modelmgr.hxx"
@ -45,70 +44,75 @@ FGModelMgr::init ()
{ {
vector<SGPropertyNode_ptr> model_nodes = vector<SGPropertyNode_ptr> model_nodes =
fgGetNode("/models", true)->getChildren("model"); fgGetNode("/models", true)->getChildren("model");
for (unsigned int i = 0; i < model_nodes.size(); i++) {
SGPropertyNode * node = model_nodes[i]; for (unsigned int i = 0; i < model_nodes.size(); i++)
SG_LOG(SG_GENERAL, SG_INFO, add_model(model_nodes[i]);
}
void
FGModelMgr::add_model (SGPropertyNode * node)
{
SG_LOG(SG_GENERAL, SG_INFO,
"Adding model " << node->getStringValue("name", "[unnamed]")); "Adding model " << node->getStringValue("name", "[unnamed]"));
Instance * instance = new Instance; Instance * instance = new Instance;
SGModelPlacement *model = new SGModelPlacement; SGModelPlacement *model = new SGModelPlacement;
instance->model = model; instance->model = model;
ssgBranch *object ssgBranch *object
= sgLoad3DModel( globals->get_fg_root(), = sgLoad3DModel( globals->get_fg_root(),
node->getStringValue("path", node->getStringValue("path",
"Models/Geometry/glider.ac"), "Models/Geometry/glider.ac"),
globals->get_props(), globals->get_props(),
globals->get_sim_time_sec(), 0, new FGNasalModelData ); globals->get_sim_time_sec() );
model->init( object ); model->init( object );
// Set position and orientation either // Set position and orientation either
// indirectly through property refs // indirectly through property refs
// or directly with static values. // or directly with static values.
SGPropertyNode * child = node->getChild("longitude-deg-prop"); SGPropertyNode * child = node->getChild("longitude-deg-prop");
if (child != 0) if (child != 0)
instance->lon_deg_node = fgGetNode(child->getStringValue(), true); instance->lon_deg_node = fgGetNode(child->getStringValue(), true);
else else
model->setLongitudeDeg(node->getDoubleValue("longitude-deg")); model->setLongitudeDeg(node->getDoubleValue("longitude-deg"));
child = node->getChild("latitude-deg-prop"); child = node->getChild("latitude-deg-prop");
if (child != 0) if (child != 0)
instance->lat_deg_node = fgGetNode(child->getStringValue(), true); instance->lat_deg_node = fgGetNode(child->getStringValue(), true);
else else
model->setLatitudeDeg(node->getDoubleValue("latitude-deg")); model->setLatitudeDeg(node->getDoubleValue("latitude-deg"));
child = node->getChild("elevation-ft-prop"); child = node->getChild("elevation-ft-prop");
if (child != 0) if (child != 0)
instance->elev_ft_node = fgGetNode(child->getStringValue(), true); instance->elev_ft_node = fgGetNode(child->getStringValue(), true);
else else
model->setElevationFt(node->getDoubleValue("elevation-ft")); model->setElevationFt(node->getDoubleValue("elevation-ft"));
child = node->getChild("roll-deg-prop"); child = node->getChild("roll-deg-prop");
if (child != 0) if (child != 0)
instance->roll_deg_node = fgGetNode(child->getStringValue(), true); instance->roll_deg_node = fgGetNode(child->getStringValue(), true);
else else
model->setRollDeg(node->getDoubleValue("roll-deg")); model->setRollDeg(node->getDoubleValue("roll-deg"));
child = node->getChild("pitch-deg-prop"); child = node->getChild("pitch-deg-prop");
if (child != 0) if (child != 0)
instance->pitch_deg_node = fgGetNode(child->getStringValue(), true); instance->pitch_deg_node = fgGetNode(child->getStringValue(), true);
else else
model->setPitchDeg(node->getDoubleValue("pitch-deg")); model->setPitchDeg(node->getDoubleValue("pitch-deg"));
child = node->getChild("heading-deg-prop"); child = node->getChild("heading-deg-prop");
if (child != 0) if (child != 0)
instance->heading_deg_node = fgGetNode(child->getStringValue(), true); instance->heading_deg_node = fgGetNode(child->getStringValue(), true);
else else
model->setHeadingDeg(node->getDoubleValue("heading-deg")); model->setHeadingDeg(node->getDoubleValue("heading-deg"));
// Add this model to the global scene graph // Add this model to the global scene graph
globals->get_scenery()->get_scene_graph()->addKid(model->getSceneGraph()); globals->get_scenery()->get_scene_graph()->addKid(model->getSceneGraph());
// Register that one at the scenery manager // Register that one at the scenery manager
globals->get_scenery()->register_placement_transform(model->getTransform()); globals->get_scenery()->register_placement_transform(model->getTransform());
// Save this instance for updating // Save this instance for updating
add_instance(instance); add_instance(instance);
}
} }
void void

2
src/Model/modelmgr.hxx
View file

@ -64,6 +64,8 @@ public:
virtual void unbind (); virtual void unbind ();
virtual void update (double dt); virtual void update (double dt);
virtual void add_model (SGPropertyNode * node);
/** /**
* Add an instance of a dynamic model to the manager. * Add an instance of a dynamic model to the manager.
* *