[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28294] trunk/blender/source/gameengine: Added F13 - F19 keys for game engine too.
Matt Ebb
matt at mke3.net
Tue Apr 20 03:04:04 CEST 2010
Revision: 28294
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28294
Author: broken
Date: 2010-04-20 03:04:00 +0200 (Tue, 20 Apr 2010)
Log Message:
-----------
Added F13 - F19 keys for game engine too.
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
trunk/blender/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2010-04-20 00:08:27 UTC (rev 28293)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2010-04-20 01:04:00 UTC (rev 28294)
@@ -199,7 +199,14 @@
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 ;
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp 2010-04-20 00:08:27 UTC (rev 28293)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp 2010-04-20 01:04:00 UTC (rev 28294)
@@ -253,8 +253,16 @@
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;
gReverseKeyTranslateTable[HOMEKEY ] = SCA_IInputDevice::KX_HOMEKEY;
Modified: trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h 2010-04-20 00:08:27 UTC (rev 28293)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h 2010-04-20 01:04:00 UTC (rev 28294)
@@ -230,6 +230,13 @@
KX_F10KEY,
KX_F11KEY,
KX_F12KEY,
+ KX_F13KEY,
+ KX_F14KEY,
+ KX_F15KEY,
+ KX_F16KEY,
+ KX_F17KEY,
+ KX_F18KEY,
+ KX_F19KEY,
KX_PAUSEKEY,
KX_INSERTKEY,
Modified: trunk/blender/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp 2010-04-20 00:08:27 UTC (rev 28293)
+++ trunk/blender/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp 2010-04-20 01:04:00 UTC (rev 28294)
@@ -67,7 +67,7 @@
(((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);
Modified: trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp 2010-04-20 00:08:27 UTC (rev 28293)
+++ trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp 2010-04-20 01:04:00 UTC (rev 28294)
@@ -136,7 +136,14 @@
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 ;
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp 2010-04-20 00:08:27 UTC (rev 28293)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp 2010-04-20 01:04:00 UTC (rev 28294)
@@ -97,7 +97,15 @@
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 ;
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-04-20 00:08:27 UTC (rev 28293)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-04-20 01:04:00 UTC (rev 28294)
@@ -2258,6 +2258,13 @@
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);
More information about the Bf-blender-cvs
mailing list