fly/flightgear
1
0
Fork 0
Code Activity

Tie the count into the property tree instead of using snprintf every frame. Add the life-timer to the property tree under sim/time/elapsed-sec for AI object animation (blending and/or scaling).

Browse source
This commit is contained in:
ehofman 2004-08-30 11:13:29 +00:00
parent fdab44652e
commit d2d27f2d76
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/AIModel/AIBallistic.cxx
View file

@ -49,10 +49,12 @@ bool FGAIBallistic::init() {
void FGAIBallistic::bind() {
// FGAIBase::bind();
props->tie("sim/time/elapsed-sec", SGRawValuePointer<double>(&life_timer));
}
void FGAIBallistic::unbind() {
// FGAIBase::unbind();
props->untie("sim/time/elapsed-sec");
}
void FGAIBallistic::update(double dt) {

18
src/Systems/submodel.cxx
View file

@ -53,6 +53,11 @@ SubmodelSystem::bind ()
void
SubmodelSystem::unbind ()
{
submodel_iterator = submodels.begin();
while(submodel_iterator != submodels.end()) {
(*submodel_iterator)->prop->untie("count");
++submodel_iterator;
}
}
void
@ -66,10 +71,6 @@ SubmodelSystem::update (double dt)
if ((*submodel_iterator)->trigger->getBoolValue()) {
if ((*submodel_iterator)->count != 0) {
release( (*submodel_iterator), dt);
// now update the "count" property for this submodel
char name[80];
snprintf(name, 80, "/systems/submodels/submodel[%d]/count", i);
fgSetInt(name, (*submodel_iterator)->count);
}
}
++submodel_iterator;
@ -119,8 +120,8 @@ SubmodelSystem::load ()
int count = root.nChildren();
for (i = 0; i < count; i++) {
// cout << "Reading submodel " << i << endl;
SGPropertyNode *prop;
submodel* sm = new submodel;
submodels.push_back( sm );
SGPropertyNode * entry_node = root.getChild(i);
sm->trigger = fgGetNode(entry_node->getStringValue("trigger", "none"), true);
sm->name = entry_node->getStringValue("name", "none_defined");
@ -141,9 +142,10 @@ SubmodelSystem::load ()
sm->trigger->setBoolValue(false);
sm->timer = sm->delay;
char name[80];
snprintf(name, 80, "/systems/submodels/submodel[%d]/count", i);
fgSetInt(name, sm->count);
sm->prop = fgGetNode("/systems/submodels/submodel", i, true);
sm->prop->tie("count", SGRawValuePointer<int>(&(sm->count)));
submodels.push_back( sm );
}
submodel_iterator = submodels.begin();

1
src/Systems/submodel.hxx
View file

@ -27,6 +27,7 @@ public:
typedef struct {
SGPropertyNode_ptr trigger;
SGPropertyNode_ptr prop;
string name;
string model;
double speed;