Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Bugs & Joypad in Android

Browse source 
================================

-resolved many graphical glitches with multiple lights in GLES2 render
-fixes and WIP apk expansion
-joystick support for Android by Ariel
This commit is contained in:
Juan Linietsky 2014-07-02 00:09:36 -03:00
parent 77a15e2a3e
commit e9da61411a
8 changed files with 359 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

45
platform/android/java_glue.cpp
View file

@ -581,6 +581,8 @@ static Vector3 accelerometer;
static HashMap<String,JNISingleton*> jni_singletons;
static jobject godot_io;
static Vector<int> joy_device_ids;
typedef void (*GFXInitFunc)(void *ud,bool gl2);
static jmethodID _on_video_init=0;
@ -1279,6 +1281,49 @@ static unsigned int android_get_keysym(unsigned int p_code) {
return KEY_UNKNOWN;
}
static int find_device(int p_device) {
for (int i=0; i<joy_device_ids.size(); i++) {
if (joy_device_ids[i] == p_device) {
//print_line("found device at "+String::num(i));
return i;
};
};
//print_line("adding a device at" + String::num(joy_device_ids.size()));
joy_device_ids.push_back(p_device);
return joy_device_ids.size() - 1;
};
JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joybutton(JNIEnv * env, jobject obj, jint p_device, jint p_button, jboolean p_pressed) {
InputEvent ievent;
ievent.type = InputEvent::JOYSTICK_BUTTON;
ievent.device = find_device(p_device);
ievent.joy_button.button_index = p_button;
ievent.joy_button.pressed = p_pressed;
input_mutex->lock();
key_events.push_back(ievent);
input_mutex->unlock();
};
JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joyaxis(JNIEnv * env, jobject obj, jint p_device, jint p_axis, jfloat p_value) {
InputEvent ievent;
ievent.type = InputEvent::JOYSTICK_MOTION;
ievent.device = find_device(p_device);
ievent.joy_motion.axis = p_axis;
ievent.joy_motion.axis_value = p_value;
input_mutex->lock();
key_events.push_back(ievent);
input_mutex->unlock();
};
JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_key(JNIEnv * env, jobject obj, jint p_scancode, jint p_unicode_char, jboolean p_pressed) {
InputEvent ievent;