ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11464 from shockdude/turntable-range-fix 

Fix DJ Turntable extension's table range
This commit is contained in:
JMC47 2023-01-20 12:04:28 -05:00 committed by GitHub
parent 1b333727e9 a32b85691b
commit d1aacf8547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp
View File

@ -96,7 +96,7 @@ void Turntable::BuildDesiredExtensionState(DesiredExtensionState* target_state)
// left table // left table
{ {
const ControllerEmu::Slider::StateData lt = m_left_table->GetState(m_input_override_function); const ControllerEmu::Slider::StateData lt = m_left_table->GetState(m_input_override_function);
const s8 tt = MapFloat<u8>(lt.value, 0, 0, TABLE_RANGE); const s8 tt = MapFloat<s8>(lt.value, 0, -TABLE_RANGE, TABLE_RANGE);
tt_data.ltable1 = tt; tt_data.ltable1 = tt;
tt_data.ltable2 = tt >> 5; tt_data.ltable2 = tt >> 5;
@ -105,7 +105,7 @@ void Turntable::BuildDesiredExtensionState(DesiredExtensionState* target_state)
// right table // right table
{ {
const ControllerEmu::Slider::StateData rt = m_right_table->GetState(m_input_override_function); const ControllerEmu::Slider::StateData rt = m_right_table->GetState(m_input_override_function);
const s8 tt = MapFloat<u8>(rt.value, 0, 0, TABLE_RANGE); const s8 tt = MapFloat<s8>(rt.value, 0, -TABLE_RANGE, TABLE_RANGE);
tt_data.rtable1 = tt; tt_data.rtable1 = tt;
tt_data.rtable2 = tt >> 1; tt_data.rtable2 = tt >> 1;

2
Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.h
View File

@ -83,7 +83,7 @@ public:
static constexpr u8 STICK_GATE_RADIUS = 0x16; static constexpr u8 STICK_GATE_RADIUS = 0x16;
static constexpr int TABLE_BIT_COUNT = 6; static constexpr int TABLE_BIT_COUNT = 6;
static constexpr u8 TABLE_RANGE = (1 << STICK_BIT_COUNT) / 2 - 1; static constexpr u8 TABLE_RANGE = (1 << TABLE_BIT_COUNT) / 2 - 1;
static constexpr int EFFECT_DIAL_BIT_COUNT = 5; static constexpr int EFFECT_DIAL_BIT_COUNT = 5;
static constexpr u8 EFFECT_DIAL_CENTER = (1 << EFFECT_DIAL_BIT_COUNT) / 2; static constexpr u8 EFFECT_DIAL_CENTER = (1 << EFFECT_DIAL_BIT_COUNT) / 2;