Skip to content
Permalink
Browse files

Merge pull request #7500 from zackhow/pointer

Android: Add IR pointer control to touch overlay
  • Loading branch information...
JMC47 committed Jan 25, 2019
2 parents f64b301 + e15af50 commit ddb1fbf7017644666f0670d3d8de1b05787c8f96
Showing with 707 additions and 49 deletions.
  1. +5 −0 Data/Sys/GameSettings/RMC.ini
  2. +5 −0 Data/Sys/GameSettings/RMG.ini
  3. +4 −0 Data/Sys/GameSettings/ROD.ini
  4. +4 −0 Data/Sys/GameSettings/RUU.ini
  5. +4 −0 Data/Sys/GameSettings/RZD.ini
  6. +4 −0 Data/Sys/GameSettings/SB4.ini
  7. +12 −0 Source/Android/app/src/main/assets/WiimoteNew.ini
  8. +3 −0 Source/Android/app/src/main/assets/WiimoteProfile.ini
  9. +17 −0 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
  10. +189 −1 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
  11. +3 −0 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
  12. +6 −13 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
  13. +93 −28 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
  14. +1 −0 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
  15. +1 −0 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
  16. +11 −3 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
  17. +135 −0 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java
  18. +115 −0 Source/Android/app/src/main/res/layout/dialog_ir_sensitivity.xml
  19. +15 −1 Source/Android/app/src/main/res/menu/menu_emulation_wii.xml
  20. +13 −0 Source/Android/app/src/main/res/values/arrays.xml
  21. +9 −0 Source/Android/app/src/main/res/values/strings.xml
  22. +8 −0 Source/Android/jni/AndroidCommon/IDCache.cpp
  23. +1 −0 Source/Android/jni/AndroidCommon/IDCache.h
  24. +18 −0 Source/Android/jni/MainAndroid.cpp
  25. +1 −0 Source/Core/InputCommon/ControllerInterface/Android/Android.h
  26. +30 −3 Source/Core/InputCommon/InputConfig.cpp
@@ -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.

@@ -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.

@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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`
@@ -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`
@@ -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();
}

0 comments on commit ddb1fbf

Please sign in to comment.
You can’t perform that action at this time.