From 03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9 Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Thu, 12 May 2016 13:09:36 +0300
Subject: Refactor input subsystem

---
 src/core/settings.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index ce2a31164..df5915442 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -13,29 +13,37 @@ namespace Settings {
 
 namespace NativeInput {
 enum Values {
+    // directly mapped keys
     A, B, X, Y,
     L, R, ZL, ZR,
     START, SELECT, HOME,
     DUP, DDOWN, DLEFT, DRIGHT,
-    SUP, SDOWN, SLEFT, SRIGHT,
     CUP, CDOWN, CLEFT, CRIGHT,
+
+    // indirectly mapped keys
+    CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
+
     NUM_INPUTS
 };
+
 static const std::array<const char*, NUM_INPUTS> Mapping = {{
+    // directly mapped keys
     "pad_a", "pad_b", "pad_x", "pad_y",
     "pad_l", "pad_r", "pad_zl", "pad_zr",
     "pad_start", "pad_select", "pad_home",
     "pad_dup", "pad_ddown", "pad_dleft", "pad_dright",
-    "pad_sup", "pad_sdown", "pad_sleft", "pad_sright",
-    "pad_cup", "pad_cdown", "pad_cleft", "pad_cright"
+    "pad_cup", "pad_cdown", "pad_cleft", "pad_cright",
+
+    // indirectly mapped keys
+    "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right"
 }};
 static const std::array<Values, NUM_INPUTS> All = {{
     A, B, X, Y,
     L, R, ZL, ZR,
     START, SELECT, HOME,
     DUP, DDOWN, DLEFT, DRIGHT,
-    SUP, SDOWN, SLEFT, SRIGHT,
-    CUP, CDOWN, CLEFT, CRIGHT
+    CUP, CDOWN, CLEFT, CRIGHT,
+    CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
 }};
 }
 
-- 
cgit v1.2.3


From 416faa20d1156ac4e8646710e9c1f9565c0ed14b Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Fri, 13 May 2016 18:32:43 +0300
Subject: implement circle pad modifier

---
 src/core/settings.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index df5915442..d6f8f2ff3 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -22,6 +22,7 @@ enum Values {
 
     // indirectly mapped keys
     CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
+    CIRCLE_MODIFIER,
 
     NUM_INPUTS
 };
@@ -35,7 +36,8 @@ static const std::array<const char*, NUM_INPUTS> Mapping = {{
     "pad_cup", "pad_cdown", "pad_cleft", "pad_cright",
 
     // indirectly mapped keys
-    "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right"
+    "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right",
+    "pad_circle_modifier",
 }};
 static const std::array<Values, NUM_INPUTS> All = {{
     A, B, X, Y,
@@ -44,6 +46,7 @@ static const std::array<Values, NUM_INPUTS> All = {{
     DUP, DDOWN, DLEFT, DRIGHT,
     CUP, CDOWN, CLEFT, CRIGHT,
     CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
+    CIRCLE_MODIFIER,
 }};
 }
 
@@ -51,6 +54,7 @@ static const std::array<Values, NUM_INPUTS> All = {{
 struct Values {
     // Controls
     std::array<int, NativeInput::NUM_INPUTS> input_mappings;
+    float pad_circle_modifier_scale;
 
     // Core
     int frame_skip;
-- 
cgit v1.2.3