archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BGE: Fix for [#35479] "OSKEY (Command Key on Mac) not working" reported by Mike Pan (mpan3).

Browse Source 
The OSKEY was never added to the game engine, so it didn't recognize it.
This commit is contained in:
Mitchell Stokes
2013-06-20 03:22:55 +00:00
parent c00b408052
commit 4eded6dbdc
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@@ -359,6 +359,7 @@ static std::map<int, SCA_IInputDevice::KX_EnumInputs> create_translate_table()
m[F18KEY ] = SCA_IInputDevice::KX_F18KEY; m[F18KEY ] = SCA_IInputDevice::KX_F18KEY;
m[F19KEY ] = SCA_IInputDevice::KX_F19KEY; m[F19KEY ] = SCA_IInputDevice::KX_F19KEY;
m[OSKEY ] = SCA_IInputDevice::KX_OSKEY;
m[PAUSEKEY ] = SCA_IInputDevice::KX_PAUSEKEY; m[PAUSEKEY ] = SCA_IInputDevice::KX_PAUSEKEY;
m[INSERTKEY ] = SCA_IInputDevice::KX_INSERTKEY; m[INSERTKEY ] = SCA_IInputDevice::KX_INSERTKEY;

2
source/gameengine/GameLogic/SCA_IInputDevice.h
View File

@@ -239,6 +239,8 @@ public:
KX_F18KEY, KX_F18KEY,
KX_F19KEY, KX_F19KEY,
KX_OSKEY,
KX_PAUSEKEY, KX_PAUSEKEY,
KX_INSERTKEY, KX_INSERTKEY,
KX_HOMEKEY , KX_HOMEKEY ,

2
source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
View File

@@ -147,6 +147,8 @@ GPG_KeyboardDevice::GPG_KeyboardDevice(void)
m_reverseKeyTranslateTable[GHOST_kKeyLeftBracket ] = KX_LEFTBRACKETKEY ; m_reverseKeyTranslateTable[GHOST_kKeyLeftBracket ] = KX_LEFTBRACKETKEY ;
m_reverseKeyTranslateTable[GHOST_kKeyRightBracket ] = KX_RIGHTBRACKETKEY ; m_reverseKeyTranslateTable[GHOST_kKeyRightBracket ] = KX_RIGHTBRACKETKEY ;
m_reverseKeyTranslateTable[GHOST_kKeyOS ] = KX_OSKEY ;
// Modifier keys. // Modifier keys.
m_reverseKeyTranslateTable[GHOST_kKeyLeftControl ] = KX_LEFTCTRLKEY ; m_reverseKeyTranslateTable[GHOST_kKeyLeftControl ] = KX_LEFTCTRLKEY ;
m_reverseKeyTranslateTable[GHOST_kKeyRightControl ] = KX_RIGHTCTRLKEY ; m_reverseKeyTranslateTable[GHOST_kKeyRightControl ] = KX_RIGHTCTRLKEY ;

2
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@@ -2416,6 +2416,8 @@ PyObject *initGameKeys()
KX_MACRO_addTypesToDict(d, F18KEY, SCA_IInputDevice::KX_F18KEY); KX_MACRO_addTypesToDict(d, F18KEY, SCA_IInputDevice::KX_F18KEY);
KX_MACRO_addTypesToDict(d, F19KEY, SCA_IInputDevice::KX_F19KEY); 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, PAUSEKEY, SCA_IInputDevice::KX_PAUSEKEY);
KX_MACRO_addTypesToDict(d, INSERTKEY, SCA_IInputDevice::KX_INSERTKEY); KX_MACRO_addTypesToDict(d, INSERTKEY, SCA_IInputDevice::KX_INSERTKEY);
KX_MACRO_addTypesToDict(d, HOMEKEY, SCA_IInputDevice::KX_HOMEKEY); KX_MACRO_addTypesToDict(d, HOMEKEY, SCA_IInputDevice::KX_HOMEKEY);