TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made sure the old code was still there for non-SDL usage.

Browse source
This commit is contained in:
Areloch 2017-01-29 04:12:32 -06:00
parent a8f2fc567b
commit 48bd911dcb
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Engine/source/windowManager/windowInputGenerator.cpp
View file

@ -145,7 +145,11 @@ void WindowInputGenerator::handleMouseMove( WindowId did, U32 modifier, S32 x, S
event.deviceType = MouseDeviceType;
event.deviceInst = 0;
event.objType = SI_AXIS;
event.modifier = modifier;
#ifdef TORQUE_SDL
event.modifier = modifier;
#else
event.modifier = convertModifierBits(modifier);
#endif
event.ascii = 0;
// Generate delta movement along each axis
@ -231,7 +235,11 @@ void WindowInputGenerator::handleMouseButton( WindowId did, U32 modifiers, U32 a
event.deviceInst = 0;
event.objType = SI_BUTTON;
event.objInst = (InputObjectInstances)(KEY_BUTTON0 + button);
event.modifier = modifiers;
#ifdef TORQUE_SDL
event.modifier = modifiers;
#else
event.modifier = convertModifierBits(modifiers);
#endif
event.ascii = 0;
event.action = (action==IA_MAKE) ? SI_MAKE : SI_BREAK;
event.fValue = (action==IA_MAKE) ? 1.0 : 0.0;
@ -248,7 +256,11 @@ void WindowInputGenerator::handleMouseWheel( WindowId did, U32 modifiers, S32 wh
event.deviceType = MouseDeviceType;
event.deviceInst = 0;
event.objType = SI_AXIS;
event.modifier = modifiers;
#ifdef TORQUE_SDL
event.modifier = modifiers;
#else
event.modifier = convertModifierBits(modifiers);
#endif
event.ascii = 0;
event.action = SI_MOVE;
@ -281,7 +293,11 @@ void WindowInputGenerator::handleCharInput( WindowId did, U32 modifier, U16 key
event.deviceInst = 0;
event.objType = SI_KEY;
event.objInst = KEY_NULL;
event.modifier = modifier;
#ifdef TORQUE_SDL
event.modifier = modifier;
#else
event.modifier = convertModifierBits(modifier);
#endif
event.ascii = key;
event.action = SI_MAKE;
event.fValue = 1.0;
@ -303,7 +319,11 @@ void WindowInputGenerator::handleKeyboard( WindowId did, U32 modifier, U32 actio
event.deviceInst = 0;
event.objType = SI_KEY;
event.objInst = (InputObjectInstances)key;
#ifdef TORQUE_SDL
event.modifier = modifier;
#else
event.modifier = convertModifierBits(modifier);
#endif
event.ascii = 0;
switch(action)