From 45abe2baf2a730458751bd50f4bf10f9f36b2977 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Tue, 20 Apr 2010 01:04:00 +0000 Subject: Added F13 - F19 keys for game engine too. --- source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h | 9 ++++++++- source/gameengine/Converter/KX_ConvertSensors.cpp | 10 +++++++++- source/gameengine/GameLogic/SCA_IInputDevice.h | 7 +++++++ .../gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp | 2 +- .../GamePlayer/common/windows/GPW_KeyboardDevice.cpp | 9 ++++++++- source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp | 10 +++++++++- source/gameengine/Ketsji/KX_PythonInit.cpp | 7 +++++++ 7 files changed, 49 insertions(+), 5 deletions(-) (limited to 'source') diff --git a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h index 9345d6a9284..67cd901a0e5 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h @@ -199,7 +199,14 @@ public: m_reverseKeyTranslateTable[F9KEY ] = KX_F9KEY ; m_reverseKeyTranslateTable[F10KEY ] = KX_F10KEY ; m_reverseKeyTranslateTable[F11KEY ] = KX_F11KEY ; - m_reverseKeyTranslateTable[F12KEY ] = KX_F12KEY ; + m_reverseKeyTranslateTable[F12KEY ] = KX_F12KEY ; + m_reverseKeyTranslateTable[F13KEY ] = KX_F13KEY ; + m_reverseKeyTranslateTable[F14KEY ] = KX_F14KEY ; + m_reverseKeyTranslateTable[F15KEY ] = KX_F15KEY ; + m_reverseKeyTranslateTable[F16KEY ] = KX_F16KEY ; + m_reverseKeyTranslateTable[F17KEY ] = KX_F17KEY ; + m_reverseKeyTranslateTable[F18KEY ] = KX_F18KEY ; + m_reverseKeyTranslateTable[F19KEY ] = KX_F19KEY ; m_reverseKeyTranslateTable[PAUSEKEY ] = KX_PAUSEKEY ; m_reverseKeyTranslateTable[INSERTKEY ] = KX_INSERTKEY ; diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp index 63f4a7bd8bc..d65fee93a12 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.cpp +++ b/source/gameengine/Converter/KX_ConvertSensors.cpp @@ -253,7 +253,15 @@ void BL_ConvertSensors(struct Object* blenderobject, gReverseKeyTranslateTable[F9KEY ] = SCA_IInputDevice::KX_F9KEY; gReverseKeyTranslateTable[F10KEY ] = SCA_IInputDevice::KX_F10KEY; gReverseKeyTranslateTable[F11KEY ] = SCA_IInputDevice::KX_F11KEY; - gReverseKeyTranslateTable[F12KEY ] = SCA_IInputDevice::KX_F12KEY; + gReverseKeyTranslateTable[F12KEY ] = SCA_IInputDevice::KX_F12KEY; + gReverseKeyTranslateTable[F13KEY ] = SCA_IInputDevice::KX_F13KEY; + gReverseKeyTranslateTable[F14KEY ] = SCA_IInputDevice::KX_F14KEY; + gReverseKeyTranslateTable[F15KEY ] = SCA_IInputDevice::KX_F15KEY; + gReverseKeyTranslateTable[F16KEY ] = SCA_IInputDevice::KX_F16KEY; + gReverseKeyTranslateTable[F17KEY ] = SCA_IInputDevice::KX_F17KEY; + gReverseKeyTranslateTable[F18KEY ] = SCA_IInputDevice::KX_F18KEY; + gReverseKeyTranslateTable[F19KEY ] = SCA_IInputDevice::KX_F19KEY; + gReverseKeyTranslateTable[PAUSEKEY ] = SCA_IInputDevice::KX_PAUSEKEY; gReverseKeyTranslateTable[INSERTKEY ] = SCA_IInputDevice::KX_INSERTKEY; diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index b49168f325b..a72c48a57e9 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -230,6 +230,13 @@ public: KX_F10KEY, KX_F11KEY, KX_F12KEY, + KX_F13KEY, + KX_F14KEY, + KX_F15KEY, + KX_F16KEY, + KX_F17KEY, + KX_F18KEY, + KX_F19KEY, KX_PAUSEKEY, KX_INSERTKEY, diff --git a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp index 570c1fc170d..5444cf22ac9 100644 --- a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp @@ -67,7 +67,7 @@ GPU_KeyboardDevice::GPU_KeyboardDevice(void) (((int)SCA_IInputDevice::KX_ZEROKEY) + i - XK_0); } - for (i = XK_F1; i< XK_F12; i++) { + for (i = XK_F1; i< XK_F19; i++) { m_reverseKeyTranslateTable[i] = (SCA_IInputDevice::KX_EnumInputs) (((int)SCA_IInputDevice::KX_F1KEY) + i - XK_F1); diff --git a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp index 465d8914ebc..7e8a50915c8 100644 --- a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp @@ -136,7 +136,14 @@ GPW_KeyboardDevice::GPW_KeyboardDevice(void) m_reverseKeyTranslateTable[VK_F9 ] = KX_F9KEY ; m_reverseKeyTranslateTable[VK_F10 ] = KX_F10KEY ; m_reverseKeyTranslateTable[VK_F11 ] = KX_F11KEY ; - m_reverseKeyTranslateTable[VK_F12 ] = KX_F12KEY ; + m_reverseKeyTranslateTable[VK_F12 ] = KX_F12KEY ; + m_reverseKeyTranslateTable[VK_F13 ] = KX_F13KEY ; + m_reverseKeyTranslateTable[VK_F14 ] = KX_F14KEY ; + m_reverseKeyTranslateTable[VK_F15 ] = KX_F15KEY ; + m_reverseKeyTranslateTable[VK_F16 ] = KX_F16KEY ; + m_reverseKeyTranslateTable[VK_F17 ] = KX_F17KEY ; + m_reverseKeyTranslateTable[VK_F18 ] = KX_F18KEY ; + m_reverseKeyTranslateTable[VK_F19 ] = KX_F19KEY ; // Numpad keys m_reverseKeyTranslateTable[VK_NUMPAD0 ] = KX_PAD0 ; diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp index 009c5327f55..2e9810ad0ae 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp @@ -97,7 +97,15 @@ GPG_KeyboardDevice::GPG_KeyboardDevice(void) m_reverseKeyTranslateTable[GHOST_kKeyF9 ] = KX_F9KEY ; m_reverseKeyTranslateTable[GHOST_kKeyF10 ] = KX_F10KEY ; m_reverseKeyTranslateTable[GHOST_kKeyF11 ] = KX_F11KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF12 ] = KX_F12KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF12 ] = KX_F12KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF13 ] = KX_F13KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF14 ] = KX_F14KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF15 ] = KX_F15KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF16 ] = KX_F16KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF17 ] = KX_F17KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF18 ] = KX_F18KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF19 ] = KX_F19KEY ; + // Numpad keys m_reverseKeyTranslateTable[GHOST_kKeyNumpad0 ] = KX_PAD0 ; diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 675cf3c09f6..f47c168d745 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -2258,6 +2258,13 @@ PyObject* initGameKeys() KX_MACRO_addTypesToDict(d, F10KEY, SCA_IInputDevice::KX_F10KEY); KX_MACRO_addTypesToDict(d, F11KEY, SCA_IInputDevice::KX_F11KEY); KX_MACRO_addTypesToDict(d, F12KEY, SCA_IInputDevice::KX_F12KEY); + KX_MACRO_addTypesToDict(d, F13KEY, SCA_IInputDevice::KX_F13KEY); + KX_MACRO_addTypesToDict(d, F14KEY, SCA_IInputDevice::KX_F14KEY); + KX_MACRO_addTypesToDict(d, F15KEY, SCA_IInputDevice::KX_F15KEY); + KX_MACRO_addTypesToDict(d, F16KEY, SCA_IInputDevice::KX_F16KEY); + 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, PAUSEKEY, SCA_IInputDevice::KX_PAUSEKEY); KX_MACRO_addTypesToDict(d, INSERTKEY, SCA_IInputDevice::KX_INSERTKEY); -- cgit v1.2.3