godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Use "enum class" for input enums

Browse Source
This commit is contained in:
Aaron Franke
2021-08-13 16:31:57 -05:00
parent 4f85cad013
commit 3c0fdcc8ac
154 changed files with 3482 additions and 3392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
platform/android/java_godot_lib_jni.cpp
View File

@@ -317,8 +317,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env
// Called on the UI thread
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value) {
if (step.get() <= 0)
if (step.get() <= 0) {
return;
}
AndroidInputHandler::JoypadEvent jevent;
jevent.device = p_device;
@@ -331,24 +332,27 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env,
// Called on the UI thread
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y) {
if (step.get() <= 0)
if (step.get() <= 0) {
return;
}
AndroidInputHandler::JoypadEvent jevent;
jevent.device = p_device;
jevent.type = AndroidInputHandler::JOY_EVENT_HAT;
int hat = 0;
HatMask hat = HatMask::CENTER;
if (p_hat_x != 0) {
if (p_hat_x < 0)
hat |= HatMask::HAT_MASK_LEFT;
else
hat |= HatMask::HAT_MASK_RIGHT;
if (p_hat_x < 0) {
hat |= HatMask::LEFT;
} else {
hat |= HatMask::RIGHT;
}
}
if (p_hat_y != 0) {
if (p_hat_y < 0)
hat |= HatMask::HAT_MASK_UP;
else
hat |= HatMask::HAT_MASK_DOWN;
if (p_hat_y < 0) {
hat |= HatMask::UP;
} else {
hat |= HatMask::DOWN;
}
}
jevent.hat = hat;