encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 2358 - [Android] Sort joystick axes - Fix by David Brady

This commit is contained in:
Gabriel Jacobo 2014-01-24 09:54:04 -03:00
parent 50befa6201
commit e78be5dafd
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,9 @@ package org.libsdl.app;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
@ -922,6 +925,13 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
public String name; public String name;
public ArrayList<InputDevice.MotionRange> axes; public ArrayList<InputDevice.MotionRange> axes;
} }
class RangeComparator implements Comparator<InputDevice.MotionRange>
{
@Override
public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
return arg0.getAxis() - arg1.getAxis();
}
}
private ArrayList<SDLJoystick> mJoysticks; private ArrayList<SDLJoystick> mJoysticks;
@ -948,7 +958,9 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
joystick.name = joystickDevice.getName(); joystick.name = joystickDevice.getName();
joystick.axes = new ArrayList<InputDevice.MotionRange>(); joystick.axes = new ArrayList<InputDevice.MotionRange>();
for (InputDevice.MotionRange range : joystickDevice.getMotionRanges()) { List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
Collections.sort(ranges, new RangeComparator());
for (InputDevice.MotionRange range : ranges ) {
if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) { if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) {
joystick.axes.add(range); joystick.axes.add(range);
} }