izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Basic Wiimote binding settings now implemented.

Browse Source
This commit is contained in:
Lioncash
2013-11-19 19:28:10 -05:00
parent 7e544d8996
commit 42f8562e5c
4 changed files with 685 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Android/res/values-ja/strings.xml
+30 -1
View File
@@ -45,14 +45,20 @@
<string name="input_settings">入力</string>
<string name="input_overlay_layout">入力オーバーレイレイアウト</string>
<string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string>
<string name="gamecube_bindings">ゲームキューブの入力バインディング</string>
<string name="gamecube_bindings">ゲームキューブコントローラの入力バインディング</string>
<string name="controller_1">コントローラ1</string>
<string name="controller_2">コントローラ2</string>
<string name="controller_3">コントローラ3</string>
<string name="controller_4">コントローラ4</string>
<string name="enable_controller">コントローラを有効</string>
<string name="wiimote_bindings">Wiiリモコンの入力バインディング</string>
<string name="wiimote_1">Wiiリモコン1</string>
<string name="wiimote_2">Wiiリモコン2</string>
<string name="wiimote_3">Wiiリモコン3</string>
<string name="wiimote_4">Wiiリモコン4</string>
<string name="input_binding">入力バインディング</string>
<string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>
<!-- Gamecube buttons (May be shared with Wiimote stuff too) -->
<string name="button_a">Aボタン</string>
<string name="button_b">Bボタン</string>
<string name="button_start">スタートボタン</string>
@@ -73,6 +79,29 @@
<string name="c_stick_right">C-スティック: →</string>
<string name="trigger_left">左のトリガー</string>
<string name="trigger_right">右のトリガー</string>
<!-- Wiimote (+ extension) only buttons -->
<string name="button_one">ボタン1</string>
<string name="button_two">ボタン2</string>
<string name="button_plus">ボタン+</string>
<string name="button_minus">ボタン-</string>
<string name="button_home">ホームボタン</string>
<string name="ir_up">IR ↑</string>
<string name="ir_down">IR ↓</string>
<string name="ir_left">IR ←</string>
<string name="ir_right">IR →</string>
<string name="ir_forward">IR前方</string>
<string name="ir_backward">IR後方</string>
<string name="swing_up">スイング ↑</string>
<string name="swing_down">スイング ↓</string>
<string name="swing_left">スイング ←</string>
<string name="swing_right">スイング →</string>
<string name="tilt_forward">前方を傾</string>
<string name="tilt_backward">後方を傾</string>
<string name="tilt_left">左を傾</string>
<string name="tilt_right">右を傾</string>
<string name="shake_x">Xを振る</string>
<string name="shake_y">Yを振る</string>
<string name="shake_z">Zを振る</string>
<!-- CPU Preference Fragment -->
<string name="interpreter">Interpreter</string>
Source/Android/res/values/strings.xml
+34 -5
View File
@@ -45,14 +45,21 @@
<string name="input_settings">Input</string>
<string name="input_overlay_layout">Input Overlay Layout</string>
<string name="input_overlay_layout_desc">Button layout for the input overlay.</string>
<string name="gamecube_bindings">Gamecube Input Bindings</string>
<string name="gamecube_bindings">Gamecube Controller Bindings</string>
<string name="controller_1">Controller 1</string>
<string name="controller_2">Controller 2</string>
<string name="controller_3">Controller 3</string>
<string name="controller_4">Controller 4</string>
<string name="enable_controller">Enable controller</string>
<string name="wiimote_bindings">Wiimote Bindings</string>
<string name="wiimote_1">Wiimote 1</string>
<string name="wiimote_2">Wiimote 2</string>
<string name="wiimote_3">Wiimote 3</string>
<string name="wiimote_4">Wiimote 4</string>
<string name="enable_wiimote">Enable Wiimote</string>
<string name="input_binding">Input Binding</string>
<string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
<!-- Gamecube buttons (May be shared with Wiimote stuff too) -->
<string name="button_a">Button A</string>
<string name="button_b">Button B</string>
<string name="button_start">Button Start</string>
@@ -73,6 +80,29 @@
<string name="c_stick_right">C Stick Right</string>
<string name="trigger_left">Trigger L</string>
<string name="trigger_right">Trigger R</string>
<!-- Wiimote (+ extension) only buttons -->
<string name="button_one">Button 1</string>
<string name="button_two">Button 2</string>
<string name="button_plus">Button +</string>
<string name="button_minus">Button -</string>
<string name="button_home">Button Home</string>
<string name="ir_up">IR Up</string>
<string name="ir_down">IR Down</string>
<string name="ir_left">IR Left</string>
<string name="ir_right">IR Right</string>
<string name="ir_forward">IR Forward</string>
<string name="ir_backward">IR Backward</string>
<string name="swing_up">Swing Up</string>
<string name="swing_down">Swing Down</string>
<string name="swing_left">Swing Left</string>
<string name="swing_right">Swing Right</string>
<string name="tilt_forward">Tilt Forward</string>
<string name="tilt_backward">Tilt Backward</string>
<string name="tilt_left">Tilt Left</string>
<string name="tilt_right">Tilt Right</string>
<string name="shake_x">Shake X</string>
<string name="shake_y">Shake Y</string>
<string name="shake_z">Shake Z</string>
<!-- CPU Preference Fragment -->
<string name="interpreter">Interpreter</string>
@@ -96,7 +126,7 @@
<string name="video_backend_desc">%s</string>
<string name="show_fps">Show FPS</string>
<string name="show_fps_descrip">Show the number of frames rendered per second as a measure of emulation speed.</string>
<string name="enhancements">Enhancements</string>
<string name="internal_resolution">Internal Resolution</string>
<string name="internal_resolution_descrip">Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.</string>
@@ -112,7 +142,7 @@
<string name="force_texture_filtering_descrip">Force texture filtering even if the emulated game explicitly disabled it. Improves texture quality slightly but causes glitches in some games.</string>
<string name="disable_fog">Disable Fog</string>
<string name="disable_fog_descrip">Makes distant objects more visible by removing fog, thus increasing the overall detail. Disabling fog will break some games which rely on proper fog emulation.</string>
<string name="hacks">Hacks</string>
<string name="embedded_frame_buffer">Embedded Frame Buffer</string>
<string name="skip_efb_access">Skip EFB Access from CPU</string>
@@ -140,13 +170,12 @@
<string name="disable_destination_alpha_descrip">Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects.</string>
<string name="fast_depth_calculation">Fast Depth Calculation</string>
<string name="fast_depth_calculation_descrip">Uses a less accurate algorithm to calculate depth values.</string>
<!-- Miscellaneous -->
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="cancel">Cancel</string>
<string name="disabled">Disabled</string>
<string name="other">Other</string>
</resources>
Source/Android/res/xml/input_prefs.xml
+600
View File
File diff suppressed because it is too large Load Diff
Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
+21 -3
View File
@@ -36,7 +36,7 @@ public final class InputConfigFragment extends PreferenceFragment
// Set the summary messages of the preferences to whatever binding
// is currently set within the Dolphin config.
final String[] keys =
final String[] gamecubeKeys =
{
"InputA", "InputB", "InputX", "InputY", "InputZ", "InputStart",
"DPadUp", "DPadDown", "DPadLeft", "DPadRight",
@@ -45,10 +45,28 @@ public final class InputConfigFragment extends PreferenceFragment
"InputL", "InputR"
};
// Loop through the keys for all 4 GameCube controllers.
final String[] wiimoteKeys =
{
"WiimoteInputA", "WiimoteInputB", "WiimoteInputOne", "WiimoteInputTwo", "WiimoteInputPlus", "WiimoteInputMinus", "WiimoteInputHome",
"WiimoteIRUp", "WiimoteIRDown", "WiimoteIRLeft", "WiimoteIRRight", "WiimoteIRForward", "WiimoteIRBackward",
"WiimoteSwingUp", "WiimoteSwingDown", "WiimoteSwingLeft", "WiimoteSwingRight",
"WiimoteTiltForward", "WiimoteTiltBackward", "WiimoteTiltLeft", "WiimoteTiltRight",
"WiimoteShakeX", "WiimoteShakeY", "WiimoteShakeZ",
"WiimoteDPadUp", "WiimoteDPadDown", "WiimoteDPadLeft", "WiimoteDPadRight"
};
for (int i = 1; i <= 4; i++)
{
for (String key : keys)
// Loop through the keys for all 4 GameCube controllers.
for (String key : gamecubeKeys)
{
final String binding = NativeLibrary.GetConfig("Dolphin.ini", "Android", key+"_"+i, "None");
final Preference pref = findPreference(key+"_"+i);
pref.setSummary(binding);
}
// Loop through the keys for the Wiimote
for (String key : wiimoteKeys)
{
final String binding = NativeLibrary.GetConfig("Dolphin.ini", "Android", key+"_"+i, "None");
final Preference pref = findPreference(key+"_"+i);