[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57593] trunk/blender/source/gameengine: BGE: Fix for [#35479] "OSKEY (Command Key on Mac) not working" reported by Mike Pan (mpan3).

[Mitchell Stokes]

Revision: 57593
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57593
Author:   moguri
Date:     2013-06-20 03:22:55 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
BGE: Fix for [#35479] "OSKEY (Command Key on Mac) not working" reported by Mike Pan (mpan3).

The OSKEY was never added to the game engine, so it didn't recognize it.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-06-20 01:23:59 UTC (rev 57592)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-06-20 03:22:55 UTC (rev 57593)
@@ -358,8 +358,9 @@
 	m[F17KEY			] = SCA_IInputDevice::KX_F17KEY;
 	m[F18KEY			] = SCA_IInputDevice::KX_F18KEY;
 	m[F19KEY			] = SCA_IInputDevice::KX_F19KEY;
-		
-		
+
+	m[OSKEY				] = SCA_IInputDevice::KX_OSKEY;
+
 	m[PAUSEKEY			] = SCA_IInputDevice::KX_PAUSEKEY;                  
 	m[INSERTKEY			] = SCA_IInputDevice::KX_INSERTKEY;                  
 	m[HOMEKEY			] = SCA_IInputDevice::KX_HOMEKEY;                  

Modified: trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h	2013-06-20 01:23:59 UTC (rev 57592)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h	2013-06-20 03:22:55 UTC (rev 57593)
@@ -238,6 +238,8 @@
 		KX_F17KEY,
 		KX_F18KEY,
 		KX_F19KEY,
+
+		KX_OSKEY,
 		
 		KX_PAUSEKEY,
 		KX_INSERTKEY,

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp	2013-06-20 01:23:59 UTC (rev 57592)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp	2013-06-20 03:22:55 UTC (rev 57593)
@@ -147,6 +147,8 @@
 	m_reverseKeyTranslateTable[GHOST_kKeyLeftBracket           ] = KX_LEFTBRACKETKEY           ;
 	m_reverseKeyTranslateTable[GHOST_kKeyRightBracket          ] = KX_RIGHTBRACKETKEY          ;
 
+	m_reverseKeyTranslateTable[GHOST_kKeyOS                    ] = KX_OSKEY                    ;
+
 	// Modifier keys.
 	m_reverseKeyTranslateTable[GHOST_kKeyLeftControl           ] = KX_LEFTCTRLKEY              ;
 	m_reverseKeyTranslateTable[GHOST_kKeyRightControl          ] = KX_RIGHTCTRLKEY             ;

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2013-06-20 01:23:59 UTC (rev 57592)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2013-06-20 03:22:55 UTC (rev 57593)
@@ -2415,6 +2415,8 @@
 	KX_MACRO_addTypesToDict(d, F17KEY, SCA_IInputDevice::KX_F17KEY);
 	KX_MACRO_addTypesToDict(d, F18KEY, SCA_IInputDevice::KX_F18KEY);
 	KX_MACRO_addTypesToDict(d, F19KEY, SCA_IInputDevice::KX_F19KEY);
+
+	KX_MACRO_addTypesToDict(d, OSKEY, SCA_IInputDevice::KX_OSKEY);
 		
 	KX_MACRO_addTypesToDict(d, PAUSEKEY,  SCA_IInputDevice::KX_PAUSEKEY);
 	KX_MACRO_addTypesToDict(d, INSERTKEY, SCA_IInputDevice::KX_INSERTKEY);