summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/input_common/gcadapter/gc_poller.cpp36
-rw-r--r--src/input_common/gcadapter/gc_poller.h6
-rw-r--r--src/input_common/main.cpp3
-rw-r--r--src/input_common/main.h1
4 files changed, 22 insertions, 24 deletions
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp
index ad8b4b431..be7c600a2 100644
--- a/src/input_common/gcadapter/gc_poller.cpp
+++ b/src/input_common/gcadapter/gc_poller.cpp
@@ -14,8 +14,7 @@ namespace InputCommon {
class GCButton final : public Input::ButtonDevice {
public:
- explicit GCButton(int port_, int button_, int axis_,
- std::shared_ptr<GCAdapter::Adapter> adapter)
+ explicit GCButton(int port_, int button_, int axis_, GCAdapter::Adapter* adapter)
: port(port_), button(button_), gcadapter(adapter) {}
~GCButton() override;
@@ -27,13 +26,13 @@ public:
private:
const int port;
const int button;
- std::shared_ptr<GCAdapter::Adapter> gcadapter;
+ GCAdapter::Adapter* gcadapter;
};
class GCAxisButton final : public Input::ButtonDevice {
public:
explicit GCAxisButton(int port_, int axis_, float threshold_, bool trigger_if_greater_,
- std::shared_ptr<GCAdapter::Adapter> adapter)
+ GCAdapter::Adapter* adapter)
: port(port_), axis(axis_), threshold(threshold_), trigger_if_greater(trigger_if_greater_),
gcadapter(adapter) {}
@@ -50,11 +49,11 @@ private:
const int axis;
float threshold;
bool trigger_if_greater;
- std::shared_ptr<GCAdapter::Adapter> gcadapter;
+ GCAdapter::Adapter* gcadapter;
};
GCButtonFactory::GCButtonFactory(std::shared_ptr<GCAdapter::Adapter> adapter_)
- : adapter(adapter_) {}
+ : adapter(std::move(adapter_)) {}
GCButton::~GCButton() = default;
@@ -75,11 +74,12 @@ std::unique_ptr<Input::ButtonDevice> GCButtonFactory::Create(const Common::Param
trigger_if_greater = true;
LOG_ERROR(Input, "Unknown direction {}", direction_name);
}
- return std::make_unique<GCAxisButton>(port, axis, threshold, trigger_if_greater, adapter);
+ return std::make_unique<GCAxisButton>(port, axis, threshold, trigger_if_greater,
+ adapter.get());
}
std::unique_ptr<GCButton> button =
- std::make_unique<GCButton>(port, button_id, params.Get("axis", 0), adapter);
+ std::make_unique<GCButton>(port, button_id, params.Get("axis", 0), adapter.get());
return std::move(button);
}
@@ -171,8 +171,7 @@ void GCButtonFactory::EndConfiguration() {
class GCAnalog final : public Input::AnalogDevice {
public:
- GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_,
- std::shared_ptr<GCAdapter::Adapter> adapter)
+ GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_, GCAdapter::Adapter* adapter)
: port(port_), axis_x(axis_x_), axis_y(axis_y_), deadzone(deadzone_), gcadapter(adapter) {}
float GetAxis(int axis) const {
@@ -183,7 +182,7 @@ public:
return (gcadapter->GetPadState()[port].axes.at(axis) - 128.0f) / 95.0f;
}
- std::tuple<float, float> GetAnalog(int axis_x, int axis_y) const {
+ std::pair<float, float> GetAnalog(int axis_x, int axis_y) const {
float x = GetAxis(axis_x);
float y = GetAxis(axis_y);
@@ -196,17 +195,17 @@ public:
y /= r;
}
- return std::make_tuple(x, y);
+ return {x, y};
}
std::tuple<float, float> GetStatus() const override {
const auto [x, y] = GetAnalog(axis_x, axis_y);
const float r = std::sqrt((x * x) + (y * y));
if (r > deadzone) {
- return std::make_tuple(x / r * (r - deadzone) / (1 - deadzone),
- y / r * (r - deadzone) / (1 - deadzone));
+ return {x / r * (r - deadzone) / (1 - deadzone),
+ y / r * (r - deadzone) / (1 - deadzone)};
}
- return std::make_tuple<float, float>(0.0f, 0.0f);
+ return {0.0f, 0.0f};
}
bool GetAnalogDirectionStatus(Input::AnalogDirection direction) const override {
@@ -231,12 +230,12 @@ private:
const int axis_y;
const float deadzone;
mutable std::mutex mutex;
- std::shared_ptr<GCAdapter::Adapter> gcadapter;
+ GCAdapter::Adapter* gcadapter;
};
/// An analog device factory that creates analog devices from GC Adapter
GCAnalogFactory::GCAnalogFactory(std::shared_ptr<GCAdapter::Adapter> adapter_)
- : adapter(adapter_) {}
+ : adapter(std::move(adapter_)) {}
/**
* Creates analog device from joystick axes
@@ -246,13 +245,12 @@ GCAnalogFactory::GCAnalogFactory(std::shared_ptr<GCAdapter::Adapter> adapter_)
* - "axis_y": the index of the axis to be bind as y-axis
*/
std::unique_ptr<Input::AnalogDevice> GCAnalogFactory::Create(const Common::ParamPackage& params) {
- const std::string guid = params.Get("guid", "0");
const int port = params.Get("port", 0);
const int axis_x = params.Get("axis_x", 0);
const int axis_y = params.Get("axis_y", 1);
const float deadzone = std::clamp(params.Get("deadzone", 0.0f), 0.0f, .99f);
- return std::make_unique<GCAnalog>(port, axis_x, axis_y, deadzone, adapter);
+ return std::make_unique<GCAnalog>(port, axis_x, axis_y, deadzone, adapter.get());
}
void GCAnalogFactory::BeginConfiguration() {
diff --git a/src/input_common/gcadapter/gc_poller.h b/src/input_common/gcadapter/gc_poller.h
index d3a56da5b..e96af7d51 100644
--- a/src/input_common/gcadapter/gc_poller.h
+++ b/src/input_common/gcadapter/gc_poller.h
@@ -6,6 +6,7 @@
#include <memory>
#include "core/frontend/input.h"
+#include "input_common/gcadapter/gc_adapter.h"
namespace InputCommon {
@@ -15,7 +16,7 @@ namespace InputCommon {
*/
class GCButtonFactory final : public Input::Factory<Input::ButtonDevice> {
public:
- GCButtonFactory(std::shared_ptr<GCAdapter::Adapter> adapter_);
+ explicit GCButtonFactory(std::shared_ptr<GCAdapter::Adapter> adapter_);
/**
* Creates a button device from a button press
@@ -42,7 +43,8 @@ private:
/// An analog device factory that creates analog devices from GC Adapter
class GCAnalogFactory final : public Input::Factory<Input::AnalogDevice> {
public:
- GCAnalogFactory(std::shared_ptr<GCAdapter::Adapter> adapter_);
+ explicit GCAnalogFactory(std::shared_ptr<GCAdapter::Adapter> adapter_);
+
std::unique_ptr<Input::AnalogDevice> Create(const Common::ParamPackage& params) override;
Common::ParamPackage GetNextInput();
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index fc399db7e..827a1a30c 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -25,12 +25,11 @@ static std::shared_ptr<MotionEmu> motion_emu;
static std::unique_ptr<SDL::State> sdl;
#endif
static std::unique_ptr<CemuhookUDP::State> udp;
-static std::shared_ptr<GCAdapter::Adapter> gcadapter;
static std::shared_ptr<GCButtonFactory> gcbuttons;
static std::shared_ptr<GCAnalogFactory> gcanalog;
void Init() {
- gcadapter = std::make_shared<GCAdapter::Adapter>();
+ std::shared_ptr<GCAdapter::Adapter> gcadapter = std::make_shared<GCAdapter::Adapter>();
gcbuttons = std::make_shared<GCButtonFactory>(gcadapter);
Input::RegisterFactory<Input::ButtonDevice>("gcpad", gcbuttons);
gcanalog = std::make_shared<GCAnalogFactory>(gcadapter);
diff --git a/src/input_common/main.h b/src/input_common/main.h
index c26222f21..0e32856f6 100644
--- a/src/input_common/main.h
+++ b/src/input_common/main.h
@@ -7,7 +7,6 @@
#include <memory>
#include <string>
#include <vector>
-#include "input_common/gcadapter/gc_adapter.h"
#include "input_common/gcadapter/gc_poller.h"
namespace Common {