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

Refactoring of Input Devices

Browse Source
This commit is contained in:
GeorgH93
2021-08-30 19:28:43 +02:00
parent e5ccf0879c
commit 20ecb4f1a3
7 changed files with 114 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openVulkanoCpp/Host/GLFW/InputDeviceGLFW.cpp
View File

@@ -5,6 +5,7 @@
*/
#include "InputDeviceGLFW.hpp"
#include "Base/Logger.hpp"
#include <GLFW/glfw3.h>
namespace openVulkanoCpp::GLFW

1
openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp
View File

@@ -7,6 +7,7 @@
#include "InputProviderGLFW.hpp"
#include "InputMappingGLFW.hpp"
#include "Input/InputManager.hpp"
#include "Base/Logger.hpp"
#include <GLFW/glfw3.h>
static_assert(GLFW_JOYSTICK_LAST == 15); // if this fails, please update it and resize the controllers array accordingly as GLFW_JOYSTICK_LAST + 1

1
openVulkanoCpp/Host/GLFW/PlatformGLFW.cpp
View File

@@ -7,6 +7,7 @@
#include "PlatformGLFW.hpp"
#include "WindowGLFW.hpp"
#include "Base/PlatformEnums.hpp"
#include "Base/Logger.hpp"
#include "Host/PlatformProducer.hpp"
#include <GLFW/glfw3.h>

2
openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp
View File

@@ -8,6 +8,8 @@
#include "Base/IPlatform.hpp"
#include "InputProviderGLFW.hpp"
#include <memory>
#include <vector>
namespace openVulkanoCpp
{

26
openVulkanoCpp/Input/InputDeviceController.cpp Normal file
View File

@@ -0,0 +1,26 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#include "InputDeviceController.hpp"
#include "Base/Logger.hpp"
namespace openVulkanoCpp::Input
{
void InputDeviceController::Init(const int index, const std::string& name)
{
InputDevice::Init(InputDeviceType::CONTROLLER, index, name);
pressedButtons = 0;
lastPressedButtons = 0;
for(float& axis : axes)
{
axis = 0;
}
// TODO find controller type from name
Logger::INPUT->info("Initialized controller: id: {0}, name: {1}", index, name);
}
}

160
openVulkanoCpp/Input/InputDeviceController.hpp
View File

@@ -6,111 +6,93 @@
#pragma once
#include "Base/Logger.hpp"
#include "InputDevice.hpp"
#include <cstring>
namespace openVulkanoCpp
namespace openVulkanoCpp::Input
{
namespace Input
class ControllerType
{
class ControllerType
public:
enum Type { GENERIC_JOYSTICK, XBOX, DUAL_SHOCK, DUAL_SENSE };
private:
Type type;
public:
ControllerType(Type type) : type(type) {}
};
class InputDeviceController : public InputDevice
{
float axes[InputKey::Controller::Axis::AXIS_LAST + 1] = {0};
uint32_t pressedButtons = 0, lastPressedButtons = 0;
const ControllerType controllerType = ControllerType::GENERIC_JOYSTICK;
[[nodiscard]] bool GetLastButton(InputKey::Controller::Button button) const
{
public:
enum Type { GENERIC_JOYSTICK, XBOX, DUAL_SHOCK, DUAL_SENSE };
return lastPressedButtons & (1 << button);
}
private:
Type type;
protected:
InputDeviceController() = default;
public:
ControllerType(Type type) : type(type) {}
};
void Init(int index, const std::string& name);
class InputDeviceController : public InputDevice
void SetAxis(InputKey::Controller::Axis axisId, float value)
{
float axes[InputKey::Controller::Axis::AXIS_LAST + 1] = {0};
uint32_t pressedButtons = 0, lastPressedButtons = 0;
const ControllerType controllerType = ControllerType::GENERIC_JOYSTICK;
axes[axisId] = value;
}
[[nodiscard]] bool GetLastButton(InputKey::Controller::Button button) const
{
return lastPressedButtons & (1 << button);
}
void SetButtons(uint32_t buttonStates)
{
lastPressedButtons = pressedButtons;
pressedButtons = buttonStates;
}
protected:
InputDeviceController() = default;
[[nodiscard]] float ReadAxis(int16_t key) const final
{
return GetAxis(static_cast<InputKey::Controller::Axis>(key));
}
void Init(const int index, const std::string& name)
{
InputDevice::Init(InputDeviceType::CONTROLLER, index, name);
[[nodiscard]] bool ReadButton(int16_t key) const final
{
return GetButton(static_cast<InputKey::Controller::Button>(key));
}
pressedButtons = 0;
lastPressedButtons = 0;
for(float& axis : axes)
{
axis = 0;
}
[[nodiscard]] bool ReadButtonUp(int16_t key) const final
{
return GetButtonUp(static_cast<InputKey::Controller::Button>(key));
}
// TODO find controller type from name
Logger::INPUT->info("Initialized controller: id: {0}, name: {1}", index, name);
}
[[nodiscard]] bool ReadButtonDown(int16_t key) const final
{
return GetButtonDown(static_cast<InputKey::Controller::Button>(key));
}
void SetAxis(InputKey::Controller::Axis axisId, float value)
{
axes[axisId] = value;
}
public:
[[nodiscard]] bool GetButton(const InputKey::Controller::Button button) const
{
return pressedButtons & (1 << button);
}
void SetButtons(uint32_t buttonStates)
{
lastPressedButtons = pressedButtons;
pressedButtons = buttonStates;
}
[[nodiscard]] bool GetButtonUp(const InputKey::Controller::Button button) const
{
return !GetButton(button) && GetLastButton(button);
}
[[nodiscard]] float ReadAxis(int16_t key) const final
{
return GetAxis(static_cast<InputKey::Controller::Axis>(key));
}
[[nodiscard]] bool GetButtonDown(const InputKey::Controller::Button button) const
{
return GetButton(button) && !GetLastButton(button);
}
[[nodiscard]] bool ReadButton(int16_t key) const final
{
return GetButton(static_cast<InputKey::Controller::Button>(key));
}
[[nodiscard]] float GetAxis(const InputKey::Controller::Axis axis) const
{
return axes[axis];
}
[[nodiscard]] bool ReadButtonUp(int16_t key) const final
{
return GetButtonUp(static_cast<InputKey::Controller::Button>(key));
}
[[nodiscard]] bool ReadButtonDown(int16_t key) const final
{
return GetButtonDown(static_cast<InputKey::Controller::Button>(key));
}
public:
[[nodiscard]] bool GetButton(const InputKey::Controller::Button button) const
{
return pressedButtons & (1 << button);
}
[[nodiscard]] bool GetButtonUp(const InputKey::Controller::Button button) const
{
return !GetButton(button) && GetLastButton(button);
}
[[nodiscard]] bool GetButtonDown(const InputKey::Controller::Button button) const
{
return GetButton(button) && !GetLastButton(button);
}
[[nodiscard]] float GetAxis(const InputKey::Controller::Axis axis) const
{
return axes[axis];
}
[[nodiscard]] ControllerType GetControllerType() const
{
return controllerType;
}
};
}
}
[[nodiscard]] ControllerType GetControllerType() const
{
return controllerType;
}
};
}

20
openVulkanoCpp/Input/InputDeviceType.hpp
View File

@@ -1,14 +1,18 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#pragma once
#include <cstdint>
#include <string>
namespace openVulkanoCpp
namespace openVulkanoCpp::Input
{
namespace Input
enum class InputDeviceType : uint8_t
{
enum class InputDeviceType : uint8_t
{
UNKNOWN, KEYBOARD, MOUSE, CONTROLLER
};
}
}
UNKNOWN, KEYBOARD, MOUSE, CONTROLLER, TOUCH
};
}