diff options
author | Mike Erwin <significant.bit@gmail.com> | 2010-07-22 11:23:41 +0400 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2010-07-22 11:23:41 +0400 |
commit | 6c2dee0198fed174a55f65685d4e01752c987547 (patch) | |
tree | 32bce83f10e0b0004e3ff8e4cda88d09a9cd7f39 /intern/ghost/GHOST_Types.h | |
parent | f0167c6a4117df275f85ce466c2067e0eda0e0e8 (diff) |
revamped NDOF event system for ghost, added (untested) Mac support
Diffstat (limited to 'intern/ghost/GHOST_Types.h')
-rw-r--r-- | intern/ghost/GHOST_Types.h | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 4ec8e22a960..66bfa0e469f 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -154,7 +154,8 @@ typedef enum { GHOST_kEventTrackpad, /// Trackpad event GHOST_kEventNDOFMotion, /// N degree of freedom device motion event - GHOST_kEventNDOFButton, /// N degree of freedom device button event + GHOST_kEventNDOFButtonDown,/// N degree of freedom device button events + GHOST_kEventNDOFButtonUp, GHOST_kEventKeyDown, GHOST_kEventKeyUp, @@ -432,17 +433,17 @@ typedef struct { // float dt; //} GHOST_TEventNDOFData; -typedef struct { - /** N-degree of freedom device data v2*/ - int changed; - GHOST_TUns64 client; - GHOST_TUns64 address; - GHOST_TInt16 tx, ty, tz; /** -x left, +y up, +z forward */ - GHOST_TInt16 rx, ry, rz; - GHOST_TInt16 buttons; - GHOST_TUns64 time; - GHOST_TUns64 delta; -} GHOST_TEventNDOFData; +// typedef struct { +// /** N-degree of freedom device data v2*/ +// int changed; +// GHOST_TUns64 client; +// GHOST_TUns64 address; +// GHOST_TInt16 tx, ty, tz; /** -x left, +y up, +z forward */ +// GHOST_TInt16 rx, ry, rz; +// GHOST_TInt16 buttons; +// GHOST_TUns64 time; +// GHOST_TUns64 delta; +// } GHOST_TEventNDOFData; typedef struct { /** N-degree of freedom device data v3 [GSoC 2010]*/ @@ -454,13 +455,8 @@ typedef struct { float tx, ty, tz; /** -x left, +y forward, -z up */ float rx, ry, rz; - GHOST_TInt16 buttons; -} GHOST_TEventNDOFData_3; +} GHOST_TEventNDOFData; -// [mce] consider scrapping these, in favor of built-in SpaceNav handling. -typedef int (*GHOST_NDOFLibraryInit_fp)(); -typedef void (*GHOST_NDOFLibraryShutdown_fp)(void* deviceHandle); -typedef void* (*GHOST_NDOFDeviceOpen_fp)(void* platformData); typedef struct { /** The key code. */ |