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

Some preliminary Ouya support

Browse Source
This commit is contained in:
pelya
2013-01-28 19:27:32 +02:00
parent 5b279e20f6
commit ec136b0bc8
10 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/openarena/AndroidAppSettings.cfg
View File

@@ -37,8 +37,8 @@ HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
FirstStartMenuOptions=''
MultiABI=y
AppMinimumRAM=300
AppVersionCode=08818
AppVersionName="0.8.8.18"
AppVersionCode=08819
AppVersionName="0.8.8.19"
ResetSdlConfigForThisVersion=y
DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag"
CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 172b750455...9c71de1a51

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 )
JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv* env, jobject thiz, jint isOuya )
{
SDL_android_init_keymap(SDL_android_keymap);
SDL_android_init_keymap(SDL_android_keymap, isOuya);
}

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);
extern void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya);
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)
void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya)
{
int i;
SDLKey * keymap = SDL_android_keymap;
@@ -131,7 +131,7 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
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] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_3));
keymap[KEYCODE_BUTTON_B] = isOuya ? SDL_KEY(ESCAPE) : SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_3));
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));