mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-25 06:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13430 from jordan-woyak/tatacon-desired-state

Browse source 
WiimoteEmu: Make TaTaCon DesiredState use only one byte of space.
This commit is contained in:
OatmealDome 2025-03-16 15:04:21 -04:00 • committed by GitHub
commit 0afbeae70c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp
View file

@ -7,14 +7,12 @@
#include <cstring> #include <cstring>
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/BitUtils.h"
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "InputCommon/ControllerEmu/Control/Input.h"
#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
namespace WiimoteEmu namespace WiimoteEmu
@ -54,20 +52,24 @@ TaTaCon::TaTaCon() : Extension3rdParty("TaTaCon", _trans("Taiko Drum"))
void TaTaCon::BuildDesiredExtensionState(DesiredExtensionState* target_state) void TaTaCon::BuildDesiredExtensionState(DesiredExtensionState* target_state)
{ {
DataFormat tatacon_data = {}; DesiredState tatacon_data = {};
m_center->GetState(&tatacon_data.state, center_bitmasks.data(), m_input_override_function); m_center->GetState(&tatacon_data.state, center_bitmasks.data(), m_input_override_function);
m_rim->GetState(&tatacon_data.state, rim_bitmasks.data(), m_input_override_function); m_rim->GetState(&tatacon_data.state, rim_bitmasks.data(), m_input_override_function);
// Flip button bits.
tatacon_data.state ^= 0xff;
target_state->data = tatacon_data; target_state->data = tatacon_data;
} }
void TaTaCon::Update(const DesiredExtensionState& target_state) void TaTaCon::Update(const DesiredExtensionState& target_state)
{ {
DefaultExtensionUpdate<DataFormat>(&m_reg, target_state); DesiredState desired_state{};
if (std::holds_alternative<DesiredState>(target_state.data))
desired_state = std::get<DesiredState>(target_state.data);
// Flip button bits.
desired_state.state ^= 0xff;
m_reg.controller_data[5] = desired_state.state;
} }
void TaTaCon::Reset() void TaTaCon::Reset()

5
Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.h
View file

@ -29,7 +29,10 @@ public:
}; };
static_assert(sizeof(DataFormat) == 6, "Wrong size"); static_assert(sizeof(DataFormat) == 6, "Wrong size");
using DesiredState = DataFormat; struct DesiredState
{
u8 state;
};
TaTaCon(); TaTaCon();

14
Source/Core/Core/Movie.cpp
View file

@ -716,7 +716,7 @@ static std::string GenerateWiiInputDisplayString(int index, const DesiredWiimote
if (state.extension.data.index() != ExtensionNumber::NONE) if (state.extension.data.index() != ExtensionNumber::NONE)
{ {
const auto ext_visitor = overloaded{ const auto ext_visitor = overloaded{
[&](const Nunchuk::DataFormat& nunchuk) { [&](const Nunchuk::DesiredState& nunchuk) {
const auto bt = nunchuk.GetButtons(); const auto bt = nunchuk.GetButtons();
if (bt & Nunchuk::BUTTON_C) if (bt & Nunchuk::BUTTON_C)
display_str += " C"; display_str += " C";
@ -726,7 +726,7 @@ static std::string GenerateWiiInputDisplayString(int index, const DesiredWiimote
nunchuk.GetAccelZ()); nunchuk.GetAccelZ());
display_str += Analog2DToString(nunchuk.jx, nunchuk.jy, " ANA"); display_str += Analog2DToString(nunchuk.jx, nunchuk.jy, " ANA");
}, },
[&](const Classic::DataFormat& cc) { [&](const Classic::DesiredState& cc) {
const auto bt = cc.GetButtons(); const auto bt = cc.GetButtons();
constexpr std::pair<u16, const char*> named_buttons[] = { constexpr std::pair<u16, const char*> named_buttons[] = {
{Classic::PAD_LEFT, "LEFT"}, {Classic::PAD_RIGHT, "RIGHT"}, {Classic::PAD_LEFT, "LEFT"}, {Classic::PAD_RIGHT, "RIGHT"},
@ -757,12 +757,12 @@ static std::string GenerateWiiInputDisplayString(int index, const DesiredWiimote
const auto right_stick = cc.GetRightStick().value; const auto right_stick = cc.GetRightStick().value;
display_str += Analog2DToString(right_stick.x, right_stick.y, " R-ANA", rstick_max); display_str += Analog2DToString(right_stick.x, right_stick.y, " R-ANA", rstick_max);
}, },
[&](const Guitar::DataFormat&) { display_str += " Guitar"; }, [&](const Guitar::DesiredState&) { display_str += " Guitar"; },
[&](const Drums::DesiredState&) { display_str += " Drums"; }, [&](const Drums::DesiredState&) { display_str += " Drums"; },
[&](const Turntable::DataFormat&) { display_str += " Turntable"; }, [&](const Turntable::DesiredState&) { display_str += " Turntable"; },
[&](const UDrawTablet::DataFormat&) { display_str += " UDraw"; }, [&](const UDrawTablet::DesiredState&) { display_str += " UDraw"; },
[&](const DrawsomeTablet::DataFormat&) { display_str += " Drawsome"; }, [&](const DrawsomeTablet::DesiredState&) { display_str += " Drawsome"; },
[&](const TaTaCon::DataFormat&) { display_str += " TaTaCon"; }, [&](const TaTaCon::DesiredState&) { display_str += " TaTaCon"; },
[&](const Shinkansen::DesiredState&) { display_str += " Shinkansen"; }, [&](const Shinkansen::DesiredState&) { display_str += " Shinkansen"; },
[](const auto& arg) { [](const auto& arg) {
static_assert(std::is_same_v<std::monostate, std::decay_t<decltype(arg)>>, static_assert(std::is_same_v<std::monostate, std::decay_t<decltype(arg)>>,