GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add scaling factors for input actions

Browse Source
This commit is contained in:
GeorgH93
2023-10-16 13:44:55 +02:00
parent 68fb6d0910
commit 5b404efa74
3 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
openVulkanoCpp/Input/InputManager.cpp
View File

@@ -36,13 +36,15 @@ namespace OpenVulkano::Input
const std::vector<InputDevice*>& testDevices = action->GetDevices().empty() ? devices : action->GetDevices();
for (const InputDevice* device : testDevices)
{
for(InputKey key : action->GetKeys())
for(KeyBinding binding : action->GetKeys())
{
value += device->GetAxis(key);
if (binding.key.GetInputDeviceType() != device->GetType()) continue;
value += device->GetAxis(binding.key) * binding.scale;
}
for(const auto& keys : action->GetAxisButtons())
for(const auto& binding : action->GetAxisButtons())
{
value += GetAxis(keys.first) - GetAxis(keys.second);
if (binding.positive.GetInputDeviceType() != device->GetType()) continue;
value += (GetAxis(binding.positive) - GetAxis(binding.negative)) * binding.scale;
}
}
return value;
@@ -53,6 +55,7 @@ namespace OpenVulkano::Input
float value = 0;
for (const InputDevice* device : devices)
{
if (key.GetInputDeviceType() != device->GetType()) continue;
value += device->GetAxis(key);
}
return value;
@@ -63,9 +66,10 @@ namespace OpenVulkano::Input
const std::vector<InputDevice*>& testDevices = action->GetDevices().empty() ? devices : action->GetDevices();
for (const InputDevice* device : testDevices)
{
for (const InputKey key : action->GetKeys())
for (const KeyBinding binding : action->GetKeys())
{
if (device->GetButton(key)) return true;
if (binding.key.GetInputDeviceType() != device->GetType()) continue;
if (device->GetButton(binding.key)) return true;
}
}
return false;
@@ -75,6 +79,7 @@ namespace OpenVulkano::Input
{
for(const InputDevice* device : devices)
{
if (key.GetInputDeviceType() != device->GetType()) continue;
if (device->GetButton(key)) return true;
}
return false;