RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-03-10 23:45:16 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Wiimote to GunCon3: Address review comments

Browse source
This commit is contained in:
Barış Hamil 2026-02-10 11:28:44 +03:00
parent 607e045541
commit e2743756a4
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/Emu/Io/GunCon3.h
View file

@ -3,7 +3,6 @@
#include "Emu/Io/usb_device.h"
#include <vector>
#include <mutex>
#include <algorithm>
class usb_device_guncon3 : public usb_device_emulated
{

15
rpcs3/Emu/Io/WiimoteManager.h
View file

@ -10,6 +10,7 @@
#include <thread>
#include <shared_mutex>
#include <chrono>
#include <array>
struct wiimote_ir_point
{
@ -54,8 +55,10 @@ struct wiimote_guncon_mapping
struct wiimote_state
{
u16 buttons = 0;
s16 acc_x = 0, acc_y = 0, acc_z = 0;
wiimote_ir_point ir[4];
s16 acc_x = 0;
s16 acc_y = 0;
s16 acc_z = 0;
std::array<wiimote_ir_point, 4> ir {};
bool connected = false;
};
@ -70,14 +73,14 @@ public:
bool update();
const wiimote_state& get_state() const { return m_state; }
std::string get_path() const { return m_path; }
std::wstring get_serial() const { return m_serial; }
const std::string& get_path() const { return m_path; }
const std::wstring& get_serial() const { return m_serial; }
private:
hid_device* m_handle = nullptr;
std::string m_path;
std::wstring m_serial;
wiimote_state m_state;
wiimote_state m_state {};
std::chrono::steady_clock::time_point m_last_ir_check;
bool initialize_ir();
@ -107,7 +110,7 @@ private:
atomic_t<bool> m_running{false};
std::vector<std::unique_ptr<wiimote_device>> m_devices;
shared_mutex m_mutex;
wiimote_guncon_mapping m_mapping;
wiimote_guncon_mapping m_mapping {};
void thread_proc();
void load_config();