dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-05 22:55:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

input: simplify VibrateMotor constructor

Browse Source
This commit is contained in:
Megamouse 2025-09-10 17:32:59 +02:00
parent 6911d0b5e1
commit aca9d28a7a
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/Io/PadHandler.cpp
View File

@ -538,8 +538,8 @@ bool PadHandlerBase::bindPadToDevice(std::shared_ptr<Pad> pad)
pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, 0, 0, 0, DEFAULT_MOTION_Z); pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, 0, 0, 0, DEFAULT_MOTION_Z);
pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, 0, 0, 0, DEFAULT_MOTION_G); pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, 0, 0, 0, DEFAULT_MOTION_G);
pad->m_vibrateMotors[0] = VibrateMotor(true, 0); pad->m_vibrateMotors[0] = VibrateMotor(true);
pad->m_vibrateMotors[1] = VibrateMotor(false, 0); pad->m_vibrateMotors[1] = VibrateMotor(false);
m_bindings.emplace_back(pad, pad_device, nullptr); m_bindings.emplace_back(pad, pad_device, nullptr);

3
rpcs3/Emu/Io/pad_types.h
View File

@ -464,9 +464,8 @@ struct VibrateMotor
u8 m_adjusted_value = 0; u8 m_adjusted_value = 0;
VibrateMotor() {} VibrateMotor() {}
VibrateMotor(bool is_large_motor, u8 value) VibrateMotor(bool is_large_motor)
: m_is_large_motor(is_large_motor) : m_is_large_motor(is_large_motor)
, m_value(value)
{} {}
}; };

4
rpcs3/Input/evdev_joystick_handler.cpp
View File

@ -1478,8 +1478,8 @@ bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, m_dev->axis_motion[2].code, m_dev->axis_motion[2].mirrored, m_dev->axis_motion[2].shift, DEFAULT_MOTION_Z); pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, m_dev->axis_motion[2].code, m_dev->axis_motion[2].mirrored, m_dev->axis_motion[2].shift, DEFAULT_MOTION_Z);
pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, m_dev->axis_motion[3].code, m_dev->axis_motion[3].mirrored, m_dev->axis_motion[3].shift, DEFAULT_MOTION_G); pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, m_dev->axis_motion[3].code, m_dev->axis_motion[3].mirrored, m_dev->axis_motion[3].shift, DEFAULT_MOTION_G);
pad->m_vibrateMotors[0] = VibrateMotor(true, 0); pad->m_vibrateMotors[0] = VibrateMotor(true);
pad->m_vibrateMotors[1] = VibrateMotor(false, 0); pad->m_vibrateMotors[1] = VibrateMotor(false);
if (std::shared_ptr<EvdevDevice> evdev_device = add_device(player_config->device, false)) if (std::shared_ptr<EvdevDevice> evdev_device = add_device(player_config->device, false))
{ {

4
rpcs3/Input/keyboard_pad_handler.cpp
View File

@ -1072,8 +1072,8 @@ bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, 0, 0, 0, DEFAULT_MOTION_Z); pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, 0, 0, 0, DEFAULT_MOTION_Z);
pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, 0, 0, 0, DEFAULT_MOTION_G); pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, 0, 0, 0, DEFAULT_MOTION_G);
pad->m_vibrateMotors[0] = VibrateMotor(true, 0); pad->m_vibrateMotors[0] = VibrateMotor(true);
pad->m_vibrateMotors[1] = VibrateMotor(false, 0); pad->m_vibrateMotors[1] = VibrateMotor(false);
m_bindings.emplace_back(pad, nullptr, nullptr); m_bindings.emplace_back(pad, nullptr, nullptr);
m_pads_internal.push_back(*pad); m_pads_internal.push_back(*pad);