mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 15:09:07 +01:00
Merge pull request #7725 from german77/mouse_in_motion
input_common: Reintroduce motion from mouse and use button names
This commit is contained in:
commit
eceee8e5f4
5 changed files with 64 additions and 1 deletions
|
@ -209,6 +209,13 @@ enum class ButtonNames {
|
||||||
Triangle,
|
Triangle,
|
||||||
Share,
|
Share,
|
||||||
Options,
|
Options,
|
||||||
|
|
||||||
|
// Mouse buttons
|
||||||
|
ButtonMouseWheel,
|
||||||
|
ButtonBackward,
|
||||||
|
ButtonForward,
|
||||||
|
ButtonTask,
|
||||||
|
ButtonExtra,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Callback data consisting of an input type and the equivalent data status
|
// Callback data consisting of an input type and the equivalent data status
|
||||||
|
|
|
@ -16,6 +16,7 @@ constexpr int mouse_axis_x = 0;
|
||||||
constexpr int mouse_axis_y = 1;
|
constexpr int mouse_axis_y = 1;
|
||||||
constexpr int wheel_axis_x = 2;
|
constexpr int wheel_axis_x = 2;
|
||||||
constexpr int wheel_axis_y = 3;
|
constexpr int wheel_axis_y = 3;
|
||||||
|
constexpr int motion_wheel_y = 4;
|
||||||
constexpr int touch_axis_x = 10;
|
constexpr int touch_axis_x = 10;
|
||||||
constexpr int touch_axis_y = 11;
|
constexpr int touch_axis_y = 11;
|
||||||
constexpr PadIdentifier identifier = {
|
constexpr PadIdentifier identifier = {
|
||||||
|
@ -30,6 +31,7 @@ Mouse::Mouse(std::string input_engine_) : InputEngine(std::move(input_engine_))
|
||||||
PreSetAxis(identifier, mouse_axis_y);
|
PreSetAxis(identifier, mouse_axis_y);
|
||||||
PreSetAxis(identifier, wheel_axis_x);
|
PreSetAxis(identifier, wheel_axis_x);
|
||||||
PreSetAxis(identifier, wheel_axis_y);
|
PreSetAxis(identifier, wheel_axis_y);
|
||||||
|
PreSetAxis(identifier, motion_wheel_y);
|
||||||
PreSetAxis(identifier, touch_axis_x);
|
PreSetAxis(identifier, touch_axis_x);
|
||||||
PreSetAxis(identifier, touch_axis_y);
|
PreSetAxis(identifier, touch_axis_y);
|
||||||
update_thread = std::jthread([this](std::stop_token stop_token) { UpdateThread(stop_token); });
|
update_thread = std::jthread([this](std::stop_token stop_token) { UpdateThread(stop_token); });
|
||||||
|
@ -48,6 +50,8 @@ void Mouse::UpdateThread(std::stop_token stop_token) {
|
||||||
SetAxis(identifier, mouse_axis_y, -last_mouse_change.y * sensitivity);
|
SetAxis(identifier, mouse_axis_y, -last_mouse_change.y * sensitivity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetAxis(identifier, motion_wheel_y, 0.0f);
|
||||||
|
|
||||||
if (mouse_panning_timout++ > 20) {
|
if (mouse_panning_timout++ > 20) {
|
||||||
StopPanning();
|
StopPanning();
|
||||||
}
|
}
|
||||||
|
@ -136,6 +140,7 @@ void Mouse::MouseWheelChange(int x, int y) {
|
||||||
wheel_position.y += y;
|
wheel_position.y += y;
|
||||||
SetAxis(identifier, wheel_axis_x, static_cast<f32>(wheel_position.x));
|
SetAxis(identifier, wheel_axis_x, static_cast<f32>(wheel_position.x));
|
||||||
SetAxis(identifier, wheel_axis_y, static_cast<f32>(wheel_position.y));
|
SetAxis(identifier, wheel_axis_y, static_cast<f32>(wheel_position.y));
|
||||||
|
SetAxis(identifier, motion_wheel_y, static_cast<f32>(y) / 100.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mouse::ReleaseAllButtons() {
|
void Mouse::ReleaseAllButtons() {
|
||||||
|
@ -171,13 +176,39 @@ AnalogMapping Mouse::GetAnalogMappingForDevice(
|
||||||
return mapping;
|
return mapping;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Common::Input::ButtonNames Mouse::GetUIButtonName(const Common::ParamPackage& params) const {
|
||||||
|
const auto button = static_cast<MouseButton>(params.Get("button", 0));
|
||||||
|
switch (button) {
|
||||||
|
case MouseButton::Left:
|
||||||
|
return Common::Input::ButtonNames::ButtonLeft;
|
||||||
|
case MouseButton::Right:
|
||||||
|
return Common::Input::ButtonNames::ButtonRight;
|
||||||
|
case MouseButton::Wheel:
|
||||||
|
return Common::Input::ButtonNames::ButtonMouseWheel;
|
||||||
|
case MouseButton::Backward:
|
||||||
|
return Common::Input::ButtonNames::ButtonBackward;
|
||||||
|
case MouseButton::Forward:
|
||||||
|
return Common::Input::ButtonNames::ButtonForward;
|
||||||
|
case MouseButton::Task:
|
||||||
|
return Common::Input::ButtonNames::ButtonTask;
|
||||||
|
case MouseButton::Extra:
|
||||||
|
return Common::Input::ButtonNames::ButtonExtra;
|
||||||
|
case MouseButton::Undefined:
|
||||||
|
default:
|
||||||
|
return Common::Input::ButtonNames::Undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Common::Input::ButtonNames Mouse::GetUIName(const Common::ParamPackage& params) const {
|
Common::Input::ButtonNames Mouse::GetUIName(const Common::ParamPackage& params) const {
|
||||||
if (params.Has("button")) {
|
if (params.Has("button")) {
|
||||||
return Common::Input::ButtonNames::Value;
|
return GetUIButtonName(params);
|
||||||
}
|
}
|
||||||
if (params.Has("axis")) {
|
if (params.Has("axis")) {
|
||||||
return Common::Input::ButtonNames::Value;
|
return Common::Input::ButtonNames::Value;
|
||||||
}
|
}
|
||||||
|
if (params.Has("axis_x") && params.Has("axis_y") && params.Has("axis_z")) {
|
||||||
|
return Common::Input::ButtonNames::Engine;
|
||||||
|
}
|
||||||
|
|
||||||
return Common::Input::ButtonNames::Invalid;
|
return Common::Input::ButtonNames::Invalid;
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,6 +69,8 @@ private:
|
||||||
void UpdateThread(std::stop_token stop_token);
|
void UpdateThread(std::stop_token stop_token);
|
||||||
void StopPanning();
|
void StopPanning();
|
||||||
|
|
||||||
|
Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;
|
||||||
|
|
||||||
Common::Vec2<int> mouse_origin;
|
Common::Vec2<int> mouse_origin;
|
||||||
Common::Vec2<int> last_mouse_position;
|
Common::Vec2<int> last_mouse_position;
|
||||||
Common::Vec2<float> last_mouse_change;
|
Common::Vec2<float> last_mouse_change;
|
||||||
|
|
|
@ -143,6 +143,19 @@ void MappingFactory::RegisterMotion(const MappingData& data) {
|
||||||
}
|
}
|
||||||
new_input.Set("port", static_cast<int>(data.pad.port));
|
new_input.Set("port", static_cast<int>(data.pad.port));
|
||||||
new_input.Set("pad", static_cast<int>(data.pad.pad));
|
new_input.Set("pad", static_cast<int>(data.pad.pad));
|
||||||
|
|
||||||
|
// If engine is mouse map the mouse position as 3 axis motion
|
||||||
|
if (data.engine == "mouse") {
|
||||||
|
new_input.Set("axis_x", 1);
|
||||||
|
new_input.Set("invert_x", "-");
|
||||||
|
new_input.Set("axis_y", 0);
|
||||||
|
new_input.Set("axis_z", 4);
|
||||||
|
new_input.Set("range", 1.0f);
|
||||||
|
new_input.Set("deadzone", 0.0f);
|
||||||
|
input_queue.Push(new_input);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (data.type) {
|
switch (data.type) {
|
||||||
case EngineInputType::Button:
|
case EngineInputType::Button:
|
||||||
case EngineInputType::HatButton:
|
case EngineInputType::HatButton:
|
||||||
|
|
|
@ -102,6 +102,16 @@ QString GetButtonName(Common::Input::ButtonNames button_name) {
|
||||||
return QObject::tr("Share");
|
return QObject::tr("Share");
|
||||||
case Common::Input::ButtonNames::Options:
|
case Common::Input::ButtonNames::Options:
|
||||||
return QObject::tr("Options");
|
return QObject::tr("Options");
|
||||||
|
case Common::Input::ButtonNames::ButtonMouseWheel:
|
||||||
|
return QObject::tr("Wheel", "Indicates the mouse wheel");
|
||||||
|
case Common::Input::ButtonNames::ButtonBackward:
|
||||||
|
return QObject::tr("Backward");
|
||||||
|
case Common::Input::ButtonNames::ButtonForward:
|
||||||
|
return QObject::tr("Forward");
|
||||||
|
case Common::Input::ButtonNames::ButtonTask:
|
||||||
|
return QObject::tr("Task");
|
||||||
|
case Common::Input::ButtonNames::ButtonExtra:
|
||||||
|
return QObject::tr("Extra");
|
||||||
default:
|
default:
|
||||||
return QObject::tr("[undefined]");
|
return QObject::tr("[undefined]");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue