encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-09 05:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds Joystick support for Android

Browse Source 
This bumps the build SDK level to 12 (up from 10). Runtime requirements remain
the same (at API level < 12 joystick support is disabled).

Also enables building SDL for armv7 and x86.
This commit is contained in:
Gabriel Jacobo
2013-11-05 20:07:39 -03:00
parent 61068a30b6
commit 0b7c69fe12
13 changed files with 428 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android-project/AndroidManifest.xml
View File

@@ -31,7 +31,7 @@
</application>
<!-- Android 2.3.3 -->
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="12" />
<!-- OpenGL ES 2.0 -->
<uses-feature android:glEsVersion="0x00020000" />

2
android-project/default.properties
View File

@@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-7
target=android-12

2
android-project/jni/Application.mk
View File

@@ -2,3 +2,5 @@
# Uncomment this if you're using STL in your project
# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
# APP_STL := stlport_static
APP_ABI := armeabi armeabi-v7a x86

2
android-project/project.properties
View File

@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-10
target=android-12

164
android-project/src/org/libsdl/app/SDLActivity.java
View File

@@ -16,6 +16,10 @@ import android.graphics.*;
import android.media.*;
import android.hardware.*;
import java.lang.*;
import java.util.List;
import java.util.ArrayList;
/**
SDL Activity
@@ -31,10 +35,11 @@ public class SDLActivity extends Activity {
protected static SDLSurface mSurface;
protected static View mTextEdit;
protected static ViewGroup mLayout;
protected static SDLJoystickHandler mJoystickHandler;
// This is what SDL runs in. It invokes SDL_main(), eventually
protected static Thread mSDLThread;
// Audio
protected static Thread mAudioThread;
protected static AudioTrack mAudioTrack;
@@ -60,6 +65,13 @@ public class SDLActivity extends Activity {
// Set up the surface
mSurface = new SDLSurface(getApplication());
if(Build.VERSION.SDK_INT >= 12) {
mJoystickHandler = new SDLJoystickHandler_API12();
}
else {
mJoystickHandler = new SDLJoystickHandler();
}
mLayout = new AbsoluteLayout(this);
mLayout.addView(mSurface);
@@ -236,6 +248,10 @@ public class SDLActivity extends Activity {
public static native void nativePause();
public static native void nativeResume();
public static native void onNativeResize(int x, int y, int format);
public static native void onNativePadDown(int padId, int keycode);
public static native void onNativePadUp(int padId, int keycode);
public static native void onNativeJoy(int joyId, int axis,
float value);
public static native void onNativeKeyDown(int keycode);
public static native void onNativeKeyUp(int keycode);
public static native void onNativeKeyboardFocusLost();
@@ -406,6 +422,23 @@ public class SDLActivity extends Activity {
}
return Arrays.copyOf(filtered, used);
}
// Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
public static int getNumJoysticks() {
return mJoystickHandler.getNumJoysticks();
}
public static String getJoystickName(int joy) {
return mJoystickHandler.getJoystickName(joy);
}
public static int getJoystickAxes(int joy) {
return mJoystickHandler.getJoystickAxes(joy);
}
public static int getJoyId(int devId) {
return mJoystickHandler.getJoyId(devId);
}
}
/**
@@ -451,6 +484,10 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
if(Build.VERSION.SDK_INT >= 12) {
setOnGenericMotionListener(new SDLGenericMotionHandler_API12());
}
// Some arbitrary defaults to avoid a potential division by zero
mWidth = 1.0f;
@@ -557,16 +594,26 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
// Key events
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
//Log.v("SDL", "key down: " + keyCode);
SDLActivity.onNativeKeyDown(keyCode);
return true;
}
else if (event.getAction() == KeyEvent.ACTION_UP) {
//Log.v("SDL", "key up: " + keyCode);
SDLActivity.onNativeKeyUp(keyCode);
return true;
// Dispatch the different events depending on where they come from
if(event.getSource() == InputDevice.SOURCE_KEYBOARD) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
//Log.v("SDL", "key down: " + keyCode);
SDLActivity.onNativeKeyDown(keyCode);
return true;
}
else if (event.getAction() == KeyEvent.ACTION_UP) {
//Log.v("SDL", "key up: " + keyCode);
SDLActivity.onNativeKeyUp(keyCode);
return true;
}
} else if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
(event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
int id = SDLActivity.getJoyId( event.getDeviceId() );
if (event.getAction() == KeyEvent.ACTION_DOWN) {
SDLActivity.onNativePadDown(id, keyCode);
} else if (event.getAction() == KeyEvent.ACTION_UP) {
SDLActivity.onNativePadUp(id, keyCode);
}
}
return false;
@@ -646,8 +693,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
y / SensorManager.GRAVITY_EARTH,
event.values[2] / SensorManager.GRAVITY_EARTH - 1);
}
}
}
}
/* This is a fake invisible editor view that receives the input and defines the
@@ -769,3 +815,95 @@ class SDLInputConnection extends BaseInputConnection {
}
/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
class SDLJoystickHandler {
public int getNumJoysticks() {
return 0;
}
public String getJoystickName(int joy) {
return "";
}
public int getJoystickAxes(int joy) {
return 0;
}
public int getJoyId(int devId) {
return 0;
}
}
/* Actual joystick functionality available for API >= 12 devices */
class SDLJoystickHandler_API12 extends SDLJoystickHandler {
private List<Integer> mJoyIdList;
// Create a list of valid ID's the first time this function is called
private void createJoystickList() {
if(mJoyIdList != null) {
return;
}
mJoyIdList = new ArrayList<Integer>();
int[] deviceIds = InputDevice.getDeviceIds();
for(int i=0; i<deviceIds.length; i++) {
if( (InputDevice.getDevice(deviceIds[i]).getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
mJoyIdList.add(deviceIds[i]);
}
}
}
public int getNumJoysticks() {
createJoystickList();
return mJoyIdList.size();
}
public String getJoystickName(int joy) {
createJoystickList();
return InputDevice.getDevice(mJoyIdList.get(joy)).getName();
}
public int getJoystickAxes(int joy) {
createJoystickList();
return InputDevice.getDevice(mJoyIdList.get(joy)).getMotionRanges().size();
}
public int getJoyId(int devId) {
int i=0;
createJoystickList();
for(i=0; i<mJoyIdList.size(); i++) {
if(mJoyIdList.get(i) == devId) {
return i;
}
}
return -1;
}
}
class SDLGenericMotionHandler_API12 extends Activity implements View.OnGenericMotionListener {
// Generic Motion (mouse hover, joystick...) events go here
// We only have joysticks yet
@Override
public boolean onGenericMotion(View v, MotionEvent event) {
int actionPointerIndex = event.getActionIndex();
int action = event.getActionMasked();
if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
switch(action) {
case MotionEvent.ACTION_MOVE:
int id = SDLActivity.getJoyId( event.getDeviceId() );
float x = event.getAxisValue(MotionEvent.AXIS_X, actionPointerIndex);
float y = event.getAxisValue(MotionEvent.AXIS_Y, actionPointerIndex);
SDLActivity.onNativeJoy(id, 0, x);
SDLActivity.onNativeJoy(id, 1, y);
break;
}
}
return true;
}
}