ControlMapper refactoring

Common/Input/InputState.cpp

@@ -1,6 +1,8 @@
+#include <vector>
+#include <cstdio>
+
 #include "Common/Input/InputState.h"
 #include "Common/Input/KeyCodes.h"
-#include <vector>
 
 const char *GetDeviceName(int deviceId) {
 	switch (deviceId) {
@@ -76,3 +78,13 @@ int GetAnalogYDirection(int deviceId) {
 		return configured->second;
 	return 0;
 }
+
+void InputMapping::FormatDebug(char *buffer, size_t bufSize) const {
+	if (IsAxis()) {
+		int direction;
+		int axis = Axis(&direction);
+		snprintf(buffer, bufSize, "Device: %d Axis: %d (%d)", deviceId, axis, direction);
+	} else {
+		snprintf(buffer, bufSize, "Device: %d Key: %d", deviceId, keyCode);
+	}
+}

Common/Input/InputState.h

@@ -117,6 +117,13 @@ class InputMapping {
 		return TranslateKeyCodeToAxis(keyCode, direction);
 	}
 
+	InputMapping FlipDirection() const {
+		_dbg_assert_(IsAxis());
+		InputMapping other = *this;
+		other.keyCode ^= 1;
+		return other;
+	}
+
 	// If you want to use std::find and match ANY, you need to perform an explicit search for that.
 	bool operator < (const InputMapping &other) const {
 		if (deviceId < other.deviceId) return true;
@@ -129,6 +136,8 @@ class InputMapping {
 		if (keyCode != other.keyCode) return false;
 		return true;
 	}
+
+	void FormatDebug(char *buffer, size_t bufSize) const;
 };
 
 enum {
@@ -183,7 +192,6 @@ struct AxisInput {
 	int deviceId;
 	int axisId;  // Android axis Ids are the canonical ones.
 	float value;
-	int flags;
 };
 
 // Is there a nicer place for this stuff? It's here to avoid dozens of linking errors in UnitTest..

Common/VR/PPSSPPVR.cpp

@@ -9,6 +9,9 @@
 #include "Common/VR/VRMath.h"
 #include "Common/VR/VRRenderer.h"
 
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
+
 #include "Common/GPU/Vulkan/VulkanContext.h"
 
 #include "Common/Math/lin/matrix4x4.h"

Core/Config.cpp

@@ -849,7 +849,6 @@ static const ConfigSetting graphicsSettings[] = {
 	ConfigSetting("FrameRate", &g_Config.iFpsLimit1, 0, true, true),
 	ConfigSetting("FrameRate2", &g_Config.iFpsLimit2, -1, true, true),
 	ConfigSetting("AnalogFrameRate", &g_Config.iAnalogFpsLimit, 240, true, true),
-	ConfigSetting("AnalogFrameRateMode", &g_Config.iAnalogFpsMode, 0, true, true),
 	ConfigSetting("UnthrottlingMode", &g_Config.iFastForwardMode, &DefaultFastForwardMode, &FastForwardModeToString, &FastForwardModeFromString, true, true),
 #if defined(USING_WIN_UI)
 	ConfigSetting("RestartRequired", &g_Config.bRestartRequired, false, false),

Core/Config.h

@@ -220,7 +220,6 @@ struct Config {
 	int iFpsLimit1;
 	int iFpsLimit2;
 	int iAnalogFpsLimit;
-	int iAnalogFpsMode; // 0 = auto, 1 = single direction, 2 = mapped to opposite
 	int iMaxRecent;
 	int iCurrentStateSlot;
 	int iRewindSnapshotInterval;
@@ -277,9 +276,11 @@ struct Config {
 
 	std::string sThemeName;
 
+	// These aren't saved, just for instant debugging.
 	bool bLogFrameDrops;
 	bool bShowDebugStats;
 	bool bShowAudioDebug;
+	bool bShowControlDebug;
 	bool bShowGpuProfile;
 
 	// Analog stick tilting

Core/ConfigValues.h

@@ -132,12 +132,6 @@ enum class BackgroundAnimation {
 	MOVING_BACKGROUND = 4,
 };
 
-enum class AnalogFpsMode {
-	AUTO = 0,
-	MAPPED_DIRECTION = 1,
-	MAPPED_DIR_TO_OPPOSITE_DIR = 2,
-};
-
 // for Config.iShowStatusFlags
 enum class ShowStatusFlags {
 	FPS_COUNTER = 1 << 1,