miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed Ouya detection, it does not work anyway

Browse Source
This commit is contained in:
pelya
2013-01-29 16:34:05 +02:00
parent ec136b0bc8
commit 45128c67b4
7 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project/java/Globals.java
View File

@@ -112,5 +112,4 @@ class Globals
public static boolean VideoLinearFilter = true;
public static boolean MultiThreadedVideo = false;
public static boolean BrokenLibCMessageShown = false;
public static boolean IsOuya = false; // Ouya game console has no Back key, so we need to map some game controller key to Back key
}

12
project/java/MainActivity.java
View File

@@ -93,18 +93,6 @@ public class MainActivity extends Activity
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
if( getIntent().getCategories() != null )
{
for( String cat: getIntent().getCategories() )
{
System.out.println("libSDL: getIntent().getCategories(): " + cat);
if( cat.equals("ouya.intent.category.GAME") ) {
System.out.println("libSDL: Ouya game console detected");
Globals.IsOuya = true;
}
}
}
System.out.println("libSDL: Creating startup screen");
_layout = new LinearLayout(this);
_layout.setOrientation(LinearLayout.VERTICAL);

4
project/java/Settings.java
View File

@@ -170,7 +170,7 @@ class Settings
return;
}
System.out.println("libSDL: Settings.Load(): enter");
nativeInitKeymap(Globals.IsOuya ? 1 : 0);
nativeInitKeymap();
for( int i = 0; i < SDL_Keys.JAVA_KEYCODE_LAST; i++ )
{
int sdlKey = nativeGetKeymapKey(i);
@@ -2812,7 +2812,7 @@ class Settings
private static native void nativeSetVideoForceSoftwareMode();
private static native void nativeSetupScreenKeyboard(int size, int drawsize, int theme, int nbuttonsAutoFire, int transparency);
private static native void nativeSetupScreenKeyboardButtons(byte[] img);
private static native void nativeInitKeymap(int isOuya);
private static native void nativeInitKeymap();
private static native int nativeGetKeymapKey(int key);
private static native void nativeSetKeymapKey(int javakey, int key);
private static native int nativeGetKeymapKeyScreenKb(int keynum);

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: ab41d0204e...d22b2aac8b

4
project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
View File

@@ -2194,7 +2194,7 @@ JAVA_EXPORT_NAME(Settings_nativeSetTouchscreenCalibration) (JNIEnv* env, jobject
}
JNIEXPORT void JNICALL
JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv* env, jobject thiz, jint isOuya )
JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv* env, jobject thiz )
{
SDL_android_init_keymap(SDL_android_keymap, isOuya);
SDL_android_init_keymap(SDL_android_keymap);
}

2
project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
View File

@@ -200,7 +200,7 @@ extern void SDL_ANDROID_MainThreadPushJoystickAxis(int joy, int axis, int value)
extern void SDL_ANDROID_MainThreadPushJoystickButton(int joy, int button, int pressed);
extern void SDL_ANDROID_MainThreadPushJoystickBall(int joy, int ball, int x, int y);
extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode );
extern void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya);
extern void SDL_android_init_keymap(SDLKey *SDL_android_keymap);
extern void SDL_ANDROID_MainThreadPushMouseWheel( int x, int y ); // SDL 1.3 only
extern void SDL_ANDROID_MainThreadPushAppActive(int active);
#endif

4
project/jni/sdl-1.2/src/video/android/keymap.c
View File

@@ -4,7 +4,7 @@
#include "SDL_androidinput.h"
#include "SDL_screenkeyboard.h"
void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya)
void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
{
int i;
SDLKey * keymap = SDL_android_keymap;
@@ -131,7 +131,7 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya)
keymap[KEYCODE_PICTSYMBOLS] = SDL_KEY(LSHIFT);
keymap[KEYCODE_SWITCH_CHARSET] = SDL_KEY(LSHIFT);
keymap[KEYCODE_BUTTON_A] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_2));
keymap[KEYCODE_BUTTON_B] = isOuya ? SDL_KEY(ESCAPE) : SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_3));
keymap[KEYCODE_BUTTON_B] = SDL_KEY(ESCAPE); // SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_3)); // There's no Back key on Ouya
keymap[KEYCODE_BUTTON_C] = SDL_KEY(C);
keymap[KEYCODE_BUTTON_X] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_0));
keymap[KEYCODE_BUTTON_Y] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_1));