diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2010-08-10 12:45:52 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-08-10 15:04:18 +0100 |
| commit | da425afd6199995ac7b6f23bf8744a435cc02e23 (patch) | |
| tree | 8d92f683714eeda226aac2499b82a484fae3c137 /src/grail-gestures.h | |
| parent | 7be96df1c903c11711336c5ad1859b347ae4b661 (diff) | |
Add property declarations to grail-types
Also add accumulated values for delta and velocity properties.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/grail-gestures.h')
| -rw-r--r-- | src/grail-gestures.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/grail-gestures.h b/src/grail-gestures.h index 6846ed0..658b548 100644 --- a/src/grail-gestures.h +++ b/src/grail-gestures.h | |||
| @@ -39,10 +39,13 @@ | |||
| 39 | struct filter_model { | 39 | struct filter_model { |
| 40 | float raw_delta; | 40 | float raw_delta; |
| 41 | float action_delta; | 41 | float action_delta; |
| 42 | float velocity; | ||
| 42 | float value; | 43 | float value; |
| 43 | float original; | 44 | float original; |
| 44 | float fuzz; | 45 | float fuzz; |
| 45 | float bar; | 46 | float bar; |
| 47 | float sample; | ||
| 48 | grail_time_t sample_ms; | ||
| 46 | }; | 49 | }; |
| 47 | 50 | ||
| 48 | struct move_model { | 51 | struct move_model { |
| @@ -58,9 +61,14 @@ void gru_motion(struct grail *ge, | |||
| 58 | void gru_event(struct grail *ge, int gid, | 61 | void gru_event(struct grail *ge, int gid, |
| 59 | const struct move_model *move, | 62 | const struct move_model *move, |
| 60 | const grail_prop_t *prop, int nprop); | 63 | const grail_prop_t *prop, int nprop); |
| 64 | void gru_end(struct grail *ge, int gid, | ||
| 65 | const struct move_model *move, | ||
| 66 | const grail_prop_t *prop, int nprop); | ||
| 61 | 67 | ||
| 62 | struct combo_model { | 68 | struct combo_model { |
| 63 | int active, gid; | 69 | int active, gid; |
| 70 | int nprop; | ||
| 71 | grail_prop_t prop[DIM_GRAIL_PROP]; | ||
| 64 | }; | 72 | }; |
| 65 | 73 | ||
| 66 | int gru_drag(struct grail *ge, | 74 | int gru_drag(struct grail *ge, |
