pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up internal accelerometer interface

Browse source
This commit is contained in:
Sam Lantinga 2011-01-13 18:03:56 -08:00
parent 0ce4324420
commit 70c916a415
3 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/SDL_android.cpp
View file

@ -57,7 +57,7 @@ static jmethodID midAudioWriteByteBuffer;
static jmethodID midAudioQuit; static jmethodID midAudioQuit;
// Accelerometer data storage // Accelerometer data storage
float fLastAccelerometer[3]; static float fLastAccelerometer[3];
/******************************************************************************* /*******************************************************************************
@ -184,6 +184,14 @@ extern "C" void Android_JNI_SetActivityTitle(const char *title)
} }
} }
extern "C" void Android_JNI_GetAccelerometerValues(float values[3])
{
int i;
for (i = 0; i < 3; ++i) {
values[i] = fLastAccelerometer[i];
}
}
// //
// Audio support // Audio support
// //

15
src/SDL_android.h
View file

@ -29,15 +29,16 @@ extern "C" {
#endif #endif
/* Interface from the SDL library into the Android Java activity */ /* Interface from the SDL library into the Android Java activity */
void Android_JNI_CreateContext(); extern void Android_JNI_CreateContext();
void Android_JNI_SwapWindow(); extern void Android_JNI_SwapWindow();
void Android_JNI_SetActivityTitle(const char *title); extern void Android_JNI_SetActivityTitle(const char *title);
extern void Android_JNI_GetAccelerometerValues(float values[3]);
// Audio support // Audio support
int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames); extern int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames);
void* Android_JNI_GetAudioBuffer(); extern void* Android_JNI_GetAudioBuffer();
void Android_JNI_WriteAudioBuffer(); extern void Android_JNI_WriteAudioBuffer();
void Android_JNI_CloseAudioDevice(); extern void Android_JNI_CloseAudioDevice();
/* Ends C function definitions when using C++ */ /* Ends C function definitions when using C++ */
#ifdef __cplusplus #ifdef __cplusplus

29
src/joystick/android/SDL_sysjoystick.c
View file

@ -32,10 +32,9 @@
#include "SDL_joystick.h" #include "SDL_joystick.h"
#include "../SDL_sysjoystick.h" #include "../SDL_sysjoystick.h"
#include "../SDL_joystick_c.h" #include "../SDL_joystick_c.h"
#include "../../SDL_android.h"
extern float fLastAccelerometer[3]; static const char *accelerometerName = "Android accelerometer";
const char *accelerometerName = "Android accelerometer";
/* Function to scan the system for joysticks. /* Function to scan the system for joysticks.
* This function should set SDL_numjoysticks to the number of available * This function should set SDL_numjoysticks to the number of available
@ -47,17 +46,19 @@ SDL_SYS_JoystickInit(void)
{ {
SDL_numjoysticks = 1; SDL_numjoysticks = 1;
return (1); return (1);
} }
/* Function to get the device-dependent name of a joystick */ /* Function to get the device-dependent name of a joystick */
const char * const char *
SDL_SYS_JoystickName(int index) SDL_SYS_JoystickName(int index)
{ {
if (!index) if (index == 0) {
return accelerometerName; return accelerometerName;
SDL_SetError("No joystick available with that index"); } else {
return (NULL); SDL_SetError("No joystick available with that index");
return (NULL);
}
} }
/* Function to open a joystick for use. /* Function to open a joystick for use.
@ -82,12 +83,16 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick)
* but instead should call SDL_PrivateJoystick*() to deliver events * but instead should call SDL_PrivateJoystick*() to deliver events
* and update joystick device state. * and update joystick device state.
*/ */
void void
SDL_SYS_JoystickUpdate(SDL_Joystick * joystick) SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
{ {
int i=0; int i;
for(i=0;i<3;i++){ float values[3];
SDL_PrivateJoystickAxis(joystick, i, fLastAccelerometer[i]);
Android_JNI_GetAccelerometerValues(values);
for ( i = 0; i < 3; i++ ) {
SDL_PrivateJoystickAxis(joystick, i, values[i]);
} }
} }
@ -104,3 +109,5 @@ SDL_SYS_JoystickQuit(void)
} }
#endif /* SDL_JOYSTICK_NDS */ #endif /* SDL_JOYSTICK_NDS */
/* vi: set ts=4 sw=4 expandtab: */