diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-10-16 15:41:50 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-10-16 15:41:50 +0400 |
| commit | 7b2567924b9b86961cd4c07b76653f49939cab1c (patch) | |
| tree | adcf1091db6f3f78c05c6b02c567a9b77fc10092 /source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp | |
| parent | 063982914038ecd578bab7849a1e94cccbb8d8b9 (diff) | |
Switch fixed time system. Logic updates should now happen at 30Hz, physics at 60Hz. (By default, use Python to set.) Some actuators still run at framerate (IPO, Action) for nice smooth animation, and an excuse to buy high end hardware.
Keyboard sensors can now hook escape key. Ctrl-Break can be used from within blender if you've forgotten an end game actuator.
Fixed a stupid bug preventing some actuators working (like TrackTo).
Diffstat (limited to 'source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp')
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp index b128d616209..c6ae91ae282 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp @@ -41,6 +41,7 @@ #include "KX_BlenderKeyboardDevice.h" KX_BlenderKeyboardDevice::KX_BlenderKeyboardDevice() + : m_hookesc(false) { } @@ -108,7 +109,9 @@ bool KX_BlenderKeyboardDevice::ConvertBlenderEvent(unsigned short incode,short v if (val > 0) { - if (kxevent == SCA_IInputDevice::KX_ESCKEY && val != 0) + if (kxevent == KX_ESCKEY && val != 0 && !m_hookesc) + result = true; + if (kxevent == KX_PAUSEKEY && val && (IsPressed(KX_LEFTCTRLKEY) || IsPressed(KX_RIGHTCTRLKEY))) result = true; // todo: convert val ?? @@ -162,3 +165,8 @@ bool KX_BlenderKeyboardDevice::ConvertBlenderEvent(unsigned short incode,short v } return result; } + +void KX_BlenderKeyboardDevice::HookEscape() +{ + m_hookesc = true; +} |