diff options
| author | Rémi Verschelde | 2017-03-24 22:49:23 +0100 |
|---|---|---|
| committer | GitHub | 2017-03-24 22:49:23 +0100 |
| commit | 492f6e06c04addb593fdd540f87f038625dce3e7 (patch) | |
| tree | db1f0d16c473957868138628750c1fee539ce832 /platform/android/java_glue.cpp | |
| parent | 15b6eadba74da4ca711d184629136492944f3911 (diff) | |
| parent | cc6810c030b5e08ac91af727f09f0c4cb764b68b (diff) | |
| download | godot-492f6e06c04addb593fdd540f87f038625dce3e7.tar.gz godot-492f6e06c04addb593fdd540f87f038625dce3e7.tar.zst godot-492f6e06c04addb593fdd540f87f038625dce3e7.zip | |
Merge pull request #8088 from BastiaanOlij/android_gravity_2.1
Android gravity vector Godot 2.1
Diffstat (limited to 'platform/android/java_glue.cpp')
| -rw-r--r-- | platform/android/java_glue.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 103a40d6b..64fca4858 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -620,6 +620,7 @@ static bool resized_reload = false; static bool quit_request = false; static Size2 new_size; static Vector3 accelerometer; +static Vector3 gravity; static Vector3 magnetometer; static Vector3 gyroscope; static HashMap<String, JNISingleton *> jni_singletons; @@ -1051,6 +1052,8 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job os_android->process_accelerometer(accelerometer); + os_android->process_gravitymeter(gravity); + os_android->process_magnetometer(magnetometer); os_android->process_gyroscope(gyroscope); @@ -1449,6 +1452,13 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv input_mutex->unlock(); } +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gravity(JNIEnv *env, jobject obj, jfloat x, jfloat y, jfloat z) { + + input_mutex->lock(); + gravity = Vector3(x, y, z); + input_mutex->unlock(); +} + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv *env, jobject obj, jfloat x, jfloat y, jfloat z) { input_mutex->lock(); |
