Merge pull request #7500 from zackhow/pointer

Android: Add IR pointer control to touch overlay

Data/Sys/GameSettings/RMC.ini

@@ -1,5 +1,10 @@
 # RMCE01, RMCJ01, RMCK01, RMCP01 - Mario Kart Wii
 
+[Controls]
+IRHeight = 50
+IRWidth = 30
+IRCenter = 50
+
 [Core]
 # Values set here will override the main Dolphin settings.
 

Data/Sys/GameSettings/RMG.ini

@@ -1,5 +1,10 @@
 # RMGE01, RMGJ01, RMGK01, RMGP01 - SUPER MARIO GALAXY
 
+[Controls]
+IRHeight = 50
+IRWidth = 30
+IRCenter = 50
+
 [Core]
 # Values set here will override the main Dolphin settings.
 

Data/Sys/GameSettings/ROD.ini

@@ -1,4 +1,8 @@
 # RODE01, RODJ01, RODK01, RODP01 - WarioWare: Smooth Moves
+[Controls]
+IRHeight = 71
+IRWidth = 64
+IRCenter = 99
 
 [Core]
 # Values set here will override the main Dolphin settings.

Data/Sys/GameSettings/RUU.ini

@@ -1,4 +1,8 @@
 # RUUE01, RUUJ01, RUUK01, RUUP01 - Animal Crossing Wii
+[Controls]
+IRHeight = 50
+IRWidth = 30
+IRCenter = 50
 
 [Core]
 # Values set here will override the main Dolphin settings.

Data/Sys/GameSettings/RZD.ini

@@ -1,4 +1,8 @@
 # RZDE01, RZDJ01, RZDK01, RZDP01 - The Legend of Zelda: Twilight Princess [Wii]
+[Controls]
+IRHeight = 39
+IRWidth = 37
+IRCenter = 91
 
 [Core]
 # Values set here will override the main Dolphin settings.

Data/Sys/GameSettings/SB4.ini

@@ -1,4 +1,8 @@
 # SB4E01, SB4J01, SB4P01 - Super Mario Galaxy 2
+[Controls]
+IRHeight = 50
+IRWidth = 30
+IRCenter = 50
 
 [Core]
 # Values set here will override the main Dolphin settings.

Source/Android/app/src/main/assets/WiimoteNew.ini

@@ -18,6 +18,9 @@ IR/Right = `Axis 115`
 IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
+IR/Height = 50
+IR/Width = 30
+IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
 Swing/Left = `Axis 122`
@@ -154,6 +157,9 @@ IR/Right = `Axis 115`
 IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
+IR/Height = 50
+IR/Width = 30
+IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
 Swing/Left = `Axis 122`
@@ -290,6 +296,9 @@ IR/Right = `Axis 115`
 IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
+IR/Height = 50
+IR/Width = 30
+IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
 Swing/Left = `Axis 122`
@@ -426,6 +435,9 @@ IR/Right = `Axis 115`
 IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
+IR/Height = 50
+IR/Width = 30
+IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
 Swing/Left = `Axis 122`

Source/Android/app/src/main/assets/WiimoteProfile.ini

@@ -18,6 +18,9 @@ IR/Right = `Axis 115`
 IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
+IR/Height = 50
+IR/Width = 30
+IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
 Swing/Left = `Axis 122`

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java

@@ -397,6 +397,8 @@ public static native String GetConfig(String configFile, String Section, String
    */
   public static native void RefreshWiimotes();
 
+  public static native void ReloadWiimoteConfig();
+
   private static boolean alertResult = false;
 
   public static boolean displayAlertMsg(final String caption, final String text,
@@ -490,4 +492,19 @@ public static void clearEmulationActivity()
 
     sEmulationActivity.clear();
   }
+
+  public static void updateTouchPointer()
+  {
+    final EmulationActivity emulationActivity = sEmulationActivity.get();
+    if (emulationActivity == null)
+    {
+      Log.warning("[NativeLibrary] EmulationActivity is null.");
+    }
+    else
+    {
+      emulationActivity.runOnUiThread(emulationActivity::initInputPointer);
+    }
+  }
+
+  public static native float GetGameAspectRatio();
 }