diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_NDOFManager.h')
-rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h index d0b49bc13c2..7be129c327c 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.h +++ b/intern/ghost/intern/GHOST_NDOFManager.h @@ -130,13 +130,13 @@ class GHOST_NDOFManager { // rotations are + when CCW, - when CW // each platform is responsible for getting axis data into this form // these values should not be scaled (just shuffled or flipped) - void updateTranslation(const int t[3], GHOST_TUns64 time); - void updateRotation(const int r[3], GHOST_TUns64 time); + void updateTranslation(const int t[3], uint64_t time); + void updateRotation(const int r[3], uint64_t time); // the latest raw button data from the device // use HID button encoding (not NDOF_ButtonT) - void updateButton(int button_number, bool press, GHOST_TUns64 time); - void updateButtons(int button_bits, GHOST_TUns64 time); + void updateButton(int button_number, bool press, uint64_t time); + void updateButtons(int button_bits, uint64_t time); // NDOFButton events are sent immediately // processes and sends most recent raw data as an NDOFMotion event @@ -147,8 +147,8 @@ class GHOST_NDOFManager { GHOST_System &m_system; private: - void sendButtonEvent(NDOF_ButtonT, bool press, GHOST_TUns64 time, GHOST_IWindow *); - void sendKeyEvent(GHOST_TKey, bool press, GHOST_TUns64 time, GHOST_IWindow *); + void sendButtonEvent(NDOF_ButtonT, bool press, uint64_t time, GHOST_IWindow *); + void sendKeyEvent(GHOST_TKey, bool press, uint64_t time, GHOST_IWindow *); NDOF_DeviceT m_deviceType; int m_buttonCount; @@ -159,8 +159,8 @@ class GHOST_NDOFManager { int m_rotation[3]; int m_buttons; // bit field - GHOST_TUns64 m_motionTime; // in milliseconds - GHOST_TUns64 m_prevMotionTime; // time of most recent Motion event sent + uint64_t m_motionTime; // in milliseconds + uint64_t m_prevMotionTime; // time of most recent Motion event sent GHOST_TProgress m_motionState; bool m_motionEventPending; |