Add poll interval to libScePad (#1415)

This commit is contained in:
Vladislav Mikhalin 2024-10-19 15:57:01 +03:00 committed by GitHub
parent 87f8fea4de
commit c38e3f77f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 38 additions and 2 deletions

View file

@ -257,6 +257,7 @@ void Emulator::Run(const std::filesystem::path& file) {
std::jthread mainthread =
std::jthread([this](std::stop_token stop_token) { linker->Execute(); });
window->initTimers();
while (window->isOpen()) {
window->waitEvent();
}

View file

@ -1,10 +1,13 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <SDL3/SDL.h>
#include "controller.h"
#include "common/assert.h"
#include "core/libraries/kernel/time_management.h"
#include "core/libraries/pad/pad.h"
#include "input/controller.h"
#include <SDL3/SDL.h>
namespace Input {
@ -157,4 +160,23 @@ void GameController::TryOpenSDLController() {
}
}
u32 GameController::Poll() {
if (m_connected) {
auto time = Libraries::Kernel::sceKernelGetProcessTime();
if (m_states_num == 0) {
auto diff = (time - m_last_state.time) / 1000;
if (diff >= 100) {
AddState(GetLastState());
}
} else {
auto index = (m_first_state - 1 + m_states_num) % MAX_STATES;
auto diff = (time - m_states[index].time) / 1000;
if (m_private[index].obtained && diff >= 100) {
AddState(GetLastState());
}
}
}
return 100;
}
} // namespace Input

View file

@ -56,6 +56,7 @@ public:
bool SetVibration(u8 smallMotor, u8 largeMotor);
void SetTouchpadState(int touchIndex, bool touchDown, float x, float y);
void TryOpenSDLController();
u32 Poll();
private:
struct StateInternal {

View file

@ -4,6 +4,7 @@
#include <SDL3/SDL_events.h>
#include <SDL3/SDL_init.h>
#include <SDL3/SDL_properties.h>
#include <SDL3/SDL_timer.h>
#include <SDL3/SDL_video.h>
#include "common/assert.h"
#include "common/config.h"
@ -20,6 +21,11 @@
namespace Frontend {
static Uint32 SDLCALL PollController(void* userdata, SDL_TimerID timer_id, Uint32 interval) {
auto* controller = reinterpret_cast<Input::GameController*>(userdata);
return controller->Poll();
}
WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_,
std::string_view window_title)
: width{width_}, height{height_}, controller{controller_} {
@ -119,6 +125,10 @@ void WindowSDL::waitEvent() {
}
}
void WindowSDL::initTimers() {
SDL_AddTimer(100, &PollController, controller);
}
void WindowSDL::onResize() {
SDL_GetWindowSizeInPixels(window, &width, &height);
ImGui::Core::OnResize();

View file

@ -68,6 +68,8 @@ public:
void waitEvent();
void initTimers();
private:
void onResize();
void onKeyPress(const SDL_Event* event);