diff options
| author | 2023-02-13 12:35:56 -0600 | |
|---|---|---|
| committer | 2023-06-03 00:05:30 -0700 | |
| commit | 58531ecf4f52b6fb1983febcb457bfe11d83d6b7 (patch) | |
| tree | fdbcc564e41ae09687ebcf80b66e8bf601cdbf84 /src | |
| parent | android: frontend: Implement game grid view. (#9) (diff) | |
| download | yuzu-58531ecf4f52b6fb1983febcb457bfe11d83d6b7.tar.gz yuzu-58531ecf4f52b6fb1983febcb457bfe11d83d6b7.tar.xz yuzu-58531ecf4f52b6fb1983febcb457bfe11d83d6b7.zip | |
android: Apply clang format
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java | 11 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.java | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java index 7a1ddd38e..e4619d253 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.java | |||
| @@ -266,11 +266,11 @@ public final class NativeLibrary { | |||
| 266 | coreErrorAlertLock.notify(); | 266 | coreErrorAlertLock.notify(); |
| 267 | } | 267 | } |
| 268 | }).setOnDismissListener(dialog -> { | 268 | }).setOnDismissListener(dialog -> { |
| 269 | coreErrorAlertResult = true; | 269 | coreErrorAlertResult = true; |
| 270 | synchronized (coreErrorAlertLock) { | 270 | synchronized (coreErrorAlertLock) { |
| 271 | coreErrorAlertLock.notify(); | 271 | coreErrorAlertLock.notify(); |
| 272 | } | 272 | } |
| 273 | }).create(); | 273 | }).create(); |
| 274 | } | 274 | } |
| 275 | } | 275 | } |
| 276 | 276 | ||
| @@ -287,6 +287,7 @@ public final class NativeLibrary { | |||
| 287 | 287 | ||
| 288 | /** | 288 | /** |
| 289 | * Handles a core error. | 289 | * Handles a core error. |
| 290 | * | ||
| 290 | * @return true: continue; false: abort | 291 | * @return true: continue; false: abort |
| 291 | */ | 292 | */ |
| 292 | public static boolean OnCoreError(CoreError error, String details) { | 293 | public static boolean OnCoreError(CoreError error, String details) { |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.java index 875719311..6919562f3 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.java +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.java | |||
| @@ -143,12 +143,11 @@ public final class InputOverlayDrawableJoystick { | |||
| 143 | // Clamp the circle pad input to a circle | 143 | // Clamp the circle pad input to a circle |
| 144 | final float angle = (float) Math.atan2(AxisY, AxisX); | 144 | final float angle = (float) Math.atan2(AxisY, AxisX); |
| 145 | float radius = (float) Math.sqrt(AxisX * AxisX + AxisY * AxisY); | 145 | float radius = (float) Math.sqrt(AxisX * AxisX + AxisY * AxisY); |
| 146 | if(radius > 1.0f) | 146 | if (radius > 1.0f) { |
| 147 | { | ||
| 148 | radius = 1.0f; | 147 | radius = 1.0f; |
| 149 | } | 148 | } |
| 150 | axises[0] = ((float)Math.cos(angle) * radius); | 149 | axises[0] = ((float) Math.cos(angle) * radius); |
| 151 | axises[1] = ((float)Math.sin(angle) * radius); | 150 | axises[1] = ((float) Math.sin(angle) * radius); |
| 152 | SetInnerBounds(); | 151 | SetInnerBounds(); |
| 153 | } | 152 | } |
| 154 | } | 153 | } |