1
0
Fork 0
forked from suyu/suyu

Merge pull request #9563 from german77/crash_not_allowed

input_common: Create an update engine
This commit is contained in:
bunnei 2023-01-07 13:41:27 -08:00 committed by GitHub
commit 66e4a48b75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 19 deletions

View file

@ -292,9 +292,6 @@ class InputDevice {
public: public:
virtual ~InputDevice() = default; virtual ~InputDevice() = default;
// Request input device to update if necessary
virtual void SoftUpdate() {}
// Force input device to update data regardless of the current state // Force input device to update data regardless of the current state
virtual void ForceUpdate() {} virtual void ForceUpdate() {}

View file

@ -1434,16 +1434,6 @@ AnalogSticks EmulatedController::GetSticks() const {
return {}; return {};
} }
// Some drivers like stick from buttons need constant refreshing
for (auto& device : stick_devices) {
if (!device) {
continue;
}
lock.unlock();
device->SoftUpdate();
lock.lock();
}
return controller.analog_stick_state; return controller.analog_stick_state;
} }

View file

@ -13,11 +13,11 @@ class Stick final : public Common::Input::InputDevice {
public: public:
using Button = std::unique_ptr<Common::Input::InputDevice>; using Button = std::unique_ptr<Common::Input::InputDevice>;
Stick(Button up_, Button down_, Button left_, Button right_, Button modifier_, Stick(Button up_, Button down_, Button left_, Button right_, Button modifier_, Button updater_,
float modifier_scale_, float modifier_angle_) float modifier_scale_, float modifier_angle_)
: up(std::move(up_)), down(std::move(down_)), left(std::move(left_)), : up(std::move(up_)), down(std::move(down_)), left(std::move(left_)),
right(std::move(right_)), modifier(std::move(modifier_)), modifier_scale(modifier_scale_), right(std::move(right_)), modifier(std::move(modifier_)), updater(std::move(updater_)),
modifier_angle(modifier_angle_) { modifier_scale(modifier_scale_), modifier_angle(modifier_angle_) {
up->SetCallback({ up->SetCallback({
.on_change = .on_change =
[this](const Common::Input::CallbackStatus& callback_) { [this](const Common::Input::CallbackStatus& callback_) {
@ -48,6 +48,9 @@ public:
UpdateModButtonStatus(callback_); UpdateModButtonStatus(callback_);
}, },
}); });
updater->SetCallback({
.on_change = [this](const Common::Input::CallbackStatus& callback_) { SoftUpdate(); },
});
last_x_axis_value = 0.0f; last_x_axis_value = 0.0f;
last_y_axis_value = 0.0f; last_y_axis_value = 0.0f;
} }
@ -248,7 +251,7 @@ public:
modifier->ForceUpdate(); modifier->ForceUpdate();
} }
void SoftUpdate() override { void SoftUpdate() {
Common::Input::CallbackStatus status{ Common::Input::CallbackStatus status{
.type = Common::Input::InputType::Stick, .type = Common::Input::InputType::Stick,
.stick_status = GetStatus(), .stick_status = GetStatus(),
@ -308,6 +311,7 @@ private:
Button left; Button left;
Button right; Button right;
Button modifier; Button modifier;
Button updater;
float modifier_scale{}; float modifier_scale{};
float modifier_angle{}; float modifier_angle{};
float angle{}; float angle{};
@ -331,11 +335,12 @@ std::unique_ptr<Common::Input::InputDevice> StickFromButton::Create(
auto left = Common::Input::CreateInputDeviceFromString(params.Get("left", null_engine)); auto left = Common::Input::CreateInputDeviceFromString(params.Get("left", null_engine));
auto right = Common::Input::CreateInputDeviceFromString(params.Get("right", null_engine)); auto right = Common::Input::CreateInputDeviceFromString(params.Get("right", null_engine));
auto modifier = Common::Input::CreateInputDeviceFromString(params.Get("modifier", null_engine)); auto modifier = Common::Input::CreateInputDeviceFromString(params.Get("modifier", null_engine));
auto updater = Common::Input::CreateInputDeviceFromString("engine:updater,button:0");
auto modifier_scale = params.Get("modifier_scale", 0.5f); auto modifier_scale = params.Get("modifier_scale", 0.5f);
auto modifier_angle = params.Get("modifier_angle", 5.5f); auto modifier_angle = params.Get("modifier_angle", 5.5f);
return std::make_unique<Stick>(std::move(up), std::move(down), std::move(left), return std::make_unique<Stick>(std::move(up), std::move(down), std::move(left),
std::move(right), std::move(modifier), modifier_scale, std::move(right), std::move(modifier), std::move(updater),
modifier_angle); modifier_scale, modifier_angle);
} }
} // namespace InputCommon } // namespace InputCommon

View file

@ -28,6 +28,28 @@
namespace InputCommon { namespace InputCommon {
/// Dummy engine to get periodic updates
class UpdateEngine final : public InputEngine {
public:
explicit UpdateEngine(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
PreSetController(identifier);
}
void PumpEvents() {
SetButton(identifier, 0, last_state);
last_state = !last_state;
}
private:
static constexpr PadIdentifier identifier = {
.guid = Common::UUID{},
.port = 0,
.pad = 0,
};
bool last_state{};
};
struct InputSubsystem::Impl { struct InputSubsystem::Impl {
template <typename Engine> template <typename Engine>
void RegisterEngine(std::string name, std::shared_ptr<Engine>& engine) { void RegisterEngine(std::string name, std::shared_ptr<Engine>& engine) {
@ -45,6 +67,7 @@ struct InputSubsystem::Impl {
void Initialize() { void Initialize() {
mapping_factory = std::make_shared<MappingFactory>(); mapping_factory = std::make_shared<MappingFactory>();
RegisterEngine("updater", update_engine);
RegisterEngine("keyboard", keyboard); RegisterEngine("keyboard", keyboard);
RegisterEngine("mouse", mouse); RegisterEngine("mouse", mouse);
RegisterEngine("touch", touch_screen); RegisterEngine("touch", touch_screen);
@ -74,6 +97,7 @@ struct InputSubsystem::Impl {
} }
void Shutdown() { void Shutdown() {
UnregisterEngine(update_engine);
UnregisterEngine(keyboard); UnregisterEngine(keyboard);
UnregisterEngine(mouse); UnregisterEngine(mouse);
UnregisterEngine(touch_screen); UnregisterEngine(touch_screen);
@ -252,6 +276,7 @@ struct InputSubsystem::Impl {
} }
void PumpEvents() const { void PumpEvents() const {
update_engine->PumpEvents();
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
sdl->PumpEvents(); sdl->PumpEvents();
#endif #endif
@ -263,6 +288,7 @@ struct InputSubsystem::Impl {
std::shared_ptr<MappingFactory> mapping_factory; std::shared_ptr<MappingFactory> mapping_factory;
std::shared_ptr<UpdateEngine> update_engine;
std::shared_ptr<Keyboard> keyboard; std::shared_ptr<Keyboard> keyboard;
std::shared_ptr<Mouse> mouse; std::shared_ptr<Mouse> mouse;
std::shared_ptr<TouchScreen> touch_screen; std::shared_ptr<TouchScreen> touch_screen;