piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon/ControllerEmu: Break out functionality of EmulatedController

Browse Source 
to eliminate redundant unused members in Wii Remote extension objects.
This commit is contained in:
Jordan Woyak
2025-01-20 23:19:56 -06:00
parent 225039f742
commit ddb82a5e8c
26 changed files with 312 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.cpp
View File

@ -5,11 +5,16 @@
namespace ControllerEmu
{
void AttachedController::LoadDefaults()
{
}
Attachments::Attachments(const std::string& name_) : ControlGroup(name_, GroupType::Attachments)
{
}
void Attachments::AddAttachment(std::unique_ptr<EmulatedController> att)
void Attachments::AddAttachment(std::unique_ptr<AttachedController> att)
{
m_attachments.emplace_back(std::move(att));
}
@ -40,9 +45,61 @@ SubscribableSettingValue<int>& Attachments::GetAttachmentSetting()
return m_selection_value;
}
const std::vector<std::unique_ptr<EmulatedController>>& Attachments::GetAttachmentList() const
const std::vector<std::unique_ptr<AttachedController>>& Attachments::GetAttachmentList() const
{
return m_attachments;
}
void Attachments::LoadConfig(Common::IniFile::Section* sec, const std::string& base)
{
ControlGroup::LoadConfig(sec, base);
SetSelectedAttachment(0);
std::string attachment_text;
sec->Get(base + name, &attachment_text, "");
// First assume attachment string is a valid expression.
// If it instead matches one of the names of our attachments it is overridden below.
GetSelectionSetting().GetInputReference().SetExpression(attachment_text);
u32 n = 0;
for (auto& ai : GetAttachmentList())
{
ai->LoadGroupsConfig(sec, base + ai->GetName() + "/");
if (ai->GetName() == attachment_text)
SetSelectedAttachment(n);
++n;
}
}
void Attachments::SaveConfig(Common::IniFile::Section* sec, const std::string& base)
{
if (GetSelectionSetting().IsSimpleValue())
{
sec->Set(base + name, GetAttachmentList()[GetSelectedAttachment()]->GetName(), "None");
}
else
{
std::string expression = GetSelectionSetting().GetInputReference().GetExpression();
ReplaceBreaksWithSpaces(expression);
sec->Set(base + name, expression, "None");
}
for (auto& ai : GetAttachmentList())
ai->SaveGroupsConfig(sec, base + ai->GetName() + "/");
}
void Attachments::UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env)
{
ControlGroup::UpdateReferences(env);
GetSelectionSetting().GetInputReference().UpdateReference(env);
for (auto& attachment : GetAttachmentList())
attachment->UpdateGroupsReferences(env);
}
} // namespace ControllerEmu