mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 01:12:19 -05:00
Code Issues Projects Releases Wiki Activity

[579] Add simulated input lag option (#1438)

Browse Source 
* [579] Add simulated input lag option

* Continue to clear buffer when inputs are blocked

* Changes from feedback
This commit is contained in:
Garrett Cox 2022-09-19 21:49:13 -05:00 committed by GitHub
parent 55e79cd9d2
commit f712068a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship/libultraship/ControlDeck.cpp
View File

@ -80,6 +80,7 @@ namespace Ship {
if (backend->GetGuid() == "Auto") {
for (const auto& device : physicalDevices) {
if(shouldBlockGameInput && device->GetGuid() != "Keyboard") {
device->Read(nullptr, i);
continue;
}
device->Read(&pad[i], i);
@ -87,6 +88,7 @@ namespace Ship {
continue;
}
if(shouldBlockGameInput && backend->GetGuid() != "Keyboard") {
backend->Read(nullptr, i);
continue;
}
backend->Read(&pad[i], i);

40
libultraship/libultraship/Controller.cpp
View File

@ -1,6 +1,7 @@
#include "Controller.h"
#include <memory>
#include <algorithm>
#include "Cvar.h"
#if __APPLE__
#include <SDL_events.h>
#else
@ -21,58 +22,67 @@ namespace Ship {
void Controller::Read(OSContPad* pad, int32_t virtualSlot) {
ReadFromSource(virtualSlot);
OSContPad padToBuffer = { 0 };
#ifndef __WIIU__
SDL_PumpEvents();
#endif
// Button Inputs
pad->button |= getPressedButtons(virtualSlot) & 0xFFFF;
padToBuffer.button |= getPressedButtons(virtualSlot) & 0xFFFF;
// Stick Inputs
if (getLeftStickX(virtualSlot) == 0) {
if (getPressedButtons(virtualSlot) & BTN_STICKLEFT) {
pad->stick_x = -128;
padToBuffer.stick_x = -128;
} else if (getPressedButtons(virtualSlot) & BTN_STICKRIGHT) {
pad->stick_x = 127;
padToBuffer.stick_x = 127;
}
} else {
pad->stick_x = getLeftStickX(virtualSlot);
padToBuffer.stick_x = getLeftStickX(virtualSlot);
}
if (getLeftStickY(virtualSlot) == 0) {
if (getPressedButtons(virtualSlot) & BTN_STICKDOWN) {
pad->stick_y = -128;
padToBuffer.stick_y = -128;
} else if (getPressedButtons(virtualSlot) & BTN_STICKUP) {
pad->stick_y = 127;
padToBuffer.stick_y = 127;
}
} else {
pad->stick_y = getLeftStickY(virtualSlot);
padToBuffer.stick_y = getLeftStickY(virtualSlot);
}
// Stick Inputs
if (getRightStickX(virtualSlot) == 0) {
if (getPressedButtons(virtualSlot) & BTN_VSTICKLEFT) {
pad->right_stick_x = -128;
padToBuffer.right_stick_x = -128;
} else if (getPressedButtons(virtualSlot) & BTN_VSTICKRIGHT) {
pad->right_stick_x = 127;
padToBuffer.right_stick_x = 127;
}
} else {
pad->right_stick_x = getRightStickX(virtualSlot);
padToBuffer.right_stick_x = getRightStickX(virtualSlot);
}
if (getRightStickY(virtualSlot) == 0) {
if (getPressedButtons(virtualSlot) & BTN_VSTICKDOWN) {
pad->right_stick_y = -128;
padToBuffer.right_stick_y = -128;
} else if (getPressedButtons(virtualSlot) & BTN_VSTICKUP) {
pad->right_stick_y = 127;
padToBuffer.right_stick_y = 127;
}
} else {
pad->right_stick_y = getRightStickY(virtualSlot);
padToBuffer.right_stick_y = getRightStickY(virtualSlot);
}
// Gyro
pad->gyro_x = getGyroX(virtualSlot);
pad->gyro_y = getGyroY(virtualSlot);
padToBuffer.gyro_x = getGyroX(virtualSlot);
padToBuffer.gyro_y = getGyroY(virtualSlot);
padBuffer.push_front(padToBuffer);
*pad = padBuffer[std::min(padBuffer.size(), (size_t)CVar_GetS32("gSimulatedInputLag", 0))];
while (padBuffer.size() > 6) {
padBuffer.pop_back();
}
}
void Controller::SetButtonMapping(int32_t virtualSlot, int32_t n64Button, int32_t dwScancode) {

2
libultraship/libultraship/Controller.h
View File

@ -4,6 +4,7 @@
#include <memory>
#include <string>
#include <cstdint>
#include <queue>
#include "UltraController.h"
#include "ControllerAttachment.h"
#include <unordered_map>
@ -84,5 +85,6 @@ namespace Ship {
std::unordered_map<int32_t, std::shared_ptr<DeviceProfile>> profiles;
std::unordered_map<int32_t, std::shared_ptr<Buttons>> ButtonData = {};
std::deque<OSContPad> padBuffer;
};
}

5
soh/soh/GameMenuBar.cpp
View File

@ -504,6 +504,11 @@ namespace GameMenuBar {
UIWidgets::EnhancementSliderFloat("Input Scale: %.1f", "##Input", "gInputScale", 1.0f, 3.0f, "", 1.0f, false);
UIWidgets::Tooltip("Sets the on screen size of the displayed inputs from the Show Inputs setting");
ImGui::PopItemWidth();
UIWidgets::Spacer(0);
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 20.0f);
UIWidgets::EnhancementSliderInt("Simulated Input Lag: %d frames", "##SimulatedInputLag", "gSimulatedInputLag", 0, 6, "", 0, false);
UIWidgets::Tooltip("Buffers your inputs to be executed a specified amount of frames later");
ImGui::PopItemWidth();
ImGui::EndMenu();
}

5
soh/src/code/graph.c
View File

@ -483,10 +483,7 @@ static void RunFrame()
Graph_StartFrame();
// TODO: Workaround for rumble being too long. Implement os thread functions.
for (int i = 0; i < 3; i++) {
PadMgr_ThreadEntry(&gPadMgr);
}
PadMgr_ThreadEntry(&gPadMgr);
Graph_Update(&runFrameContext.gfxCtx, runFrameContext.gameState);
ticksB = GetPerfCounter();

24
soh/src/code/padmgr.c
View File

@ -331,16 +331,20 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
}
padMgr->validCtrlrsMask = mask;
/* if (gFaultStruct.msgId) {
PadMgr_RumbleStop(padMgr);
} else */ if (padMgr->rumbleOffFrames > 0) {
--padMgr->rumbleOffFrames;
PadMgr_RumbleStop(padMgr);
} else if (padMgr->rumbleOnFrames == 0) {
PadMgr_RumbleStop(padMgr);
} else if (!padMgr->preNMIShutdown) {
PadMgr_RumbleControl(padMgr);
--padMgr->rumbleOnFrames;
// TODO: Workaround for rumble being too long. Implement os thread functions.
// Game logic runs at 20hz but input thread runs at 60 hertz, so we call this 3 times
for (i = 0; i < 3; i++) {
/* if (gFaultStruct.msgId) {
PadMgr_RumbleStop(padMgr);
} else */ if (padMgr->rumbleOffFrames > 0) {
--padMgr->rumbleOffFrames;
PadMgr_RumbleStop(padMgr);
} else if (padMgr->rumbleOnFrames == 0) {
PadMgr_RumbleStop(padMgr);
} else if (!padMgr->preNMIShutdown) {
PadMgr_RumbleControl(padMgr);
--padMgr->rumbleOnFrames;
}
}
}