Added F13 - F19 keys for game engine too.
authorMatt Ebb <matt@mke3.net>
Tue, 20 Apr 2010 01:04:00 +0000 (01:04 +0000)
committerMatt Ebb <matt@mke3.net>
Tue, 20 Apr 2010 01:04:00 +0000 (01:04 +0000)
source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/GameLogic/SCA_IInputDevice.h
source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp

index 9345d6a92845e38b42af85e1540139e982ffea5a..67cd901a0e5f3e3f717a265496d03e4a47b92896 100644 (file)
@@ -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               ;                  
index 63f4a7bd8bc1884e93cd60cdc9d4d9c18f17cecc..d65fee93a12c1c2ff9fc2ec527c6d62f2311325f 100644 (file)
@@ -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;                  
index b49168f325bbd0fedf43a9048068bde6c193b8f1..a72c48a57e9dea9a79c11ab111f7d58df9c1b787 100644 (file)
@@ -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,
index 570c1fc170dedf1388363db17dc877499dfb0e38..5444cf22ac9220d7f2aed602f92cef85f633cac5 100644 (file)
@@ -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);
index 465d8914ebc653b819afa8dbb682ccb26e60221b..7e8a50915c8c09d8d8b03d0b485ee01f60e3071b 100644 (file)
@@ -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                     ;                  
index 009c5327f55f9b1e97e9e5b6286ba2c01867a2b1..2e9810ad0ae50130b98126edcd5527565036a4d8 100644 (file)
@@ -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                     ;                  
index 675cf3c09f6d046f412e1c1bfdb5477c91057ddf..f47c168d745f36bc947724352daa52c3f3874aa8 100644 (file)
@@ -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);