From f8ab65bcaca3d830ecb66ae21b327f4031484f7a Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 10 Jun 2023 05:15:38 -0400 Subject: [PATCH] Android: Convert InputOverrider to Kotlin --- .../features/input/model/InputOverrider.java | 84 ------------------- .../features/input/model/InputOverrider.kt | 82 ++++++++++++++++++ 2 files changed, 82 insertions(+), 84 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.java create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.kt diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.java deleted file mode 100644 index 6596c8dd91..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.java +++ /dev/null @@ -1,84 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.dolphinemu.dolphinemu.features.input.model; - -public final class InputOverrider -{ - public static final class ControlId - { - public static final int GCPAD_A_BUTTON = 0; - public static final int GCPAD_B_BUTTON = 1; - public static final int GCPAD_X_BUTTON = 2; - public static final int GCPAD_Y_BUTTON = 3; - public static final int GCPAD_Z_BUTTON = 4; - public static final int GCPAD_START_BUTTON = 5; - public static final int GCPAD_DPAD_UP = 6; - public static final int GCPAD_DPAD_DOWN = 7; - public static final int GCPAD_DPAD_LEFT = 8; - public static final int GCPAD_DPAD_RIGHT = 9; - public static final int GCPAD_L_DIGITAL = 10; - public static final int GCPAD_R_DIGITAL = 11; - public static final int GCPAD_L_ANALOG = 12; - public static final int GCPAD_R_ANALOG = 13; - public static final int GCPAD_MAIN_STICK_X = 14; - public static final int GCPAD_MAIN_STICK_Y = 15; - public static final int GCPAD_C_STICK_X = 16; - public static final int GCPAD_C_STICK_Y = 17; - - public static final int WIIMOTE_A_BUTTON = 18; - public static final int WIIMOTE_B_BUTTON = 19; - public static final int WIIMOTE_ONE_BUTTON = 20; - public static final int WIIMOTE_TWO_BUTTON = 21; - public static final int WIIMOTE_PLUS_BUTTON = 22; - public static final int WIIMOTE_MINUS_BUTTON = 23; - public static final int WIIMOTE_HOME_BUTTON = 24; - public static final int WIIMOTE_DPAD_UP = 25; - public static final int WIIMOTE_DPAD_DOWN = 26; - public static final int WIIMOTE_DPAD_LEFT = 27; - public static final int WIIMOTE_DPAD_RIGHT = 28; - public static final int WIIMOTE_IR_X = 29; - public static final int WIIMOTE_IR_Y = 30; - - public static final int NUNCHUK_C_BUTTON = 31; - public static final int NUNCHUK_Z_BUTTON = 32; - public static final int NUNCHUK_STICK_X = 33; - public static final int NUNCHUK_STICK_Y = 34; - - public static final int CLASSIC_A_BUTTON = 35; - public static final int CLASSIC_B_BUTTON = 36; - public static final int CLASSIC_X_BUTTON = 37; - public static final int CLASSIC_Y_BUTTON = 38; - public static final int CLASSIC_ZL_BUTTON = 39; - public static final int CLASSIC_ZR_BUTTON = 40; - public static final int CLASSIC_PLUS_BUTTON = 41; - public static final int CLASSIC_MINUS_BUTTON = 42; - public static final int CLASSIC_HOME_BUTTON = 43; - public static final int CLASSIC_DPAD_UP = 44; - public static final int CLASSIC_DPAD_DOWN = 45; - public static final int CLASSIC_DPAD_LEFT = 46; - public static final int CLASSIC_DPAD_RIGHT = 47; - public static final int CLASSIC_L_DIGITAL = 48; - public static final int CLASSIC_R_DIGITAL = 49; - public static final int CLASSIC_L_ANALOG = 50; - public static final int CLASSIC_R_ANALOG = 51; - public static final int CLASSIC_LEFT_STICK_X = 52; - public static final int CLASSIC_LEFT_STICK_Y = 53; - public static final int CLASSIC_RIGHT_STICK_X = 54; - public static final int CLASSIC_RIGHT_STICK_Y = 55; - } - - public static native void registerGameCube(int controllerIndex); - - public static native void registerWii(int controllerIndex); - - public static native void unregisterGameCube(int controllerIndex); - - public static native void unregisterWii(int controllerIndex); - - public static native void setControlState(int controllerIndex, int control, double state); - - public static native void clearControlState(int controllerIndex, int control); - - // Angle is in radians and should be non-negative - public static native double getGateRadiusAtAngle(int emuPadId, int stick, double angle); -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.kt new file mode 100644 index 0000000000..8224434ee6 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.kt @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.dolphinemu.features.input.model + +object InputOverrider { + external fun registerGameCube(controllerIndex: Int) + + external fun registerWii(controllerIndex: Int) + + external fun unregisterGameCube(controllerIndex: Int) + + external fun unregisterWii(controllerIndex: Int) + + external fun setControlState(controllerIndex: Int, control: Int, state: Double) + + external fun clearControlState(controllerIndex: Int, control: Int) + + // Angle is in radians and should be non-negative + external fun getGateRadiusAtAngle(emuPadId: Int, stick: Int, angle: Double): Double + + object ControlId { + const val GCPAD_A_BUTTON = 0 + const val GCPAD_B_BUTTON = 1 + const val GCPAD_X_BUTTON = 2 + const val GCPAD_Y_BUTTON = 3 + const val GCPAD_Z_BUTTON = 4 + const val GCPAD_START_BUTTON = 5 + const val GCPAD_DPAD_UP = 6 + const val GCPAD_DPAD_DOWN = 7 + const val GCPAD_DPAD_LEFT = 8 + const val GCPAD_DPAD_RIGHT = 9 + const val GCPAD_L_DIGITAL = 10 + const val GCPAD_R_DIGITAL = 11 + const val GCPAD_L_ANALOG = 12 + const val GCPAD_R_ANALOG = 13 + const val GCPAD_MAIN_STICK_X = 14 + const val GCPAD_MAIN_STICK_Y = 15 + const val GCPAD_C_STICK_X = 16 + const val GCPAD_C_STICK_Y = 17 + + const val WIIMOTE_A_BUTTON = 18 + const val WIIMOTE_B_BUTTON = 19 + const val WIIMOTE_ONE_BUTTON = 20 + const val WIIMOTE_TWO_BUTTON = 21 + const val WIIMOTE_PLUS_BUTTON = 22 + const val WIIMOTE_MINUS_BUTTON = 23 + const val WIIMOTE_HOME_BUTTON = 24 + const val WIIMOTE_DPAD_UP = 25 + const val WIIMOTE_DPAD_DOWN = 26 + const val WIIMOTE_DPAD_LEFT = 27 + const val WIIMOTE_DPAD_RIGHT = 28 + const val WIIMOTE_IR_X = 29 + const val WIIMOTE_IR_Y = 30 + + const val NUNCHUK_C_BUTTON = 31 + const val NUNCHUK_Z_BUTTON = 32 + const val NUNCHUK_STICK_X = 33 + const val NUNCHUK_STICK_Y = 34 + + const val CLASSIC_A_BUTTON = 35 + const val CLASSIC_B_BUTTON = 36 + const val CLASSIC_X_BUTTON = 37 + const val CLASSIC_Y_BUTTON = 38 + const val CLASSIC_ZL_BUTTON = 39 + const val CLASSIC_ZR_BUTTON = 40 + const val CLASSIC_PLUS_BUTTON = 41 + const val CLASSIC_MINUS_BUTTON = 42 + const val CLASSIC_HOME_BUTTON = 43 + const val CLASSIC_DPAD_UP = 44 + const val CLASSIC_DPAD_DOWN = 45 + const val CLASSIC_DPAD_LEFT = 46 + const val CLASSIC_DPAD_RIGHT = 47 + const val CLASSIC_L_DIGITAL = 48 + const val CLASSIC_R_DIGITAL = 49 + const val CLASSIC_L_ANALOG = 50 + const val CLASSIC_R_ANALOG = 51 + const val CLASSIC_LEFT_STICK_X = 52 + const val CLASSIC_LEFT_STICK_Y = 53 + const val CLASSIC_RIGHT_STICK_X = 54 + const val CLASSIC_RIGHT_STICK_Y = 55 + } +}