From e33677b021836d8f28cea69ced807cfa208d4e17 Mon Sep 17 00:00:00 2001 From: xperia64 Date: Tue, 5 Jan 2021 21:01:01 +0000 Subject: [PATCH] Add 3D slider value to the HID shared page (#5676) * Add 3D slider value to the HID shared page; Fixes MSet * Use f32 --- src/core/hle/service/hid/hid.cpp | 1 + src/core/hle/service/hid/hid.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index bc48cb109..c3034b824 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -224,6 +224,7 @@ void Module::UpdatePadCallback(u64 userdata, s64 cycles_late) { // TODO(xperia64): How the 3D Slider is updated by the HID module needs to be RE'd // and possibly moved to its own Core::Timing event. + mem->pad.sliderstate_3d = (Settings::values.factor_3d / 100.0f); system.Kernel().GetSharedPageHandler().Set3DSlider(Settings::values.factor_3d / 100.0f); // Reschedule recurrent event diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index f07f764a7..bdd106018 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -110,7 +110,9 @@ struct SharedMem { s64 index_reset_ticks_previous; ///< Previous `index_reset_ticks` u32 index; ///< Index of the last updated pad state entry - INSERT_PADDING_WORDS(0x2); + INSERT_PADDING_WORDS(0x1); + + f32 sliderstate_3d; PadState current_state; ///< Current state of the pad buttons