AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:47:43 +00:00
Code Issues Projects Releases Wiki Activity

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/Input/ControlMapper.cpp
View File

@@ -258,6 +258,8 @@ static float KBToWASDX(const CKeyboardMouseControllerData& data) {
retval -= 1.0;
if (data.m_charKeys[int('d')])
retval += 1.0;
if (data.m_charKeys[int('w')] ^ data.m_charKeys[int('s')])
retval *= 0.555f;
return retval;
}
@@ -267,6 +269,8 @@ static float KBToWASDY(const CKeyboardMouseControllerData& data) {
retval -= 1.0;
if (data.m_charKeys[int('w')])
retval += 1.0;
if (data.m_charKeys[int('a')] ^ data.m_charKeys[int('d')])
retval *= 0.555f;
return retval;
}
@@ -303,27 +307,27 @@ float ControlMapper::GetAnalogInput(ECommands cmd, const CFinalInput& input) {
case ECommands::LookDown:
case ECommands::OrbitUp:
case ECommands::MapCircleDown:
ret = std::max(ret, KBToWASDY(*kbm) * input.m_leftMul);
ret = std::max(ret, zeus::clamp(-1.f, KBToWASDY(*kbm) * input.m_leftMul, 1.f));
break;
case ECommands::Backward:
case ECommands::LookUp:
case ECommands::OrbitDown:
case ECommands::MapCircleUp:
ret = std::max(ret, -KBToWASDY(*kbm) * input.m_leftMul);
ret = std::max(ret, zeus::clamp(-1.f, -KBToWASDY(*kbm) * input.m_leftMul, 1.f));
break;
case ECommands::TurnLeft:
case ECommands::StrafeLeft:
case ECommands::LookLeft:
case ECommands::OrbitLeft:
case ECommands::MapCircleLeft:
ret = std::max(ret, -KBToWASDX(*kbm) * input.m_leftMul);
ret = std::max(ret, zeus::clamp(-1.f, -KBToWASDX(*kbm) * input.m_leftMul, 1.f));
break;
case ECommands::TurnRight:
case ECommands::StrafeRight:
case ECommands::LookRight:
case ECommands::OrbitRight:
case ECommands::MapCircleRight:
ret = std::max(ret, KBToWASDX(*kbm) * input.m_leftMul);
ret = std::max(ret, zeus::clamp(-1.f, KBToWASDX(*kbm) * input.m_leftMul, 1.f));
break;
case ECommands::MapMoveForward:
ret = std::max(ret, KBToArrowsY(*kbm));