#include <plib/sg.h>
#include <plib/ssg.h>
+#include <plib/ul.h>
#include <simgear/compiler.h>
#include <simgear/debug/logstream.hxx>
#include <Scenery/scenery.hxx>
#include "model.hxx"
+#include "panelnode.hxx"
\f
// Static utility functions.
////////////////////////////////////////////////////////////////////////
+/**
+ * Callback to update an animation.
+ */
+static int
+animation_callback (ssgEntity * entity, int mask)
+{
+ ((Animation *)entity->getUserData())->update();
+ return true;
+}
+
+
/**
* Locate a named SSG node in a branch.
*/
*/
static void
make_offsets_matrix (sgMat4 * result, double h_rot, double p_rot, double r_rot,
- double x_off, double y_off, double z_off)
+ double x_off, double y_off, double z_off)
{
sgMat4 rot_matrix;
sgMat4 pos_matrix;
* Read an interpolation table from properties.
*/
static SGInterpTable *
-read_interpolation_table (const SGPropertyNode * props)
+read_interpolation_table (SGPropertyNode_ptr props)
{
- const SGPropertyNode * table_node = props->getNode("interpolation");
+ SGPropertyNode_ptr table_node = props->getNode("interpolation");
if (table_node != 0) {
SGInterpTable * table = new SGInterpTable();
vector<SGPropertyNode_ptr> entries = table_node->getChildren("entry");
- for (int i = 0; i < entries.size(); i++)
+ for (unsigned int i = 0; i < entries.size(); i++)
table->addEntry(entries[i]->getDoubleValue("ind", 0.0),
- entries[i]->getDoubleValue("dep", 0.0));
+ entries[i]->getDoubleValue("dep", 0.0));
return table;
} else {
return 0;
}
-\f
-////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel
-////////////////////////////////////////////////////////////////////////
-
-FG3DModel::FG3DModel ()
- : _model(0)
+static void
+make_animation (ssgBranch * model,
+ const char * name,
+ vector<SGPropertyNode_ptr> &name_nodes,
+ SGPropertyNode_ptr node)
{
-}
+ Animation * animation = 0;
+ const char * type = node->getStringValue("type", "none");
+ if (!strcmp("none", type)) {
+ animation = new NullAnimation(node);
+ } else if (!strcmp("range", type)) {
+ animation = new RangeAnimation(node);
+ } else if (!strcmp("billboard", type)) {
+ animation = new BillboardAnimation(node);
+ } else if (!strcmp("select", type)) {
+ animation = new SelectAnimation(node);
+ } else if (!strcmp("spin", type)) {
+ animation = new SpinAnimation(node);
+ } else if (!strcmp("timed", type)) {
+ animation = new TimedAnimation(node);
+ } else if (!strcmp("rotate", type)) {
+ animation = new RotateAnimation(node);
+ } else if (!strcmp("translate", type)) {
+ animation = new TranslateAnimation(node);
+ } else {
+ animation = new NullAnimation(node);
+ SG_LOG(SG_INPUT, SG_WARN, "Unknown animation type " << type);
+ }
-FG3DModel::~FG3DModel ()
-{
- // since the nodes are attached to the scene graph, they'll be
- // deleted automatically
+ if (name != 0)
+ animation->setName((char *)name);
- int i;
- for (i = 0; i < _animations.size(); i++)
- delete _animations[i];
+ ssgEntity * object;
+ if (name_nodes.size() > 0) {
+ object = find_named_node(model, name_nodes[0]->getStringValue());
+ if (object == 0) {
+ SG_LOG(SG_INPUT, SG_WARN, "Object " << name_nodes[0]->getStringValue()
+ << " not found");
+ delete animation;
+ animation = 0;
+ }
+ } else {
+ object = model;
+ }
+
+ ssgBranch * branch = animation->getBranch();
+ splice_branch(branch, object);
+
+ for (int i = 1; i < name_nodes.size(); i++) {
+ const char * name = name_nodes[i]->getStringValue();
+ object = find_named_node(model, name);
+ if (object == 0) {
+ SG_LOG(SG_INPUT, SG_WARN, "Object " << name << " not found");
+ delete animation;
+ animation = 0;
+ }
+ ssgBranch * oldParent = object->getParent(0);
+ branch->addKid(object);
+ oldParent->removeKid(object);
+ }
+
+ animation->init();
+ branch->setUserData(animation);
+ branch->setTravCallback(SSG_CALLBACK_PRETRAV, animation_callback);
}
-void
-FG3DModel::init (const string &path)
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Global functions.
+////////////////////////////////////////////////////////////////////////
+
+ssgBranch *
+fgLoad3DModel (const string &path)
{
+ ssgBranch * model = 0;
SGPropertyNode props;
// Load the 3D aircraft object itself
- SGPath xmlpath = globals->get_fg_root();
+ SGPath xmlpath;
SGPath modelpath = path;
- xmlpath.append(modelpath.str());
+ if ( ulIsAbsolutePathName( path.c_str() ) ) {
+ xmlpath = modelpath;
+ }
+ else {
+ xmlpath = globals->get_fg_root();
+ xmlpath.append(modelpath.str());
+ }
// Check for an XML wrapper
if (xmlpath.str().substr(xmlpath.str().size() - 4, 4) == ".xml") {
modelpath = modelpath.dir();
modelpath.append(props.getStringValue("/path"));
} else {
- throw sg_exception("No path for model");
+ if (model == 0)
+ model = new ssgBranch;
}
}
// Assume that textures are in
// the same location as the XML file.
- ssgTexturePath((char *)xmlpath.dir().c_str());
- _model = (ssgBranch *)ssgLoad((char *)modelpath.c_str());
- if (_model == 0)
- throw sg_exception("Failed to load 3D model");
+ if (model == 0) {
+ ssgTexturePath((char *)xmlpath.dir().c_str());
+ model = (ssgBranch *)ssgLoad((char *)modelpath.c_str());
+ if (model == 0)
+ throw sg_exception("Failed to load 3D model");
+ }
// Set up the alignment node
- ssgTransform * align = new ssgTransform;
- align->addKid(_model);
+ ssgTransform * alignmainmodel = new ssgTransform;
+ alignmainmodel->addKid(model);
sgMat4 res_matrix;
make_offsets_matrix(&res_matrix,
- props.getFloatValue("/offsets/heading-deg", 0.0),
- props.getFloatValue("/offsets/roll-deg", 0.0),
- props.getFloatValue("/offsets/pitch-deg", 0.0),
- props.getFloatValue("/offsets/x-m", 0.0),
- props.getFloatValue("/offsets/y-m", 0.0),
- props.getFloatValue("/offsets/z-m", 0.0));
- align->setTransform(res_matrix);
+ props.getFloatValue("/offsets/heading-deg", 0.0),
+ props.getFloatValue("/offsets/roll-deg", 0.0),
+ props.getFloatValue("/offsets/pitch-deg", 0.0),
+ props.getFloatValue("/offsets/x-m", 0.0),
+ props.getFloatValue("/offsets/y-m", 0.0),
+ props.getFloatValue("/offsets/z-m", 0.0));
+ alignmainmodel->setTransform(res_matrix);
+
+ // Load panels
+ unsigned int i;
+ vector<SGPropertyNode_ptr> panel_nodes = props.getChildren("panel");
+ for (i = 0; i < panel_nodes.size(); i++) {
+ SG_LOG(SG_INPUT, SG_DEBUG, "Loading a panel");
+ FGPanelNode * panel = new FGPanelNode(panel_nodes[i]);
+ if (panel_nodes[i]->hasValue("name"))
+ panel->setName((char *)panel_nodes[i]->getStringValue("name"));
+ model->addKid(panel);
+ }
// Load animations
vector<SGPropertyNode_ptr> animation_nodes = props.getChildren("animation");
- unsigned int i;
for (i = 0; i < animation_nodes.size(); i++) {
+ const char * name = animation_nodes[i]->getStringValue("name", 0);
vector<SGPropertyNode_ptr> name_nodes =
animation_nodes[i]->getChildren("object-name");
- if (name_nodes.size() < 1) {
- Animation * animation = make_animation(0, animation_nodes[i]);
- } else {
- for (unsigned int j = 0; j < name_nodes.size(); j++) {
- Animation * animation =
- make_animation(name_nodes[j]->getStringValue(), animation_nodes[i]);
- if (animation != 0)
- _animations.push_back(animation);
- }
- }
+ make_animation(model, name, name_nodes, animation_nodes[i]);
}
- // Load sub-models
+ // Load sub-models
vector<SGPropertyNode_ptr> model_nodes = props.getChildren("model");
for (i = 0; i < model_nodes.size(); i++) {
SGPropertyNode_ptr node = model_nodes[i];
ssgTransform * align = new ssgTransform;
sgMat4 res_matrix;
make_offsets_matrix(&res_matrix,
- node->getFloatValue("offsets/heading-deg", 0.0),
- node->getFloatValue("offsets/roll-deg", 0.0),
- node->getFloatValue("offsets/pitch-deg", 0.0),
- node->getFloatValue("offsets/x-m", 0.0),
- node->getFloatValue("offsets/y-m", 0.0),
- node->getFloatValue("offsets/z-m", 0.0));
+ node->getFloatValue("offsets/heading-deg", 0.0),
+ node->getFloatValue("offsets/roll-deg", 0.0),
+ node->getFloatValue("offsets/pitch-deg", 0.0),
+ node->getFloatValue("offsets/x-m", 0.0),
+ node->getFloatValue("offsets/y-m", 0.0),
+ node->getFloatValue("offsets/z-m", 0.0));
align->setTransform(res_matrix);
- FG3DModel * kid = new FG3DModel;
- kid->init(node->getStringValue("path"));
- align->addKid(kid->getSceneGraph());
- _model->addKid(align);
- _children.push_back(kid);
- }
-}
-
-void
-FG3DModel::update (double dt)
-{
- unsigned int i;
-
- for (i = 0; i < _children.size(); i++)
- _children[i]->update(dt);
- for (i = 0; i < _animations.size(); i++)
- _animations[i]->update(dt);
-}
-FG3DModel::Animation *
-FG3DModel::make_animation (const char * object_name,
- SGPropertyNode * node)
-{
- Animation * animation = 0;
- const char * type = node->getStringValue("type");
- if (!strcmp("none", type)) {
- animation = new NullAnimation();
- } else if (!strcmp("range", type)) {
- animation = new RangeAnimation();
- } else if (!strcmp("billboard", type)) {
- animation = new BillboardAnimation();
- } else if (!strcmp("select", type)) {
- animation = new SelectAnimation();
- } else if (!strcmp("spin", type)) {
- animation = new SpinAnimation();
- } else if (!strcmp("rotate", type)) {
- animation = new RotateAnimation();
- } else if (!strcmp("translate", type)) {
- animation = new TranslateAnimation();
- } else {
- animation = new NullAnimation();
- SG_LOG(SG_INPUT, SG_WARN, "Unknown animation type " << type);
- }
-
- ssgEntity * object;
- if (object_name != 0) {
- object = find_named_node(_model, object_name);
- if (object == 0) {
- SG_LOG(SG_INPUT, SG_WARN, "Object " << object_name << " not found");
- delete animation;
- animation = 0;
- }
- } else {
- object = _model;
+ ssgBranch * kid = fgLoad3DModel(node->getStringValue("path"));
+ align->addKid(kid);
+ model->addKid(align);
}
- animation->init(object, node);
- return animation;
+ return alignmainmodel;
}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::Animation
+// Implementation of Animation
////////////////////////////////////////////////////////////////////////
-FG3DModel::Animation::Animation ()
+Animation::Animation (SGPropertyNode_ptr props, ssgBranch * branch)
+ : _branch(branch)
{
+ _branch->setName(props->getStringValue("name", 0));
}
-FG3DModel::Animation::~Animation ()
-{
-}
-
-
-\f
-////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::NullAnimation
-////////////////////////////////////////////////////////////////////////
-
-FG3DModel::NullAnimation::NullAnimation ()
- : _branch(new ssgBranch)
+Animation::~Animation ()
{
}
-FG3DModel::NullAnimation::~NullAnimation ()
-{
- _branch = 0;
-}
-
void
-FG3DModel::NullAnimation::init (ssgEntity * object,
- SGPropertyNode * props)
+Animation::init ()
{
- splice_branch(_branch, object);
- _branch->setName(props->getStringValue("name", 0));
}
void
-FG3DModel::NullAnimation::update (double dt)
+Animation::update ()
{
}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::RangeAnimation
+// Implementation of NullAnimation
////////////////////////////////////////////////////////////////////////
-FG3DModel::RangeAnimation::RangeAnimation ()
- : _branch(new ssgRangeSelector)
-{
-}
-
-FG3DModel::RangeAnimation::~RangeAnimation ()
-{
- _branch = 0;
-}
-
-void
-FG3DModel::RangeAnimation::init (ssgEntity * object,
- SGPropertyNode * props)
+NullAnimation::NullAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgBranch)
{
- float ranges[2];
- splice_branch(_branch, object);
- _branch->setName(props->getStringValue("name", 0));
- ranges[0] = props->getFloatValue("min-m", 0);
- ranges[1] = props->getFloatValue("max-m", 5000);
- _branch->setRanges(ranges, 2);
}
-void
-FG3DModel::RangeAnimation::update (double dt)
+NullAnimation::~NullAnimation ()
{
}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::BillboardAnimation
+// Implementation of RangeAnimation
////////////////////////////////////////////////////////////////////////
-FG3DModel::BillboardAnimation::BillboardAnimation ()
- : _branch(0)
+RangeAnimation::RangeAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgRangeSelector)
{
- // Note: we cannot allocate the branch until we know whether
- // it can rotate around the x axis as well as the z axis.
+ float ranges[] = { props->getFloatValue("min-m", 0),
+ props->getFloatValue("max-m", 5000) };
+ ((ssgRangeSelector *)_branch)->setRanges(ranges, 2);
+
}
-FG3DModel::BillboardAnimation::~BillboardAnimation ()
+RangeAnimation::~RangeAnimation ()
{
- _branch = 0;
}
-void
-FG3DModel::BillboardAnimation::init (ssgEntity * object,
- SGPropertyNode * props)
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of BillboardAnimation
+////////////////////////////////////////////////////////////////////////
+
+BillboardAnimation::BillboardAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgCutout(props->getBoolValue("spherical", true)))
{
- _branch = new ssgCutout(props->getBoolValue("spherical", true));
- splice_branch(_branch, object);
- _branch->setName(props->getStringValue("name", 0));
}
-void
-FG3DModel::BillboardAnimation::update (double dt)
+BillboardAnimation::~BillboardAnimation ()
{
}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::SelectAnimation
+// Implementation of SelectAnimation
////////////////////////////////////////////////////////////////////////
-FG3DModel::SelectAnimation::SelectAnimation ()
- : _condition(0),
- _selector(new ssgSelector)
+SelectAnimation::SelectAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgSelector),
+ _condition(0)
{
+ SGPropertyNode_ptr node = props->getChild("condition");
+ if (node != 0)
+ _condition = fgReadCondition(node);
}
-FG3DModel::SelectAnimation::~SelectAnimation ()
+SelectAnimation::~SelectAnimation ()
{
delete _condition;
- _selector = 0;
}
void
-FG3DModel::SelectAnimation::init (ssgEntity * object,
- SGPropertyNode * props)
-{
- splice_branch(_selector, object);
- _selector->setName(props->getStringValue("name", 0));
- SGPropertyNode * node = props->getChild("condition");
- if (node != 0) {
- _condition = fgReadCondition(node);
- }
-}
-
-void
-FG3DModel::SelectAnimation::update (double dt)
+SelectAnimation::update ()
{
if (_condition != 0 && _condition->test())
- _selector->select(0xffff);
+ ((ssgSelector *)_branch)->select(0xffff);
else
- _selector->select(0x0000);
+ ((ssgSelector *)_branch)->select(0x0000);
}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::SpinAnimation
+// Implementation of SpinAnimation
////////////////////////////////////////////////////////////////////////
-FG3DModel::SpinAnimation::SpinAnimation ()
- : _prop(0),
- _factor(0),
- _position_deg(0),
- _transform(new ssgTransform)
+SpinAnimation::SpinAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgTransform),
+ _prop(fgGetNode(props->getStringValue("property", "/null"), true)),
+ _factor(props->getDoubleValue("factor", 1.0)),
+ _position_deg(props->getDoubleValue("starting-position-deg", 0)),
+ _last_time_sec(globals->get_sim_time_sec())
{
+ _center[0] = props->getFloatValue("center/x-m", 0);
+ _center[1] = props->getFloatValue("center/y-m", 0);
+ _center[2] = props->getFloatValue("center/z-m", 0);
+ _axis[0] = props->getFloatValue("axis/x", 0);
+ _axis[1] = props->getFloatValue("axis/y", 0);
+ _axis[2] = props->getFloatValue("axis/z", 0);
+ sgNormalizeVec3(_axis);
}
-FG3DModel::SpinAnimation::~SpinAnimation ()
+SpinAnimation::~SpinAnimation ()
{
- _transform = 0;
}
void
-FG3DModel::SpinAnimation::init (ssgEntity * object,
- SGPropertyNode * props)
-{
- // Splice in the new transform node
- splice_branch(_transform, object);
- _transform->setName(props->getStringValue("name", 0));
- _prop = fgGetNode(props->getStringValue("property", "/null"), true);
- _factor = props->getDoubleValue("factor", 1.0);
- _position_deg = props->getDoubleValue("starting-position-deg", 0);
- _center[0] = props->getFloatValue("center/x-m", 0);
- _center[1] = props->getFloatValue("center/y-m", 0);
- _center[2] = props->getFloatValue("center/z-m", 0);
- _axis[0] = props->getFloatValue("axis/x", 0);
- _axis[1] = props->getFloatValue("axis/y", 0);
- _axis[2] = props->getFloatValue("axis/z", 0);
- sgNormalizeVec3(_axis);
-}
-
-void
-FG3DModel::SpinAnimation::update (double dt)
+SpinAnimation::update ()
{
+ double sim_time = globals->get_sim_time_sec();
+ double dt = sim_time - _last_time_sec;
+ _last_time_sec = sim_time;
+
float velocity_rpms = (_prop->getDoubleValue() * _factor / 60.0);
_position_deg += (dt * velocity_rpms * 360);
while (_position_deg < 0)
while (_position_deg >= 360.0)
_position_deg -= 360.0;
set_rotation(_matrix, _position_deg, _center, _axis);
- _transform->setTransform(_matrix);
+ ((ssgTransform *)_branch)->setTransform(_matrix);
}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::RotateAnimation
+// Implementation of TimedAnimation
////////////////////////////////////////////////////////////////////////
-FG3DModel::RotateAnimation::RotateAnimation ()
- : _prop(0),
- _offset_deg(0.0),
- _factor(1.0),
- _table(0),
- _has_min(false),
- _min_deg(0.0),
- _has_max(false),
- _max_deg(1.0),
- _position_deg(0.0),
- _transform(new ssgTransform)
+TimedAnimation::TimedAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgSelector),
+ _duration_sec(props->getDoubleValue("duration-sec", 1.0)),
+ _last_time_sec(0),
+ _step(-1)
{
}
-FG3DModel::RotateAnimation::~RotateAnimation ()
+TimedAnimation::~TimedAnimation ()
{
- delete _table;
- _transform = 0;
}
void
-FG3DModel::RotateAnimation::init (ssgEntity * object,
- SGPropertyNode * props)
-{
- // Splice in the new transform node
- splice_branch(_transform, object);
- _transform->setName(props->getStringValue("name", 0));
- _prop = fgGetNode(props->getStringValue("property", "/null"), true);
- _offset_deg = props->getDoubleValue("offset-deg", 0.0);
- _factor = props->getDoubleValue("factor", 1.0);
- _table = read_interpolation_table(props);
- if (props->hasValue("min-deg")) {
- _has_min = true;
- _min_deg = props->getDoubleValue("min-deg");
- }
- if (props->hasValue("max-deg")) {
- _has_max = true;
- _max_deg = props->getDoubleValue("max-deg");
- }
- _position_deg = props->getDoubleValue("starting-position-deg", 0);
+TimedAnimation::update ()
+{
+ float sim_time_sec = globals->get_sim_time_sec();
+ if ((sim_time_sec - _last_time_sec) >= _duration_sec) {
+ _last_time_sec = sim_time_sec;
+ _step++;
+ if (_step >= getBranch()->getNumKids())
+ _step = 0;
+ ((ssgSelector *)getBranch())->selectStep(_step);
+ }
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of RotateAnimation
+////////////////////////////////////////////////////////////////////////
+
+RotateAnimation::RotateAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgTransform),
+ _prop(fgGetNode(props->getStringValue("property", "/null"), true)),
+ _offset_deg(props->getDoubleValue("offset-deg", 0.0)),
+ _factor(props->getDoubleValue("factor", 1.0)),
+ _table(read_interpolation_table(props)),
+ _has_min(props->hasValue("min-deg")),
+ _min_deg(props->getDoubleValue("min-deg")),
+ _has_max(props->hasValue("max-deg")),
+ _max_deg(props->getDoubleValue("max-deg")),
+ _position_deg(props->getDoubleValue("starting-position-deg", 0))
+{
_center[0] = props->getFloatValue("center/x-m", 0);
_center[1] = props->getFloatValue("center/y-m", 0);
_center[2] = props->getFloatValue("center/z-m", 0);
sgNormalizeVec3(_axis);
}
+RotateAnimation::~RotateAnimation ()
+{
+ delete _table;
+}
+
void
-FG3DModel::RotateAnimation::update (double dt)
+RotateAnimation::update ()
{
if (_table == 0) {
- _position_deg = (_prop->getDoubleValue() + _offset_deg) * _factor;
+ _position_deg = _prop->getDoubleValue() * _factor + _offset_deg;
if (_has_min && _position_deg < _min_deg)
_position_deg = _min_deg;
if (_has_max && _position_deg > _max_deg)
_position_deg = _table->interpolate(_prop->getDoubleValue());
}
set_rotation(_matrix, _position_deg, _center, _axis);
- _transform->setTransform(_matrix);
+ ((ssgTransform *)_branch)->setTransform(_matrix);
}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FG3DModel::TranslateAnimation
+// Implementation of TranslateAnimation
////////////////////////////////////////////////////////////////////////
-FG3DModel::TranslateAnimation::TranslateAnimation ()
- : _prop(0),
- _offset_m(0.0),
- _factor(1.0),
- _table(0),
- _has_min(false),
- _min_m(0.0),
- _has_max(false),
- _max_m(1.0),
- _position_m(0.0),
- _transform(new ssgTransform)
+TranslateAnimation::TranslateAnimation (SGPropertyNode_ptr props)
+ : Animation(props, new ssgTransform),
+ _prop(fgGetNode(props->getStringValue("property", "/null"), true)),
+ _offset_m(props->getDoubleValue("offset-m", 0.0)),
+ _factor(props->getDoubleValue("factor", 1.0)),
+ _table(read_interpolation_table(props)),
+ _has_min(props->hasValue("min-m")),
+ _min_m(props->getDoubleValue("min-m")),
+ _has_max(props->hasValue("max-m")),
+ _max_m(props->getDoubleValue("max-m")),
+ _position_m(props->getDoubleValue("starting-position-m", 0))
{
-}
-
-FG3DModel::TranslateAnimation::~TranslateAnimation ()
-{
- delete _table;
- _transform = 0;
-}
-
-void
-FG3DModel::TranslateAnimation::init (ssgEntity * object,
- SGPropertyNode * props)
-{
- // Splice in the new transform node
- splice_branch(_transform, object);
- _transform->setName(props->getStringValue("name", 0));
- _prop = fgGetNode(props->getStringValue("property", "/null"), true);
- _offset_m = props->getDoubleValue("offset-m", 0.0);
- _factor = props->getDoubleValue("factor", 1.0);
- _table = read_interpolation_table(props);
- if (props->hasValue("min-m")) {
- _has_min = true;
- _min_m = props->getDoubleValue("min-m");
- }
- if (props->hasValue("max-m")) {
- _has_max = true;
- _max_m = props->getDoubleValue("max-m");
- }
- _position_m = props->getDoubleValue("starting-position-m", 0);
_axis[0] = props->getFloatValue("axis/x", 0);
_axis[1] = props->getFloatValue("axis/y", 0);
_axis[2] = props->getFloatValue("axis/z", 0);
sgNormalizeVec3(_axis);
}
+TranslateAnimation::~TranslateAnimation ()
+{
+ delete _table;
+}
+
void
-FG3DModel::TranslateAnimation::update (double dt)
+TranslateAnimation::update ()
{
if (_table == 0) {
_position_m = (_prop->getDoubleValue() + _offset_m) * _factor;
_position_m = _table->interpolate(_prop->getDoubleValue());
}
set_translation(_matrix, _position_m, _axis);
- _transform->setTransform(_matrix);
+ ((ssgTransform *)_branch)->setTransform(_matrix);
}
////////////////////////////////////////////////////////////////////////
FGModelPlacement::FGModelPlacement ()
- : _model(new FG3DModel),
- _lon_deg(0),
+ : _lon_deg(0),
_lat_deg(0),
_elev_ft(0),
_roll_deg(0),
FGModelPlacement::~FGModelPlacement ()
{
- delete _model;
- delete _selector;
}
void
FGModelPlacement::init (const string &path)
{
- _model->init(path);
- _position->addKid(_model->getSceneGraph());
+ ssgBranch * model = fgLoad3DModel(path);
+ if (model != 0)
+ _position->addKid(model);
_selector->addKid(_position);
_selector->clrTraversalMaskBits(SSGTRAV_HOT);
}
void
-FGModelPlacement::update (double dt)
+FGModelPlacement::update ()
{
- _model->update(dt);
-
_location->setPosition( _lon_deg, _lat_deg, _elev_ft );
_location->setOrientation( _roll_deg, _pitch_deg, _heading_deg );
void
FGModelPlacement::setOrientation (double roll_deg, double pitch_deg,
- double heading_deg)
+ double heading_deg)
{
_roll_deg = roll_deg;
_pitch_deg = pitch_deg;
projects / flightgear.git / blobdiff