We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] joystick subsystem patch.

joystick.patch (text/plain), 3.97 KB, created by morgan.devel on 2012-01-13 01:14:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: morgan.devel

Created: 2012-01-13 01:14:05 UTC

Size: 3.97 KB

patch

obsolete

># HG changeset patch
># User Morgan@Morgan-PC
># Date 1326442617 -3600
># Node ID 472614923e95f57c46c7f211d234fdf539641a28
># Parent  b0b81f18bf351d2f6974eafd3223ba282b8f5058
>fix the joystick subsystem
>
>diff -r b0b81f18bf35 -r 472614923e95 android-project/src/org/libsdl/app/SDLActivity.java
>--- a/android-project/src/org/libsdl/app/SDLActivity.java	Thu Jan 12 22:54:09 2012 -0500
>+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Fri Jan 13 09:16:57 2012 +0100
>@@ -565,9 +565,9 @@
> 
>     public void onSensorChanged(SensorEvent event) {
>         if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
>-            SDLActivity.onNativeAccel(event.values[0],
>-                                      event.values[1],
>-                                      event.values[2]);
>+            SDLActivity.onNativeAccel(event.values[0] / SensorManager.GRAVITY_EARTH,
>+                                      event.values[1] / SensorManager.GRAVITY_EARTH,
>+                                      event.values[2] / SensorManager.GRAVITY_EARTH);
>         }
>     }
> 
>diff -r b0b81f18bf35 -r 472614923e95 src/core/android/SDL_android.cpp
>--- a/src/core/android/SDL_android.cpp	Thu Jan 12 22:54:09 2012 -0500
>+++ b/src/core/android/SDL_android.cpp	Fri Jan 13 09:16:57 2012 +0100
>@@ -70,7 +70,7 @@
> 
> // Accelerometer data storage
> static float fLastAccelerometer[3];
>-
>+static bool bHasNewData;
> 
> /*******************************************************************************
>                  Functions called by JNI
>@@ -111,6 +111,8 @@
>     midAudioQuit = mEnv->GetStaticMethodID(mActivityClass,
>                                 "audioQuit", "()V");
> 
>+    bHasNewData = false;
>+
>     if(!midCreateGLContext || !midFlipBuffers || !midAudioInit ||
>        !midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit) {
>         __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL: Couldn't locate Java callbacks, check that they're named and typed correctly");
>@@ -156,7 +158,8 @@
> {
>     fLastAccelerometer[0] = x;
>     fLastAccelerometer[1] = y;
>-    fLastAccelerometer[2] = z;   
>+    fLastAccelerometer[2] = z;
>+    bHasNewData = true;
> }
> 
> // Quit
>@@ -224,12 +227,20 @@
>     }
> }
> 
>-extern "C" void Android_JNI_GetAccelerometerValues(float values[3])
>+extern "C" SDL_bool Android_JNI_GetAccelerometerValues(float values[3])
> {
>     int i;
>-    for (i = 0; i < 3; ++i) {
>-        values[i] = fLastAccelerometer[i];
>+    SDL_bool retval = SDL_FALSE;
>+
>+    if (bHasNewData) {
>+        for (i = 0; i < 3; ++i) {
>+            values[i] = fLastAccelerometer[i];
>+        }
>+        bHasNewData = false;
>+        retval = SDL_TRUE;
>     }
>+
>+    return retval;
> }
> 
> //
>diff -r b0b81f18bf35 -r 472614923e95 src/core/android/SDL_android.h
>--- a/src/core/android/SDL_android.h	Thu Jan 12 22:54:09 2012 -0500
>+++ b/src/core/android/SDL_android.h	Fri Jan 13 09:16:57 2012 +0100
>@@ -31,7 +31,7 @@
> extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion);
> extern void Android_JNI_SwapWindow();
> extern void Android_JNI_SetActivityTitle(const char *title);
>-extern void Android_JNI_GetAccelerometerValues(float values[3]);
>+extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
> 
> // Audio support
> extern int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames);
>diff -r b0b81f18bf35 -r 472614923e95 src/joystick/android/SDL_sysjoystick.c
>--- a/src/joystick/android/SDL_sysjoystick.c	Thu Jan 12 22:54:09 2012 -0500
>+++ b/src/joystick/android/SDL_sysjoystick.c	Fri Jan 13 09:16:57 2012 +0100
>@@ -86,12 +86,14 @@
> SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
> {
>     int i;
>+    Sint16 value;
>     float values[3];
> 
>-    Android_JNI_GetAccelerometerValues(values);
>-
>-    for ( i = 0; i < 3; i++ ) {
>-        SDL_PrivateJoystickAxis(joystick, i, values[i]);
>+    if (Android_JNI_GetAccelerometerValues(values)) {
>+        for ( i = 0; i < 3; i++ ) {
>+            value = (Sint16)(values[i] * 32767.0f);
>+            SDL_PrivateJoystickAxis(joystick, i, value);
>+        }
>     }
> }
>

Actions: View | Diff

Attachments on bug 1368: 765

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.