[Bf-blender-cvs] [5fc2fe9] master: Code Cleanup: move MOUSEX/Y to BGE, describe INBETWEEN_MOUSEMOVE

Campbell Barton noreply at git.blender.org
Sat Jan 11 16:01:41 CET 2014


Commit: 5fc2fe9fad1a99d19ffaf4220fe139f8d324ba59
Author: Campbell Barton
Date:   Sun Jan 12 01:59:17 2014 +1100
https://developer.blender.org/rB5fc2fe9fad1a99d19ffaf4220fe139f8d324ba59

Code Cleanup: move MOUSEX/Y to BGE, describe INBETWEEN_MOUSEMOVE

===================================================================

M	source/blender/windowmanager/wm_event_types.h
M	source/gameengine/GameLogic/SCA_IInputDevice.h

===================================================================

diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 08cbd53..b7c1cfa 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 47fdd45..ce7c865 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 
 {




More information about the Bf-blender-cvs mailing list