#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/props/props.hxx>
#include <Aircraft/aircraft.hxx>
#include <Autopilot/auto_gui.hxx>
{
const SGPropertyNode * conditionNode = node->getChild("condition");
if (conditionNode != 0)
- setCondition(fgReadCondition(conditionNode));
+ setCondition(sgReadCondition(globals->get_props(), conditionNode));
_command_name = node->getStringValue("command", "");
if (_command_name.empty()) {
// Implementation of FGInput.
////////////////////////////////////////////////////////////////////////
- // From main.cxx
-extern void fgReshape( int width, int height );
-
FGInput::FGInput ()
{
glutPassiveMotionFunc (GLUTmotion);
}
+void
+FGInput::update (double dt)
+{
+ _update_keyboard();
+ _update_joystick(dt);
+ _update_mouse();
+}
+
void
-FGInput::bind ()
+FGInput::suspend ()
{
- // no op
+ // NO-OP
}
void
-FGInput::unbind ()
+FGInput::resume ()
{
- // no op
+ // NO-OP
}
-void
-FGInput::update (double dt)
+bool
+FGInput::is_suspended () const
{
- _update_keyboard();
- _update_joystick();
- _update_mouse();
+ return false;
}
void
if (mode.pass_through) {
if (puMouse(b, updown, x, y))
return;
- else if ((current_panel != 0) &&
- current_panel->getVisibility() &&
- current_panel->doMouseAction(b, updown, x, y))
+ else if ((globals->get_current_panel() != 0) &&
+ globals->get_current_panel()->getVisibility() &&
+ globals->get_current_panel()->doMouseAction(b, updown, x, y))
return;
else if (fgHandle3DPanelMouseEvent(b, updown, x, y))
return;
_init_button(axis_node->getChild("high"), a.high, "high");
a.high_threshold = axis_node->getDoubleValue("high-threshold", 0.9);
+ a.interval_sec = axis_node->getDoubleValue("interval-sec",0.0);
+ a.last_dt = 0.0;
}
//
_init_button(js_node->getChild("button", j),
_joystick_bindings[i].buttons[j],
buf);
-
+
+ // get interval-sec property
+ button &b = _joystick_bindings[i].buttons[j];
+ const SGPropertyNode * button_node = js_node->getChild("button", j);
+ if (button_node != 0) {
+ b.interval_sec = button_node->getDoubleValue("interval-sec",0.0);
+ b.last_dt = 0.0;
+ }
}
js->setMinRange(minRange);
void
-FGInput::_update_joystick ()
+FGInput::_update_joystick (double dt)
{
int modifiers = FG_MOD_NONE; // FIXME: any way to get the real ones?
int buttons;
}
// do we have to emulate axis buttons?
- if (a.low.bindings[modifiers].size())
- _update_button(_joystick_bindings[i].axes[j].low,
- modifiers,
- axis_values[j] < a.low_threshold,
- -1, -1);
+ a.last_dt += dt;
+ if(a.last_dt >= a.interval_sec) {
+ if (a.low.bindings[modifiers].size())
+ _update_button(_joystick_bindings[i].axes[j].low,
+ modifiers,
+ axis_values[j] < a.low_threshold,
+ -1, -1);
- if (a.high.bindings[modifiers].size())
- _update_button(_joystick_bindings[i].axes[j].high,
- modifiers,
- axis_values[j] > a.high_threshold,
- -1, -1);
+ if (a.high.bindings[modifiers].size())
+ _update_button(_joystick_bindings[i].axes[j].high,
+ modifiers,
+ axis_values[j] > a.high_threshold,
+ -1, -1);
+ a.last_dt -= a.interval_sec;
+ }
}
// Fire bindings for the buttons.
for (j = 0; j < _joystick_bindings[i].nbuttons; j++) {
- _update_button(_joystick_bindings[i].buttons[j],
- modifiers,
- (buttons & (1 << j)) > 0,
- -1, -1);
+ button &b = _joystick_bindings[i].buttons[j];
+ b.last_dt += dt;
+ if(b.last_dt >= b.interval_sec) {
+ _update_button(_joystick_bindings[i].buttons[j],
+ modifiers,
+ (buttons & (1 << j)) > 0,
+ -1, -1);
+ b.last_dt -= b.interval_sec;
+ }
}
}
}