From b56d666bcdee412ee96f41689b6cb77a9cb203d2 Mon Sep 17 00:00:00 2001 From: WujekFoliarz Date: Thu, 29 May 2025 20:01:18 +0200 Subject: [PATCH] try to fix formatting --- src/core/libraries/pad/pad.cpp | 28 ++++++++++++++-------------- src/input/controller.cpp | 11 ++++++----- src/input/controller.h | 6 +++--- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/core/libraries/pad/pad.cpp b/src/core/libraries/pad/pad.cpp index 2df0d8d22..49cc5f56a 100644 --- a/src/core/libraries/pad/pad.cpp +++ b/src/core/libraries/pad/pad.cpp @@ -377,7 +377,7 @@ int PS4_SYSV_ABI scePadRead(s32 handle, OrbisPadData* pData, s32 num) { } else if (pData->touchData.touchNum == 2) { states[i].touchpad[0].ID = controller->GetTouchCount(); states[i].touchpad[1].ID = controller->GetSecondaryTouchCount(); - } + } pData[i].touchData.touch[0].x = states[i].touchpad[0].x; pData[i].touchData.touch[0].y = states[i].touchpad[0].y; @@ -442,19 +442,23 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) { if (engine) { 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(); - float deltaTime = std::chrono::duration_cast(now - controller->GetLastUpdate()).count() / 1000000.0f; + float deltaTime = std::chrono::duration_cast( + now - controller->GetLastUpdate()) + .count() / + 1000000.0f; controller->SetLastUpdate(now); 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, deltaTime, lastOrientation, outputOrientation); pData->orientation = 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) { controller->SetTouchCount(0); @@ -467,15 +471,12 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) { if (pData->touchData.touchNum == 1 && controller->GetPreviousTouchNum() == 0) { controller->SetTouchCount(controller->GetTouchCount() + 1); 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); - } - else if (pData->touchData.touchNum == 0 && controller->GetPreviousTouchNum() > 0) { + } else if (pData->touchData.touchNum == 0 && controller->GetPreviousTouchNum() > 0) { if (controller->GetTouchCount() < controller->GetSecondaryTouchCount()) { controller->SetTouchCount(controller->GetSecondaryTouchCount()); - } - else { + } else { if (controller->WasSecondaryTouchReset()) { controller->SetTouchCount(controller->GetSecondaryTouchCount()); controller->UnsetSecondaryTouchResetBool(); @@ -488,11 +489,10 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) { if (pData->touchData.touchNum == 1) { state.touchpad[0].ID = controller->GetTouchCount(); 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[1].ID = controller->GetSecondaryTouchCount(); - } + } pData->touchData.touch[0].x = state.touchpad[0].x; pData->touchData.touch[0].y = state.touchpad[0].y; diff --git a/src/input/controller.cpp b/src/input/controller.cpp index e65bc940e..5461c69e0 100644 --- a/src/input/controller.cpp +++ b/src/input/controller.cpp @@ -171,12 +171,13 @@ void GameController::CalculateOrientation(Libraries::Pad::OrbisFVector3& acceler Libraries::Pad::OrbisFQuaternion& lastOrientation, Libraries::Pad::OrbisFQuaternion& orientation) { 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, - q.w * ω.y + q.y * ω.w + q.z * ω.x - q.x * ω.z, - q.w * ω.z + q.z * ω.w + q.x * ω.y - q.y * ω.x, - q.w * ω.w - q.x * ω.x - q.y * ω.y - q.z * ω.z}; + q.w * ω.y + q.y * ω.w + q.z * ω.x - q.x * ω.z, + q.w * ω.z + q.z * ω.w + q.x * ω.y - q.y * ω.x, + q.w * ω.w - q.x * ω.x - q.y * ω.y - q.z * ω.z}; Libraries::Pad::OrbisFQuaternion qDot = {0.5f * qω.x, 0.5f * qω.y, 0.5f * qω.z, 0.5f * qω.w}; @@ -247,7 +248,7 @@ void GameController::SetSecondaryTouchCount(u8 touchCount) { m_secondary_touch_count = touchCount; if (touchCount == 0) { m_was_secondary_reset = true; - } + } } u8 GameController::GetPreviousTouchNum() { diff --git a/src/input/controller.h b/src/input/controller.h index 8cc127d72..f427a55ec 100644 --- a/src/input/controller.h +++ b/src/input/controller.h @@ -39,7 +39,7 @@ public: Libraries::Pad::OrbisPadButtonDataOffset buttonsState{}; u64 time = 0; - int axes[static_cast(Axis::AxisMax)] = {128, 128, 128, 128, 0, 0}; + int axes[static_cast(Axis::AxisMax)] = {128, 128, 128, 128, 0, 0}; TouchpadEntry touchpad[2] = {{false, 0, 0}, {false, 0, 0}}; Libraries::Pad::OrbisFVector3 acceleration = {0.0f, 0.0f, 0.0f}; Libraries::Pad::OrbisFVector3 angularVelocity = {0.0f, 0.0f, 0.0f}; @@ -82,7 +82,7 @@ public: void SetEngine(std::unique_ptr); Engine* GetEngine(); u32 Poll(); - + u8 GetTouchCount(); void SetTouchCount(u8 touchCount); u8 GetSecondaryTouchCount(); @@ -122,7 +122,7 @@ private: std::array m_private; std::chrono::steady_clock::time_point m_last_update = {}; Libraries::Pad::OrbisFQuaternion m_orientation = {0.0f, 0.0f, 0.0f, 1.0f}; - + std::unique_ptr m_engine = nullptr; };