fly/flightgear
1
0
Fork 0
Code Activity

- FGBinding now extends FGConditional

Browse source 
- switched to a vector of binding pointers, to avoid copying
- removed FGBinding copy constructor declaration
This commit is contained in:
curt 2001-08-03 00:19:19 +00:00
parent dd440e7829
commit cd6683bdb5
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Input/input.hxx
View file

@ -51,7 +51,7 @@ SG_USING_STD(vector);
* keyboard key, a joystick button or axis, or even a panel
* instrument.</p>
*/
class FGBinding
class FGBinding : public FGConditional
{
public:
@ -61,12 +61,6 @@ public:
FGBinding ();
/**
* Copy constructor.
*/
FGBinding (const FGBinding &binding);
/**
* Convenience constructor.
*
@ -206,7 +200,7 @@ private:
};
typedef vector<FGBinding> binding_list_t;
typedef vector<FGBinding *> binding_list_t;
/**
* Settings for a key or button.
@ -216,6 +210,11 @@ private:
: is_repeatable(false),
last_state(-1)
{}
virtual ~button () {
for (int i = 0; i < FG_MOD_MAX; i++)
for (int j = 0; i < bindings[i].size(); j++)
delete bindings[i][j];
}
bool is_repeatable;
int last_state;
binding_list_t bindings[FG_MOD_MAX];
@ -232,6 +231,11 @@ private:
low_threshold(-0.9),
high_threshold(0.9)
{}
virtual ~axis () {
for (int i = 0; i < FG_MOD_MAX; i++)
for (int j = 0; i < bindings[i].size(); j++)
delete bindings[i][j];
}
float last_value;
float tolerance;
binding_list_t bindings[FG_MOD_MAX];
@ -307,7 +311,8 @@ private:
/**
* Look up the bindings for a key code.
*/
const vector<FGBinding> &_find_key_bindings (unsigned int k, int modifiers);
const vector<FGBinding *> &_find_key_bindings (unsigned int k,
int modifiers);
button _key_bindings[MAX_KEYS];
joystick _joystick_bindings[MAX_JOYSTICKS];