1 files changed, 32 insertions, 15 deletions

diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 45d02876ba..e5b655e5d5 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -215,7 +215,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
 
 	}
 	return v;
-};
+}
 
 String _get_class_name(JNIEnv * env, jclass cls, bool* array) {
 
@@ -233,7 +233,7 @@ String _get_class_name(JNIEnv * env, jclass cls, bool* array) {
 
 	return name;
 
-};
+}
 
 
 Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
@@ -406,7 +406,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
 	env->DeleteLocalRef(c);
 
 	return Variant();
-};
+}
 
 class JNISingleton : public Object {
 
@@ -653,6 +653,7 @@ static bool quit_request=false;
 static Size2 new_size;
 static Vector3 accelerometer;
 static Vector3 magnetometer;
+static Vector3 gyroscope;
 static HashMap<String,JNISingleton*> jni_singletons;
 static jobject godot_io;
 
@@ -667,6 +668,7 @@ static jmethodID _openURI=0;
 static jmethodID _getDataDir=0;
 static jmethodID _getLocale=0;
 static jmethodID _getModel=0;
+static jmethodID _getScreenDPI=0;
 static jmethodID _showKeyboard=0;
 static jmethodID _hideKeyboard=0;
 static jmethodID _setScreenOrientation=0;
@@ -711,6 +713,12 @@ static String _get_model() {
     return String(env->GetStringUTFChars( s, NULL ));
 }
 
+static int _get_screen_dpi() {
+
+	JNIEnv *env = ThreadAndroid::get_env();
+	return env->CallIntMethod(godot_io,_getScreenDPI);
+}
+
 static String _get_unique_id() {
 
     JNIEnv *env = ThreadAndroid::get_env();
@@ -723,27 +731,27 @@ static void _show_vk(const String& p_existing) {
 	JNIEnv* env = ThreadAndroid::get_env();
 	jstring jStr = env->NewStringUTF(p_existing.utf8().get_data());
 	env->CallVoidMethod(godot_io, _showKeyboard, jStr);
-};
+}
 
 static void _set_screen_orient(int p_orient) {
 
 	JNIEnv* env = ThreadAndroid::get_env();
 	env->CallVoidMethod(godot_io, _setScreenOrientation, p_orient );
-};
+}
 
 static String _get_system_dir(int p_dir) {
 
 	JNIEnv *env = ThreadAndroid::get_env();
 	jstring s =(jstring)env->CallObjectMethod(godot_io,_getSystemDir,p_dir);
 	return String(env->GetStringUTFChars( s, NULL ));
-};
+}
 
 
 static void _hide_vk() {
 
 	JNIEnv* env = ThreadAndroid::get_env();
 	env->CallVoidMethod(godot_io, _hideKeyboard);
-};
+}
 
 // virtual Error native_video_play(String p_path);
 // virtual bool native_video_is_playing();
@@ -820,6 +828,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv * e
 			_getDataDir = env->GetMethodID(c,"getDataDir","()Ljava/lang/String;");
 			_getLocale = env->GetMethodID(c,"getLocale","()Ljava/lang/String;");
 			_getModel = env->GetMethodID(c,"getModel","()Ljava/lang/String;");
+			_getScreenDPI = env->GetMethodID(c, "getScreenDPI","()I");
 			_getUniqueID = env->GetMethodID(c,"getUniqueID","()Ljava/lang/String;");
 			_showKeyboard = env->GetMethodID(c,"showKeyboard","(Ljava/lang/String;)V");
 			_hideKeyboard = env->GetMethodID(c,"hideKeyboard","()V");
@@ -874,7 +883,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv * e
 
 	__android_log_print(ANDROID_LOG_INFO,"godot","CMDLINE LEN %i - APK EXPANSION %I\n",cmdlen,int(use_apk_expansion));
 
-	os_android = new OS_Android(_gfx_init_func,env,_open_uri,_get_data_dir,_get_locale, _get_model,_show_vk, _hide_vk,_set_screen_orient,_get_unique_id, _get_system_dir, _play_video,_is_video_playing, _pause_video, _stop_video, _set_keep_screen_on, use_apk_expansion);
+	os_android = new OS_Android(_gfx_init_func,env,_open_uri,_get_data_dir,_get_locale, _get_model, _get_screen_dpi, _show_vk, _hide_vk,_set_screen_orient,_get_unique_id, _get_system_dir, _play_video,_is_video_playing, _pause_video, _stop_video, _set_keep_screen_on, use_apk_expansion);
 	os_android->set_need_reload_hooks(p_need_reload_hook);
 
 	char wd[500];
@@ -944,7 +953,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv * e
 		os_android->reload_gfx();
 	}
 
-
 }
 
 
@@ -959,7 +967,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_quit(JNIEnv * env, jo
 
 static void _initialize_java_modules() {
 
-
 	String modules = Globals::get_singleton()->get("android/modules");
 	Vector<String> mods = modules.split(",",false);
     print_line("ANDROID MODULES : " + modules);
@@ -1093,6 +1100,8 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jo
 
 	os_android->process_magnetometer(magnetometer);
 
+	os_android->process_gyroscope(gyroscope);
+
 	if (os_android->main_loop_iterate()==true) {
 
 		jclass cls = env->FindClass("org/godotengine/godot/Godot");
@@ -1406,7 +1415,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv * en
 	input_mutex->lock();
 	joy_events.push_back(jevent);
 	input_mutex->unlock();
-};
+}
 
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv * env, jobject obj, jint p_device, jint p_axis, jfloat p_value) {
 
@@ -1419,7 +1428,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv * env,
 	input_mutex->lock();
 	joy_events.push_back(jevent);
 	input_mutex->unlock();
-};
+}
 
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv * env, jobject obj, jint p_device, jint p_hat_x, jint p_hat_y) {
 	OS_Android::JoystickEvent jevent;
@@ -1482,7 +1491,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv * env, job
 	input_mutex->lock();
 	key_events.push_back(ievent);
 	input_mutex->unlock();
-};
+}
 
 
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv * env, jobject obj,  jfloat x, jfloat y, jfloat z) {
@@ -1501,6 +1510,14 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv *
 
 }
 
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv * env, jobject obj,  jfloat x, jfloat y, jfloat z) {
+
+	input_mutex->lock();
+	gyroscope=Vector3(x,y,z);
+	input_mutex->unlock();
+
+}
+
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv * env, jobject obj){
 
 	if (!suspend_mutex)
@@ -1703,7 +1720,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv * e
 
 	env->PopLocalFrame(NULL);
 
-};
+}
 
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv * env, jobject p_obj, jint ID, jstring method, jobjectArray params) {
 
@@ -1738,7 +1755,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *
 	// something
 	env->PopLocalFrame(NULL);
 
-};
+}
 
 //Main::cleanup();