mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-27 04:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to fix formatting

Browse Source
This commit is contained in:
WujekFoliarz 2025-05-29 20:01:18 +02:00
parent f1ec78a063
commit b56d666bcd
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/libraries/pad/pad.cpp
View File

@ -444,17 +444,21 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
const auto gyro_poll_rate = engine->GetAccelPollRate(); const auto gyro_poll_rate = engine->GetAccelPollRate();
if (gyro_poll_rate != 0.0f) { if (gyro_poll_rate != 0.0f) {
auto now = std::chrono::steady_clock::now(); auto now = std::chrono::steady_clock::now();
float deltaTime = std::chrono::duration_cast<std::chrono::microseconds>(now - controller->GetLastUpdate()).count() / 1000000.0f; float deltaTime = std::chrono::duration_cast<std::chrono::microseconds>(
now - controller->GetLastUpdate())
.count() /
1000000.0f;
controller->SetLastUpdate(now); controller->SetLastUpdate(now);
Libraries::Pad::OrbisFQuaternion lastOrientation = controller->GetLastOrientation(); Libraries::Pad::OrbisFQuaternion lastOrientation = controller->GetLastOrientation();
Libraries::Pad::OrbisFQuaternion outputOrientation = {0.0f,0.0f,0.0f,1.0f}; Libraries::Pad::OrbisFQuaternion outputOrientation = {0.0f, 0.0f, 0.0f, 1.0f};
GameController::CalculateOrientation(pData->acceleration, pData->angularVelocity, GameController::CalculateOrientation(pData->acceleration, pData->angularVelocity,
deltaTime, lastOrientation, outputOrientation); deltaTime, lastOrientation, outputOrientation);
pData->orientation = outputOrientation; pData->orientation = outputOrientation;
controller->SetLastOrientation(outputOrientation); controller->SetLastOrientation(outputOrientation);
} }
} }
pData->touchData.touchNum = (state.touchpad[0].state ? 1 : 0) + (state.touchpad[1].state ? 1 : 0); pData->touchData.touchNum =
(state.touchpad[0].state ? 1 : 0) + (state.touchpad[1].state ? 1 : 0);
if (controller->GetTouchCount() >= 127) { if (controller->GetTouchCount() >= 127) {
controller->SetTouchCount(0); controller->SetTouchCount(0);
@ -467,15 +471,12 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
if (pData->touchData.touchNum == 1 && controller->GetPreviousTouchNum() == 0) { if (pData->touchData.touchNum == 1 && controller->GetPreviousTouchNum() == 0) {
controller->SetTouchCount(controller->GetTouchCount() + 1); controller->SetTouchCount(controller->GetTouchCount() + 1);
controller->SetSecondaryTouchCount(controller->GetTouchCount()); controller->SetSecondaryTouchCount(controller->GetTouchCount());
} } else if (pData->touchData.touchNum == 2 && controller->GetPreviousTouchNum() == 1) {
else if (pData->touchData.touchNum == 2 && controller->GetPreviousTouchNum() == 1) {
controller->SetSecondaryTouchCount(controller->GetSecondaryTouchCount() + 1); controller->SetSecondaryTouchCount(controller->GetSecondaryTouchCount() + 1);
} } else if (pData->touchData.touchNum == 0 && controller->GetPreviousTouchNum() > 0) {
else if (pData->touchData.touchNum == 0 && controller->GetPreviousTouchNum() > 0) {
if (controller->GetTouchCount() < controller->GetSecondaryTouchCount()) { if (controller->GetTouchCount() < controller->GetSecondaryTouchCount()) {
controller->SetTouchCount(controller->GetSecondaryTouchCount()); controller->SetTouchCount(controller->GetSecondaryTouchCount());
} } else {
else {
if (controller->WasSecondaryTouchReset()) { if (controller->WasSecondaryTouchReset()) {
controller->SetTouchCount(controller->GetSecondaryTouchCount()); controller->SetTouchCount(controller->GetSecondaryTouchCount());
controller->UnsetSecondaryTouchResetBool(); controller->UnsetSecondaryTouchResetBool();
@ -488,8 +489,7 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
if (pData->touchData.touchNum == 1) { if (pData->touchData.touchNum == 1) {
state.touchpad[0].ID = controller->GetTouchCount(); state.touchpad[0].ID = controller->GetTouchCount();
state.touchpad[1].ID = 0; state.touchpad[1].ID = 0;
} } else if (pData->touchData.touchNum == 2) {
else if (pData->touchData.touchNum == 2) {
state.touchpad[0].ID = controller->GetTouchCount(); state.touchpad[0].ID = controller->GetTouchCount();
state.touchpad[1].ID = controller->GetSecondaryTouchCount(); state.touchpad[1].ID = controller->GetSecondaryTouchCount();
} }

3
src/input/controller.cpp
View File

@ -171,7 +171,8 @@ void GameController::CalculateOrientation(Libraries::Pad::OrbisFVector3& acceler
Libraries::Pad::OrbisFQuaternion& lastOrientation, Libraries::Pad::OrbisFQuaternion& lastOrientation,
Libraries::Pad::OrbisFQuaternion& orientation) { Libraries::Pad::OrbisFQuaternion& orientation) {
Libraries::Pad::OrbisFQuaternion q = lastOrientation; Libraries::Pad::OrbisFQuaternion q = lastOrientation;
Libraries::Pad::OrbisFQuaternion ω = {angularVelocity.x, angularVelocity.y,angularVelocity.z,0.0f}; Libraries::Pad::OrbisFQuaternion ω = {angularVelocity.x, angularVelocity.y, angularVelocity.z,
0.0f};
Libraries::Pad::OrbisFQuaternion qω = {q.w * ω.x + q.x * ω.w + q.y * ω.z - q.z * ω.y, Libraries::Pad::OrbisFQuaternion qω = {q.w * ω.x + q.x * ω.w + q.y * ω.z - q.z * ω.y,
q.w * ω.y + q.y * ω.w + q.z * ω.x - q.x * ω.z, q.w * ω.y + q.y * ω.w + q.z * ω.x - q.x * ω.z,