diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-01-11 18:59:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-11 18:59:17 +0400 |
commit | 5fc2fe9fad1a99d19ffaf4220fe139f8d324ba59 (patch) | |
tree | cd77330ac3647380ffb2753e9d21d685984f19e8 | |
parent | 50650e28ea5641b200727fcbe14de83fa10e2c49 (diff) |
Code Cleanup: move MOUSEX/Y to BGE, describe INBETWEEN_MOUSEMOVE
-rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 6 | ||||
-rw-r--r-- | source/gameengine/GameLogic/SCA_IInputDevice.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 08cbd535262..b7c1cfa5654 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -46,9 +46,6 @@ #define EVT_TABLET_STYLUS 1 #define EVT_TABLET_ERASER 2 -#define MOUSEX 4 -#define MOUSEY 5 - /* *** wmEvent.type *** */ @@ -78,6 +75,9 @@ /* mapped with userdef */ #define WHEELINMOUSE 12 #define WHEELOUTMOUSE 13 + /* Successive MOUSEMOVE's are converted to this, so we can easily + * ignore all but the most recent MOUSEMOVE (for better performance), + * paint and drawing tools however will want to handle these. */ #define INBETWEEN_MOUSEMOVE 17 diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index 47fdd45c78b..ce7c8650ee5 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -62,6 +62,10 @@ public: int m_eventval; }; +/* Originally from wm_event_types.h, now only used by GameEngine */ +#define MOUSEX MOUSEMOVE +#define MOUSEY ACTIONMOUSE + class SCA_IInputDevice { |