From ddb82a5e8ca84df1b95942c8b3a1fa6c9071010b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 20 Jan 2025 23:19:56 -0600 Subject: [PATCH] InputCommon/ControllerEmu: Break out functionality of EmulatedController to eliminate redundant unused members in Wii Remote extension objects. --- .../model/controlleremu/EmulatedController.kt | 21 +++- .../settings/ui/SettingsFragmentPresenter.kt | 25 +++- Source/Android/jni/AndroidCommon/IDCache.cpp | 30 +++++ Source/Android/jni/AndroidCommon/IDCache.h | 4 + .../Android/jni/Input/EmulatedController.cpp | 29 ++++- Source/Core/Core/HW/GCPadEmu.cpp | 16 +-- .../Core/HW/WiimoteEmu/Extension/Classic.cpp | 6 +- .../WiimoteEmu/Extension/DrawsomeTablet.cpp | 4 +- .../Core/HW/WiimoteEmu/Extension/Drums.cpp | 5 +- .../HW/WiimoteEmu/Extension/Extension.cpp | 5 - .../Core/HW/WiimoteEmu/Extension/Extension.h | 6 +- .../Core/HW/WiimoteEmu/Extension/Guitar.cpp | 4 +- .../Core/HW/WiimoteEmu/Extension/Nunchuk.cpp | 8 +- .../Core/HW/WiimoteEmu/Extension/Nunchuk.h | 2 +- .../HW/WiimoteEmu/Extension/Shinkansen.cpp | 4 +- .../HW/WiimoteEmu/Extension/Turntable.cpp | 5 +- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 2 +- Source/Core/DolphinQt/TAS/TASInputWindow.cpp | 9 +- .../ControlGroup/Attachments.cpp | 61 +++++++++- .../ControllerEmu/ControlGroup/Attachments.h | 22 ++-- .../ControlGroup/ControlGroup.cpp | 60 ++------- .../ControllerEmu/ControlGroup/ControlGroup.h | 9 +- .../ControllerEmu/ControllerEmu.cpp | 90 ++++++-------- .../InputCommon/ControllerEmu/ControllerEmu.h | 114 ++++++++++-------- .../InputCommon/ControllerEmu/StickGate.cpp | 11 +- .../InputCommon/ControllerEmu/StickGate.h | 5 +- 26 files changed, 312 insertions(+), 245 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt index 4b2c6ec92c..e0938b975d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt @@ -4,6 +4,19 @@ package org.dolphinemu.dolphinemu.features.input.model.controlleremu import androidx.annotation.Keep +/** + * Represents a C++ ControllerEmu::ControlGroupContainer. + * + * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed + * in C++ is undefined behavior! + */ +@Keep +open class ControlGroupContainer constructor(private val pointer: Long) { + external fun getGroupCount(): Int + + external fun getGroup(index: Int): ControlGroup +} + /** * Represents a C++ ControllerEmu::EmulatedController. * @@ -11,15 +24,11 @@ import androidx.annotation.Keep * in C++ is undefined behavior! */ @Keep -class EmulatedController private constructor(private val pointer: Long) { +class EmulatedController private constructor(private val pointer: Long) : ControlGroupContainer(pointer) { external fun getDefaultDevice(): String external fun setDefaultDevice(device: String) - external fun getGroupCount(): Int - - external fun getGroup(index: Int): ControlGroup - external fun updateSingleControlReference(controlReference: ControlReference) external fun loadDefaultSettings() @@ -50,7 +59,7 @@ class EmulatedController private constructor(private val pointer: Long) { external fun getWiimoteAttachment( controllerIndex: Int, attachmentIndex: Int - ): EmulatedController + ): ControlGroupContainer @JvmStatic external fun getSelectedWiimoteAttachment(controllerIndex: Int): Int diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index ab0a85e11a..f98613cca6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -22,6 +22,7 @@ import org.dolphinemu.dolphinemu.features.input.model.InputMappingBooleanSetting import org.dolphinemu.dolphinemu.features.input.model.InputMappingDoubleSetting import org.dolphinemu.dolphinemu.features.input.model.InputMappingIntSetting import org.dolphinemu.dolphinemu.features.input.model.controlleremu.ControlGroup +import org.dolphinemu.dolphinemu.features.input.model.controlleremu.ControlGroupContainer import org.dolphinemu.dolphinemu.features.input.model.controlleremu.EmulatedController import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting import org.dolphinemu.dolphinemu.features.input.model.view.InputDeviceSetting @@ -2255,8 +2256,9 @@ class SettingsFragmentPresenter( wiimoteNumber: Int, extensionType: Int ) { - addControllerMappingSettings( + addContainerMappingSettings( sl, + EmulatedController.getWiimote(wiimoteNumber), EmulatedController.getWiimoteAttachment(wiimoteNumber, extensionType), null ) @@ -2404,15 +2406,32 @@ class SettingsFragmentPresenter( * @param groupTypeFilter If this is non-null, only groups whose types match this are considered. */ private fun addControllerMappingSettings( + sl: ArrayList, + controller: EmulatedController, + groupTypeFilter: Set? + ) { + addContainerMappingSettings(sl, controller, controller, groupTypeFilter) + } + + /** + * Adds mapping settings and other control-specific settings. + * + * @param sl The list to place controller settings into. + * @param controller The encompassing controller. + * @param container The container of control groups to add settings for. + * @param groupTypeFilter If this is non-null, only groups whose types match this are considered. + */ + private fun addContainerMappingSettings( sl: ArrayList, controller: EmulatedController, + container: ControlGroupContainer, groupTypeFilter: Set? ) { updateOldControllerSettingsWarningVisibility(controller) - val groupCount = controller.getGroupCount() + val groupCount = container.getGroupCount() for (i in 0 until groupCount) { - val group = controller.getGroup(i) + val group = container.getGroup(i) val groupType = group.getGroupType() if (groupTypeFilter != null && !groupTypeFilter.contains(groupType)) continue diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp index eba20ead91..33a679bf55 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.cpp +++ b/Source/Android/jni/AndroidCommon/IDCache.cpp @@ -97,6 +97,10 @@ static jclass s_control_reference_class; static jfieldID s_control_reference_pointer; static jmethodID s_control_reference_constructor; +static jclass s_control_group_container_class; +static jfieldID s_control_group_container_pointer; +static jmethodID s_control_group_container_constructor; + static jclass s_emulated_controller_class; static jfieldID s_emulated_controller_pointer; static jmethodID s_emulated_controller_constructor; @@ -446,6 +450,21 @@ jmethodID GetControlReferenceConstructor() return s_control_reference_constructor; } +jclass GetControlGroupContainerClass() +{ + return s_control_group_container_class; +} + +jfieldID GetControlGroupContainerPointer() +{ + return s_control_group_container_pointer; +} + +jmethodID GetControlGroupContainerConstructor() +{ + return s_control_group_container_constructor; +} + jclass GetEmulatedControllerClass() { return s_emulated_controller_class; @@ -685,6 +704,16 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) s_control_reference_constructor = env->GetMethodID(control_reference_class, "", "(J)V"); env->DeleteLocalRef(control_reference_class); + const jclass control_group_container_class = env->FindClass( + "org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroupContainer"); + s_control_group_container_class = + reinterpret_cast(env->NewGlobalRef(control_group_container_class)); + s_control_group_container_pointer = + env->GetFieldID(control_group_container_class, "pointer", "J"); + s_control_group_container_constructor = + env->GetMethodID(control_group_container_class, "", "(J)V"); + env->DeleteLocalRef(control_group_container_class); + const jclass emulated_controller_class = env->FindClass( "org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController"); s_emulated_controller_class = @@ -754,5 +783,6 @@ JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved) env->DeleteGlobalRef(s_numeric_setting_class); env->DeleteGlobalRef(s_core_device_class); env->DeleteGlobalRef(s_core_device_control_class); + env->DeleteGlobalRef(s_control_group_container_class); } } diff --git a/Source/Android/jni/AndroidCommon/IDCache.h b/Source/Android/jni/AndroidCommon/IDCache.h index c31f598441..d28b493a5b 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.h +++ b/Source/Android/jni/AndroidCommon/IDCache.h @@ -92,6 +92,10 @@ jclass GetControlReferenceClass(); jfieldID GetControlReferencePointer(); jmethodID GetControlReferenceConstructor(); +jclass GetControlGroupContainerClass(); +jfieldID GetControlGroupContainerPointer(); +jmethodID GetControlGroupContainerConstructor(); + jclass GetEmulatedControllerClass(); jfieldID GetEmulatedControllerPointer(); jmethodID GetEmulatedControllerConstructor(); diff --git a/Source/Android/jni/Input/EmulatedController.cpp b/Source/Android/jni/Input/EmulatedController.cpp index 8a76240dfd..45f6148f2b 100644 --- a/Source/Android/jni/Input/EmulatedController.cpp +++ b/Source/Android/jni/Input/EmulatedController.cpp @@ -20,6 +20,23 @@ #include "jni/Input/ControlReference.h" #include "jni/Input/NumericSetting.h" +ControllerEmu::ControlGroupContainer* ControlGroupContainerFromJava(JNIEnv* env, jobject obj) +{ + return reinterpret_cast( + env->GetLongField(obj, IDCache::GetEmulatedControllerPointer())); +} + +static jobject ControlGroupContainerToJava(JNIEnv* env, + ControllerEmu::ControlGroupContainer* container) +{ + if (!container) + return nullptr; + + return env->NewObject(IDCache::GetControlGroupContainerClass(), + IDCache::GetControlGroupContainerConstructor(), + reinterpret_cast(container)); +} + ControllerEmu::EmulatedController* EmulatedControllerFromJava(JNIEnv* env, jobject obj) { return reinterpret_cast( @@ -53,18 +70,18 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedContro } JNIEXPORT jint JNICALL -Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedController_getGroupCount( +Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroupContainer_getGroupCount( JNIEnv* env, jobject obj) { - return static_cast(EmulatedControllerFromJava(env, obj)->groups.size()); + return static_cast(ControlGroupContainerFromJava(env, obj)->groups.size()); } JNIEXPORT jobject JNICALL -Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedController_getGroup( +Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroupContainer_getGroup( JNIEnv* env, jobject obj, jint controller_index) { - return ControlGroupToJava(env, - EmulatedControllerFromJava(env, obj)->groups[controller_index].get()); + return ControlGroupToJava( + env, ControlGroupContainerFromJava(env, obj)->groups[controller_index].get()); } JNIEXPORT void JNICALL @@ -175,7 +192,7 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedContro { auto* attachments = static_cast( Wiimote::GetWiimoteGroup(controller_index, WiimoteEmu::WiimoteGroup::Attachments)); - return EmulatedControllerToJava(env, attachments->GetAttachmentList()[attachment_index].get()); + return ControlGroupContainerToJava(env, attachments->GetAttachmentList()[attachment_index].get()); } JNIEXPORT jint JNICALL diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp index fbbcbc630e..0058bc74e4 100644 --- a/Source/Core/Core/HW/GCPadEmu.cpp +++ b/Source/Core/Core/HW/GCPadEmu.cpp @@ -10,8 +10,6 @@ #include "Core/HW/GCPad.h" -#include "InputCommon/ControllerEmu/Control/Input.h" -#include "InputCommon/ControllerEmu/Control/Output.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" @@ -128,6 +126,8 @@ ControllerEmu::ControlGroup* GCPad::GetGroup(PadGroup group) GCPadStatus GCPad::GetInput() const { + using ControllerEmu::MapFloat; + const auto lock = GetStateLock(); GCPadStatus pad = {}; @@ -182,12 +182,12 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface) // Rumble m_rumble->SetControlExpression(0, "`Android/0/Device Sensors:Motor 0`"); #else - // Buttons - m_buttons->SetControlExpression(0, "`X`"); // A - m_buttons->SetControlExpression(1, "`Z`"); // B - m_buttons->SetControlExpression(2, "`C`"); // X - m_buttons->SetControlExpression(3, "`S`"); // Y - m_buttons->SetControlExpression(4, "`D`"); // Z + // Buttons: A, B, X, Y, Z + m_buttons->SetControlExpression(0, "`X`"); + m_buttons->SetControlExpression(1, "`Z`"); + m_buttons->SetControlExpression(2, "`C`"); + m_buttons->SetControlExpression(3, "`S`"); + m_buttons->SetControlExpression(4, "`D`"); #ifdef _WIN32 m_buttons->SetControlExpression(5, "`RETURN`"); // Start #else diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp index d3bdff9faa..d44de1b40e 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp @@ -4,17 +4,13 @@ #include "Core/HW/WiimoteEmu/Extension/Classic.h" #include -#include -#include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" @@ -88,6 +84,8 @@ Classic::Classic() : Extension1stParty("Classic", _trans("Classic Controller")) void Classic::BuildDesiredExtensionState(DesiredExtensionState* target_state) { + using ControllerEmu::MapFloat; + DataFormat classic_data = {}; // left stick diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp index b6367e1aa7..6f6cc5973f 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp @@ -6,14 +6,12 @@ #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Triggers.h" @@ -37,6 +35,8 @@ DrawsomeTablet::DrawsomeTablet() : Extension3rdParty("Drawsome", _trans("Drawsom void DrawsomeTablet::BuildDesiredExtensionState(DesiredExtensionState* target_state) { + using ControllerEmu::MapFloat; + DataFormat& tablet_data = target_state->data.emplace(); // Stylus X/Y (calibrated values): diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp index bec40343b9..51399c68b8 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp @@ -3,8 +3,6 @@ #include "Core/HW/WiimoteEmu/Extension/Drums.h" -#include - #include "Common/Assert.h" #include "Common/BitUtils.h" #include "Common/Common.h" @@ -13,7 +11,6 @@ #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" @@ -83,6 +80,8 @@ Drums::Drums() : Extension1stParty("Drums", _trans("Drum Kit")) void Drums::BuildDesiredExtensionState(DesiredExtensionState* target_state) { + using ControllerEmu::MapFloat; + DesiredState& state = target_state->data.emplace(); { diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp index d733385dbb..f990ce334a 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp @@ -32,11 +32,6 @@ std::string Extension::GetDisplayName() const return m_display_name; } -InputConfig* Extension::GetConfig() const -{ - return ::Wiimote::GetConfig(); -} - None::None() : Extension("None") { } diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h index d836e49a46..e799853774 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h @@ -10,13 +10,13 @@ #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Encryption.h" #include "Core/HW/WiimoteEmu/I2CBus.h" -#include "InputCommon/ControllerEmu/ControllerEmu.h" +#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h" namespace WiimoteEmu { struct DesiredExtensionState; -class Extension : public ControllerEmu::EmulatedController, public I2CSlave +class Extension : public ControllerEmu::AttachedController, public I2CSlave { public: explicit Extension(const char* name); @@ -25,8 +25,6 @@ public: std::string GetName() const override; std::string GetDisplayName() const override; - InputConfig* GetConfig() const override; - // Used by the wiimote to detect extension changes. // The normal extensions short this pin so it's always connected, // but M+ does some tricks with it during activation. diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp index ebcd9b63f6..27e9e93196 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp @@ -8,14 +8,12 @@ #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" @@ -99,6 +97,8 @@ Guitar::Guitar() : Extension1stParty(_trans("Guitar")) void Guitar::BuildDesiredExtensionState(DesiredExtensionState* target_state) { + using ControllerEmu::MapFloat; + DataFormat guitar_data = {}; // stick diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp index 14ba12b01f..57c4c52b83 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp @@ -3,21 +3,17 @@ #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h" -#include #include #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/Common.h" #include "Common/CommonTypes.h" -#include "Common/MathUtil.h" #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" @@ -64,6 +60,8 @@ Nunchuk::Nunchuk() : Extension1stParty(_trans("Nunchuk")) void Nunchuk::BuildDesiredExtensionState(DesiredExtensionState* target_state) { + using ControllerEmu::MapFloat; + DataFormat nc_data = {}; // stick @@ -197,7 +195,7 @@ void Nunchuk::DoState(PointerWrap& p) p.Do(m_shake_state); } -void Nunchuk::LoadDefaults(const ControllerInterface& ciface) +void Nunchuk::LoadDefaults() { #ifndef ANDROID // Stick diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.h index 438b93c034..6c94c81bf4 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.h +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.h @@ -158,7 +158,7 @@ public: ControllerEmu::ControlGroup* GetGroup(NunchukGroup group); - void LoadDefaults(const ControllerInterface& ciface) override; + void LoadDefaults() override; static constexpr u8 BUTTON_C = 0x02; static constexpr u8 BUTTON_Z = 0x01; diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Shinkansen.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Shinkansen.cpp index 5da6cdd31c..db52979a3d 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Shinkansen.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Shinkansen.cpp @@ -57,6 +57,8 @@ Shinkansen::Shinkansen() : Extension3rdParty("Shinkansen", _trans("Shinkansen Co void Shinkansen::BuildDesiredExtensionState(DesiredExtensionState* target_state) { + using ControllerEmu::MapFloat; + DesiredState& state = target_state->data.emplace(); const auto analog = m_levers->GetState().data; @@ -104,7 +106,7 @@ void Shinkansen::Update(const DesiredExtensionState& target_state) ext_data.buttons = desired_state.buttons ^ 0xFFFF; Common::BitCastPtr(&m_reg.controller_data) = ext_data; - const auto lock = GetStateLock(); + const auto lock = ControllerEmu::EmulatedController::GetStateLock(); m_led->controls[0]->control_ref->State(m_reg.identifier[1]); } diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp index 09fb36563a..64a292ced3 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp @@ -7,19 +7,16 @@ #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/ControlGroup/Slider.h" -#include "InputCommon/ControllerEmu/ControlGroup/Triggers.h" namespace WiimoteEmu { @@ -84,6 +81,8 @@ Turntable::Turntable() : Extension1stParty("Turntable", _trans("DJ Turntable")) void Turntable::BuildDesiredExtensionState(DesiredExtensionState* target_state) { + using ControllerEmu::MapFloat; + DataFormat tt_data = {}; // stick diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index f8115afdf8..265d39a4d7 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -790,7 +790,7 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface) // Enable Nunchuk: constexpr ExtensionNumber DEFAULT_EXT = ExtensionNumber::NUNCHUK; m_attachments->SetSelectedAttachment(DEFAULT_EXT); - m_attachments->GetAttachmentList()[DEFAULT_EXT]->LoadDefaults(ciface); + m_attachments->GetAttachmentList()[DEFAULT_EXT]->LoadDefaults(); } Extension* Wiimote::GetNoneExtension() const diff --git a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp index d3dc078375..8075c6af58 100644 --- a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp @@ -17,11 +17,8 @@ #include #include -#include "Common/CommonTypes.h" - #include "DolphinQt/Host.h" #include "DolphinQt/QtUtils/AspectRatioWidget.h" -#include "DolphinQt/QtUtils/QueueOnObject.h" #include "DolphinQt/Resources.h" #include "DolphinQt/TAS/StickWidget.h" #include "DolphinQt/TAS/TASCheckBox.h" @@ -250,14 +247,12 @@ std::optional TASInputWindow::GetButton(TASCheckBox* checkbox, std::optional TASInputWindow::GetSpinBox(TASSpinBox* spin, int zero, int min, int max, ControlState controller_state) { - const int controller_value = - ControllerEmu::EmulatedController::MapFloat(controller_state, zero, 0, max); + const int controller_value = ControllerEmu::MapFloat(controller_state, zero, 0, max); if (m_use_controller->isChecked()) spin->OnControllerValueChanged(controller_value); - return ControllerEmu::EmulatedController::MapToFloat(spin->GetValue(), zero, - min, max); + return ControllerEmu::MapToFloat(spin->GetValue(), zero, min, max); } std::optional TASInputWindow::GetSpinBox(TASSpinBox* spin, int zero, diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.cpp index b4bb1699c0..45ce337d6c 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.cpp @@ -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 att) +void Attachments::AddAttachment(std::unique_ptr att) { m_attachments.emplace_back(std::move(att)); } @@ -40,9 +45,61 @@ SubscribableSettingValue& Attachments::GetAttachmentSetting() return m_selection_value; } -const std::vector>& Attachments::GetAttachmentList() const +const std::vector>& 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 diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.h index 887231196b..1573b01bca 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.h @@ -3,19 +3,23 @@ #pragma once -#include #include #include #include #include "Common/CommonTypes.h" -#include "Core/HW/WiimoteEmu/ExtensionPort.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" namespace ControllerEmu { +class AttachedController : public ControlGroupContainer +{ +public: + virtual void LoadDefaults(); +}; + // A container of the selected and available attachments // for configuration saving/loading purposes class Attachments : public ControlGroup @@ -23,7 +27,7 @@ class Attachments : public ControlGroup public: explicit Attachments(const std::string& name); - void AddAttachment(std::unique_ptr att); + void AddAttachment(std::unique_ptr att); u32 GetSelectedAttachment() const; void SetSelectedAttachment(u32 val); @@ -31,16 +35,20 @@ public: NumericSetting& GetSelectionSetting(); SubscribableSettingValue& GetAttachmentSetting(); - const std::vector>& GetAttachmentList() const; + const std::vector>& GetAttachmentList() const; + + void LoadConfig(Common::IniFile::Section* sec, const std::string& base) override; + void SaveConfig(Common::IniFile::Section* sec, const std::string& base) override; + + void UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env) override; private: SubscribableSettingValue m_selection_value; // This is here and not added to the list of numeric_settings because it's serialized differently, // by string (to be independent from the enum), and visualized differently in the UI. // For the rest, it's treated similarly to other numeric_settings in the group. - NumericSetting m_selection_setting = { - &m_selection_value, {""}, 0, 0, WiimoteEmu::ExtensionNumber::MAX - 1}; + NumericSetting m_selection_setting = {&m_selection_value, {""}, 0, 0, 0}; - std::vector> m_attachments; + std::vector> m_attachments; }; } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp index 2896acd070..93367649f9 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp @@ -3,13 +3,11 @@ #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" -#include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/Control/Output.h" -#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" @@ -50,8 +48,7 @@ void ControlGroup::AddDeadzoneSetting(SettingValue* value, double maximu ControlGroup::~ControlGroup() = default; -void ControlGroup::LoadConfig(Common::IniFile::Section* sec, const std::string& defdev, - const std::string& base) +void ControlGroup::LoadConfig(Common::IniFile::Section* sec, const std::string& base) { const std::string group(base + name + "/"); @@ -75,36 +72,9 @@ void ControlGroup::LoadConfig(Common::IniFile::Section* sec, const std::string& sec->Get(group + c->name + "/Range", &c->control_ref->range, 100.0); c->control_ref->range /= 100; } - - // extensions - if (type == GroupType::Attachments) - { - auto* const ext = static_cast(this); - - ext->SetSelectedAttachment(0); - u32 n = 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. - ext->GetSelectionSetting().GetInputReference().SetExpression(attachment_text); - - for (auto& ai : ext->GetAttachmentList()) - { - ai->SetDefaultDevice(defdev); - ai->LoadConfig(sec, base + ai->GetName() + "/"); - - if (ai->GetName() == attachment_text) - ext->SetSelectedAttachment(n); - - n++; - } - } } -void ControlGroup::SaveConfig(Common::IniFile::Section* sec, const std::string& defdev, - const std::string& base) +void ControlGroup::SaveConfig(Common::IniFile::Section* sec, const std::string& base) { const std::string group(base + name + "/"); @@ -125,27 +95,15 @@ void ControlGroup::SaveConfig(Common::IniFile::Section* sec, const std::string& // range sec->Set(group + c->name + "/Range", c->control_ref->range * 100.0, 100.0); } +} - // extensions - if (type == GroupType::Attachments) - { - auto* const ext = static_cast(this); +void ControlGroup::UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env) +{ + for (auto& control : controls) + control->control_ref->UpdateReference(env); - if (ext->GetSelectionSetting().IsSimpleValue()) - { - sec->Set(base + name, ext->GetAttachmentList()[ext->GetSelectedAttachment()]->GetName(), - "None"); - } - else - { - std::string expression = ext->GetSelectionSetting().GetInputReference().GetExpression(); - ReplaceBreaksWithSpaces(expression); - sec->Set(base + name, expression, "None"); - } - - for (auto& ai : ext->GetAttachmentList()) - ai->SaveConfig(sec, base + ai->GetName() + "/"); - } + for (auto& setting : numeric_settings) + setting->GetInputReference().UpdateReference(env); } void ControlGroup::SetControlExpression(int index, const std::string& expression) diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h index bb426e9297..7928fb61a9 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h @@ -13,7 +13,6 @@ #include #include -#include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerInterface/CoreDevice.h" @@ -69,10 +68,10 @@ public: DefaultValue default_value = DefaultValue::AlwaysEnabled); virtual ~ControlGroup(); - virtual void LoadConfig(Common::IniFile::Section* sec, const std::string& defdev = "", - const std::string& base = ""); - virtual void SaveConfig(Common::IniFile::Section* sec, const std::string& defdev = "", - const std::string& base = ""); + virtual void LoadConfig(Common::IniFile::Section* sec, const std::string& base); + virtual void SaveConfig(Common::IniFile::Section* sec, const std::string& base); + + virtual void UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env); void SetControlExpression(int index, const std::string& expression); diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp index 0f6f004d10..2d299981db 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp @@ -11,10 +11,7 @@ #include "Common/IniFile.h" #include "InputCommon/ControlReference/ControlReference.h" -#include "InputCommon/ControllerEmu/Control/Control.h" -#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" -#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" namespace ControllerEmu @@ -23,7 +20,7 @@ namespace ControllerEmu // though no EmulatedController usually run in parallel, so it makes little difference static std::recursive_mutex s_get_state_mutex; -std::string EmulatedController::GetDisplayName() const +std::string ControlGroupContainer::GetDisplayName() const { return GetName(); } @@ -47,34 +44,18 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi) ciface::ExpressionParser::ControlEnvironment env(devi, GetDefaultDevice(), m_expression_vars); - UpdateReferences(env); + UpdateGroupsReferences(env); env.CleanUnusedVariables(); } -void EmulatedController::UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env) +void ControlGroupContainer::UpdateGroupsReferences( + ciface::ExpressionParser::ControlEnvironment& env) { - const auto lock = GetStateLock(); + const auto lock = EmulatedController::GetStateLock(); - for (auto& ctrlGroup : groups) - { - for (auto& control : ctrlGroup->controls) - control->control_ref->UpdateReference(env); - - for (auto& setting : ctrlGroup->numeric_settings) - setting->GetInputReference().UpdateReference(env); - - // Attachments: - if (ctrlGroup->type == GroupType::Attachments) - { - auto* const attachments = static_cast(ctrlGroup.get()); - - attachments->GetSelectionSetting().GetInputReference().UpdateReference(env); - - for (auto& attachment : attachments->GetAttachmentList()) - attachment->UpdateReferences(env); - } - } + for (auto& group : groups) + group->UpdateReferences(env); } void EmulatedController::UpdateSingleControlReference(const ControllerInterface& devi, @@ -125,43 +106,40 @@ void EmulatedController::SetDefaultDevice(const std::string& device) void EmulatedController::SetDefaultDevice(ciface::Core::DeviceQualifier devq) { m_default_device = std::move(devq); - - for (auto& ctrlGroup : groups) - { - // Attachments: - if (ctrlGroup->type == GroupType::Attachments) - { - for (auto& ai : static_cast(ctrlGroup.get())->GetAttachmentList()) - { - ai->SetDefaultDevice(m_default_device); - } - } - } } -void EmulatedController::LoadConfig(Common::IniFile::Section* sec, const std::string& base) +ControlGroupContainer::~ControlGroupContainer() = default; + +void EmulatedController::LoadConfig(Common::IniFile::Section* sec) { - const auto lock = GetStateLock(); - std::string defdev = GetDefaultDevice().ToString(); - if (base.empty()) - { - sec->Get(base + "Device", &defdev, ""); + const auto lock = EmulatedController::GetStateLock(); + + std::string defdev; + if (sec->Get("Device", &defdev, "")) SetDefaultDevice(defdev); - } - for (auto& cg : groups) - cg->LoadConfig(sec, defdev, base); + LoadGroupsConfig(sec, ""); } -void EmulatedController::SaveConfig(Common::IniFile::Section* sec, const std::string& base) +void ControlGroupContainer::LoadGroupsConfig(Common::IniFile::Section* sec, const std::string& base) { - const auto lock = GetStateLock(); - const std::string defdev = GetDefaultDevice().ToString(); - if (base.empty()) - sec->Set(/*std::string(" ") +*/ base + "Device", defdev, ""); + for (auto& cg : groups) + cg->LoadConfig(sec, base); +} - for (auto& ctrlGroup : groups) - ctrlGroup->SaveConfig(sec, defdev, base); +void EmulatedController::SaveConfig(Common::IniFile::Section* sec) +{ + const auto lock = EmulatedController::GetStateLock(); + + sec->Set("Device", GetDefaultDevice().ToString(), ""); + + SaveGroupsConfig(sec, ""); +} + +void ControlGroupContainer::SaveGroupsConfig(Common::IniFile::Section* sec, const std::string& base) +{ + for (auto& cg : groups) + cg->SaveConfig(sec, base); } void EmulatedController::LoadDefaults(const ControllerInterface& ciface) @@ -178,12 +156,12 @@ void EmulatedController::LoadDefaults(const ControllerInterface& ciface) } } -void EmulatedController::SetInputOverrideFunction(InputOverrideFunction override_func) +void ControlGroupContainer::SetInputOverrideFunction(InputOverrideFunction override_func) { m_input_override_function = std::move(override_func); } -void EmulatedController::ClearInputOverrideFunction() +void ControlGroupContainer::ClearInputOverrideFunction() { m_input_override_function = {}; } diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h index 88c14cfdb1..0c6ff27cd8 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h @@ -172,29 +172,83 @@ struct RawValue } }; -class EmulatedController +// Maps a float from -1.0..+1.0 to an integer in the provided range. +template +T MapFloat(F input_value, T zero_value, T neg_1_value = std::numeric_limits::min(), + T pos_1_value = std::numeric_limits::max()) +{ + static_assert(std::is_integral(), "T is only sane for int types."); + static_assert(std::is_floating_point(), "F is only sane for float types."); + + static_assert(std::numeric_limits::min() <= std::numeric_limits::min() && + std::numeric_limits::max() >= std::numeric_limits::max(), + "long long is not a superset of T. use of std::llround is not sane."); + + // Here we round when converting from float to int. + // After applying our deadzone, resizing, and reshaping math + // we sometimes have a near-zero value which is slightly negative. (e.g. -0.0001) + // Casting would round down but rounding will yield our "zero_value". + + if (input_value > 0) + return T(std::llround((pos_1_value - zero_value) * input_value + zero_value)); + else + return T(std::llround((zero_value - neg_1_value) * input_value + zero_value)); +} + +// The inverse of the function above. +// Maps an integer in the provided range to a float in the range -1.0..1.0. +template +F MapToFloat(T input_value, T zero_value, T neg_1_value = std::numeric_limits::min(), + T pos_1_value = std::numeric_limits::max()) +{ + static_assert(std::is_integral(), "T is only sane for int types."); + static_assert(std::is_floating_point(), "F is only sane for float types."); + + if (input_value >= zero_value) + return F(input_value - zero_value) / F(pos_1_value - zero_value); + else + return -F(zero_value - input_value) / F(zero_value - neg_1_value); +} + +class ControlGroupContainer { public: - virtual ~EmulatedController(); + virtual ~ControlGroupContainer(); + + virtual void LoadGroupsConfig(Common::IniFile::Section* sec, const std::string& base); + virtual void SaveGroupsConfig(Common::IniFile::Section* sec, const std::string& base); virtual std::string GetName() const = 0; virtual std::string GetDisplayName() const; + void UpdateGroupsReferences(ciface::ExpressionParser::ControlEnvironment& env); + + void SetInputOverrideFunction(InputOverrideFunction override_func); + void ClearInputOverrideFunction(); + + std::vector> groups; + +protected: + InputOverrideFunction m_input_override_function; +}; + +class EmulatedController : public ControlGroupContainer +{ +public: + virtual ~EmulatedController(); + virtual InputConfig* GetConfig() const = 0; virtual void LoadDefaults(const ControllerInterface& ciface); - virtual void LoadConfig(Common::IniFile::Section* sec, const std::string& base = ""); - virtual void SaveConfig(Common::IniFile::Section* sec, const std::string& base = ""); + void LoadConfig(Common::IniFile::Section* sec); + void SaveConfig(Common::IniFile::Section* sec); bool IsDefaultDeviceConnected() const; const ciface::Core::DeviceQualifier& GetDefaultDevice() const; void SetDefaultDevice(const std::string& device); void SetDefaultDevice(ciface::Core::DeviceQualifier devq); - void SetInputOverrideFunction(InputOverrideFunction override_func); - void ClearInputOverrideFunction(); - void UpdateReferences(const ControllerInterface& devi); void UpdateSingleControlReference(const ControllerInterface& devi, ControlReference* ref); @@ -209,55 +263,9 @@ public: // Resets the values while keeping the list. void ResetExpressionVariables(); - std::vector> groups; - - // Maps a float from -1.0..+1.0 to an integer in the provided range. - template - static T MapFloat(F input_value, T zero_value, T neg_1_value = std::numeric_limits::min(), - T pos_1_value = std::numeric_limits::max()) - { - static_assert(std::is_integral(), "T is only sane for int types."); - static_assert(std::is_floating_point(), "F is only sane for float types."); - - static_assert(std::numeric_limits::min() <= std::numeric_limits::min() && - std::numeric_limits::max() >= std::numeric_limits::max(), - "long long is not a superset of T. use of std::llround is not sane."); - - // Here we round when converting from float to int. - // After applying our deadzone, resizing, and reshaping math - // we sometimes have a near-zero value which is slightly negative. (e.g. -0.0001) - // Casting would round down but rounding will yield our "zero_value". - - if (input_value > 0) - return T(std::llround((pos_1_value - zero_value) * input_value + zero_value)); - else - return T(std::llround((zero_value - neg_1_value) * input_value + zero_value)); - } - - // The inverse of the function above. - // Maps an integer in the provided range to a float in the range -1.0..1.0. - template - static F MapToFloat(T input_value, T zero_value, T neg_1_value = std::numeric_limits::min(), - T pos_1_value = std::numeric_limits::max()) - { - static_assert(std::is_integral(), "T is only sane for int types."); - static_assert(std::is_floating_point(), "F is only sane for float types."); - - if (input_value >= zero_value) - return F(input_value - zero_value) / F(pos_1_value - zero_value); - else - return -F(zero_value - input_value) / F(zero_value - neg_1_value); - } - protected: - // TODO: Wiimote attachments actually end up using their parent controller value for this, - // so theirs won't be used (and thus shouldn't even exist). ciface::ExpressionParser::ControlEnvironment::VariableContainer m_expression_vars; - InputOverrideFunction m_input_override_function; - - void UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env); - private: ciface::Core::DeviceQualifier m_default_device; bool m_default_device_is_connected{false}; diff --git a/Source/Core/InputCommon/ControllerEmu/StickGate.cpp b/Source/Core/InputCommon/ControllerEmu/StickGate.cpp index 2c82788b99..c1e8a29b2d 100644 --- a/Source/Core/InputCommon/ControllerEmu/StickGate.cpp +++ b/Source/Core/InputCommon/ControllerEmu/StickGate.cpp @@ -10,7 +10,6 @@ #include #include -#include "Common/Common.h" #include "Common/MathUtil.h" #include "Common/Matrix.h" #include "Common/StringUtil.h" @@ -228,10 +227,9 @@ void ReshapableInput::SetCenter(ReshapableInput::ReshapeData center) m_center = center; } -void ReshapableInput::LoadConfig(Common::IniFile::Section* section, - const std::string& default_device, const std::string& base_name) +void ReshapableInput::LoadConfig(Common::IniFile::Section* section, const std::string& base_name) { - ControlGroup::LoadConfig(section, default_device, base_name); + ControlGroup::LoadConfig(section, base_name); const std::string group(base_name + name + '/'); @@ -271,10 +269,9 @@ void ReshapableInput::LoadConfig(Common::IniFile::Section* section, } } -void ReshapableInput::SaveConfig(Common::IniFile::Section* section, - const std::string& default_device, const std::string& base_name) +void ReshapableInput::SaveConfig(Common::IniFile::Section* section, const std::string& base_name) { - ControlGroup::SaveConfig(section, default_device, base_name); + ControlGroup::SaveConfig(section, base_name); const std::string group(base_name + name + '/'); diff --git a/Source/Core/InputCommon/ControllerEmu/StickGate.h b/Source/Core/InputCommon/ControllerEmu/StickGate.h index 000ca993f7..496621492e 100644 --- a/Source/Core/InputCommon/ControllerEmu/StickGate.h +++ b/Source/Core/InputCommon/ControllerEmu/StickGate.h @@ -8,7 +8,6 @@ #include "Common/Matrix.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" @@ -117,8 +116,8 @@ protected: virtual Control* GetModifierInput() const; private: - void LoadConfig(Common::IniFile::Section*, const std::string&, const std::string&) override; - void SaveConfig(Common::IniFile::Section*, const std::string&, const std::string&) override; + void LoadConfig(Common::IniFile::Section*, const std::string& base_name) override; + void SaveConfig(Common::IniFile::Section*, const std::string& base_name) override; CalibrationData m_calibration; SettingValue m_deadzone_setting;