mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-08-29 09:58:05 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 79cc5b2048 |
@@ -697,16 +697,6 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
|
|||||||
SDL_AddEventWatch(&SDLEventWatcher, this);
|
SDL_AddEventWatch(&SDLEventWatcher, this);
|
||||||
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
if (start_thread) {
|
|
||||||
vibration_thread = std::thread([this] {
|
|
||||||
Common::SetCurrentThreadName("SDL_Vibration");
|
|
||||||
using namespace std::chrono_literals;
|
|
||||||
while (initialized) {
|
|
||||||
SendVibrations();
|
|
||||||
std::this_thread::sleep_for(250ms); // 4 TPS
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// Because the events for joystick connection happens before we have our event watcher added, we
|
// Because the events for joystick connection happens before we have our event watcher added, we
|
||||||
// can just open all the joysticks right here
|
// can just open all the joysticks right here
|
||||||
int joystick_count = 0;
|
int joystick_count = 0;
|
||||||
@@ -725,7 +715,6 @@ SDLDriver::~SDLDriver() {
|
|||||||
|
|
||||||
initialized = false;
|
initialized = false;
|
||||||
if (start_thread) {
|
if (start_thread) {
|
||||||
vibration_thread.join();
|
|
||||||
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD);
|
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -805,10 +794,7 @@ Common::Input::DriverResult SDLDriver::SetVibration(
|
|||||||
.type = Common::Input::VibrationAmplificationType::Exponential,
|
.type = Common::Input::VibrationAmplificationType::Exponential,
|
||||||
};
|
};
|
||||||
|
|
||||||
vibration_queue.Push(VibrationRequest{
|
joystick->RumblePlay(new_vibration);
|
||||||
.identifier = identifier,
|
|
||||||
.vibration = new_vibration,
|
|
||||||
});
|
|
||||||
|
|
||||||
return Common::Input::DriverResult::Success;
|
return Common::Input::DriverResult::Success;
|
||||||
}
|
}
|
||||||
@@ -852,31 +838,6 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDLDriver::SendVibrations() {
|
|
||||||
std::vector<VibrationRequest> filtered_vibrations{};
|
|
||||||
while (!vibration_queue.Empty()) {
|
|
||||||
VibrationRequest request;
|
|
||||||
vibration_queue.Pop(request);
|
|
||||||
const auto joystick = GetSDLJoystickByGUID(request.identifier.guid.RawString(),
|
|
||||||
static_cast<int>(request.identifier.port));
|
|
||||||
const auto it = std::find_if(filtered_vibrations.begin(), filtered_vibrations.end(),
|
|
||||||
[request](VibrationRequest vibration) {
|
|
||||||
return vibration.identifier == request.identifier;
|
|
||||||
});
|
|
||||||
if (it == filtered_vibrations.end()) {
|
|
||||||
filtered_vibrations.push_back(std::move(request));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
*it = request;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const auto& vibration : filtered_vibrations) {
|
|
||||||
const auto joystick = GetSDLJoystickByGUID(vibration.identifier.guid.RawString(),
|
|
||||||
static_cast<int>(vibration.identifier.port));
|
|
||||||
joystick->RumblePlay(vibration.vibration);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, const Common::UUID& guid,
|
Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, const Common::UUID& guid,
|
||||||
s32 axis, float value) const {
|
s32 axis, float value) const {
|
||||||
Common::ParamPackage params{};
|
Common::ParamPackage params{};
|
||||||
|
|||||||
@@ -113,16 +113,11 @@ private:
|
|||||||
/// Returns true if the button is on the left joycon
|
/// Returns true if the button is on the left joycon
|
||||||
bool IsButtonOnLeftSide(Settings::NativeButton::Values button) const;
|
bool IsButtonOnLeftSide(Settings::NativeButton::Values button) const;
|
||||||
|
|
||||||
/// Queue of vibration request to controllers
|
|
||||||
Common::SPSCQueue<VibrationRequest> vibration_queue;
|
|
||||||
|
|
||||||
/// Map of GUID of a list of corresponding virtual Joysticks
|
/// Map of GUID of a list of corresponding virtual Joysticks
|
||||||
ankerl::unordered_dense::map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
|
ankerl::unordered_dense::map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
|
||||||
std::mutex joystick_map_mutex;
|
std::mutex joystick_map_mutex;
|
||||||
|
|
||||||
bool start_thread = false;
|
|
||||||
std::atomic<bool> initialized = false;
|
std::atomic<bool> initialized = false;
|
||||||
|
bool start_thread;
|
||||||
std::thread vibration_thread;
|
|
||||||
};
|
};
|
||||||
} // namespace InputCommon
|
} // namespace InputCommon
|
||||||
|
|||||||
Reference in New Issue
Block a user