Revision: 37499
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37499
Author: kupoman
Date: 2011-06-15 06:03:25 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
Cleaning up some duplicate code. Now the reverseTranslateTable for converting
blender key codes to ketsji key codes is only defined in
BL_BlenderDataConverter.
Modified Paths:
--------------
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2011-cucumber/source/gameengine/Converter/KX_ConvertSensors.cpp
Modified:
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
===================================================================
---
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
2011-06-15 05:13:23 UTC (rev 37498)
+++
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
2011-06-15 06:03:25 UTC (rev 37499)
@@ -43,6 +43,7 @@
#include "wm_event_types.h"
#include "WM_types.h"
#include "SCA_IInputDevice.h"
+#include "BL_BlenderDataConversion.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
@@ -53,174 +54,10 @@
*/
class BL_BlenderInputDevice : public SCA_IInputDevice
{
- // this map is Blender specific: a conversion between blender and
ketsji enums
- std::map<int,KX_EnumInputs> m_reverseKeyTranslateTable;
public:
BL_BlenderInputDevice()
- {
-
- /* The reverse table. In order to not confuse
ourselves, we */
- /* immediately convert all events that come in to KX
codes. */
- m_reverseKeyTranslateTable[LEFTMOUSE
] = KX_LEFTMOUSE ;
- m_reverseKeyTranslateTable[MIDDLEMOUSE
] = KX_MIDDLEMOUSE ;
- m_reverseKeyTranslateTable[RIGHTMOUSE
] = KX_RIGHTMOUSE ;
- m_reverseKeyTranslateTable[WHEELUPMOUSE
] = KX_WHEELUPMOUSE ;
- m_reverseKeyTranslateTable[WHEELDOWNMOUSE
] = KX_WHEELDOWNMOUSE ;
- m_reverseKeyTranslateTable[MOUSEX
] = KX_MOUSEX ;
- m_reverseKeyTranslateTable[MOUSEY
] = KX_MOUSEY ;
-
- // TIMERS
-
- m_reverseKeyTranslateTable[TIMER0
] = KX_TIMER0 ;
- m_reverseKeyTranslateTable[TIMER1
] = KX_TIMER1 ;
- m_reverseKeyTranslateTable[TIMER2
] = KX_TIMER2 ;
-
- // SYSTEM
-#if 0
- /* **** XXX **** */
- m_reverseKeyTranslateTable[KEYBD
] = KX_KEYBD ;
- m_reverseKeyTranslateTable[RAWKEYBD
] = KX_RAWKEYBD ;
- m_reverseKeyTranslateTable[REDRAW
] = KX_REDRAW ;
- m_reverseKeyTranslateTable[INPUTCHANGE
] = KX_INPUTCHANGE ;
- m_reverseKeyTranslateTable[QFULL
] = KX_QFULL ;
- m_reverseKeyTranslateTable[WINFREEZE
] = KX_WINFREEZE ;
- m_reverseKeyTranslateTable[WINTHAW
] = KX_WINTHAW ;
- m_reverseKeyTranslateTable[WINCLOSE
] = KX_WINCLOSE ;
- m_reverseKeyTranslateTable[WINQUIT
] = KX_WINQUIT ;
- m_reverseKeyTranslateTable[Q_FIRSTTIME
] = KX_Q_FIRSTTIME ;
- /* **** XXX **** */
-#endif
- // standard keyboard
-
- m_reverseKeyTranslateTable[AKEY
] = KX_AKEY ;
- m_reverseKeyTranslateTable[BKEY
] = KX_BKEY ;
- m_reverseKeyTranslateTable[CKEY
] = KX_CKEY ;
- m_reverseKeyTranslateTable[DKEY
] = KX_DKEY ;
- m_reverseKeyTranslateTable[EKEY
] = KX_EKEY ;
- m_reverseKeyTranslateTable[FKEY
] = KX_FKEY ;
- m_reverseKeyTranslateTable[GKEY
] = KX_GKEY ;
-//XXX clean up
-#ifdef WIN32
-#define HKEY 'h'
-#endif
- m_reverseKeyTranslateTable[HKEY
] = KX_HKEY ;
-//XXX clean up
-#ifdef WIN32
-#undef HKEY
-#endif
- m_reverseKeyTranslateTable[IKEY
] = KX_IKEY ;
- m_reverseKeyTranslateTable[JKEY
] = KX_JKEY ;
- m_reverseKeyTranslateTable[KKEY
] = KX_KKEY ;
- m_reverseKeyTranslateTable[LKEY
] = KX_LKEY ;
- m_reverseKeyTranslateTable[MKEY
] = KX_MKEY ;
- m_reverseKeyTranslateTable[NKEY
] = KX_NKEY ;
- m_reverseKeyTranslateTable[OKEY
] = KX_OKEY ;
- m_reverseKeyTranslateTable[PKEY
] = KX_PKEY ;
- m_reverseKeyTranslateTable[QKEY
] = KX_QKEY ;
- m_reverseKeyTranslateTable[RKEY
] = KX_RKEY ;
- m_reverseKeyTranslateTable[SKEY
] = KX_SKEY ;
- m_reverseKeyTranslateTable[TKEY
] = KX_TKEY ;
- m_reverseKeyTranslateTable[UKEY
] = KX_UKEY ;
- m_reverseKeyTranslateTable[VKEY
] = KX_VKEY ;
- m_reverseKeyTranslateTable[WKEY
] = KX_WKEY ;
- m_reverseKeyTranslateTable[XKEY
] = KX_XKEY ;
- m_reverseKeyTranslateTable[YKEY
] = KX_YKEY ;
- m_reverseKeyTranslateTable[ZKEY
] = KX_ZKEY ;
-
- m_reverseKeyTranslateTable[ZEROKEY
] = KX_ZEROKEY ;
- m_reverseKeyTranslateTable[ONEKEY
] = KX_ONEKEY ;
- m_reverseKeyTranslateTable[TWOKEY
] = KX_TWOKEY ;
- m_reverseKeyTranslateTable[THREEKEY
] = KX_THREEKEY ;
- m_reverseKeyTranslateTable[FOURKEY
] = KX_FOURKEY ;
- m_reverseKeyTranslateTable[FIVEKEY
] = KX_FIVEKEY ;
- m_reverseKeyTranslateTable[SIXKEY
] = KX_SIXKEY ;
- m_reverseKeyTranslateTable[SEVENKEY
] = KX_SEVENKEY ;
- m_reverseKeyTranslateTable[EIGHTKEY
] = KX_EIGHTKEY ;
- m_reverseKeyTranslateTable[NINEKEY
] = KX_NINEKEY ;
-
- m_reverseKeyTranslateTable[CAPSLOCKKEY
] = KX_CAPSLOCKKEY ;
-
- m_reverseKeyTranslateTable[LEFTCTRLKEY
] = KX_LEFTCTRLKEY ;
- m_reverseKeyTranslateTable[LEFTALTKEY
] = KX_LEFTALTKEY ;
- m_reverseKeyTranslateTable[RIGHTALTKEY
] = KX_RIGHTALTKEY ;
- m_reverseKeyTranslateTable[RIGHTCTRLKEY
] = KX_RIGHTCTRLKEY ;
- m_reverseKeyTranslateTable[RIGHTSHIFTKEY
] = KX_RIGHTSHIFTKEY ;
- m_reverseKeyTranslateTable[LEFTSHIFTKEY
] = KX_LEFTSHIFTKEY ;
-
- m_reverseKeyTranslateTable[ESCKEY
] = KX_ESCKEY ;
- m_reverseKeyTranslateTable[TABKEY
] = KX_TABKEY ;
- m_reverseKeyTranslateTable[RETKEY
] = KX_RETKEY ;
- m_reverseKeyTranslateTable[SPACEKEY
] = KX_SPACEKEY ;
- m_reverseKeyTranslateTable[LINEFEEDKEY
] = KX_LINEFEEDKEY ;
- m_reverseKeyTranslateTable[BACKSPACEKEY
] = KX_BACKSPACEKEY ;
- m_reverseKeyTranslateTable[DELKEY
] = KX_DELKEY ;
- m_reverseKeyTranslateTable[SEMICOLONKEY
] = KX_SEMICOLONKEY ;
- m_reverseKeyTranslateTable[PERIODKEY
] = KX_PERIODKEY ;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
