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

Some fixes to SDL 1.2, still outputs nothing

Browse Source
This commit is contained in:
pelya
2010-07-21 16:00:34 +03:00
parent 0adcda0153
commit 5a5ac81d1e
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
alienblaster/project/sdl/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
View File

@@ -109,12 +109,6 @@ static int sdl_opengl = 0;
// Some wicked GLES stuff
static GLuint texture = 0;
// Extremely wicked JNI environment to call Java functions from C code
static JNIEnv* JavaEnv = NULL;
static jclass JavaRendererClass = NULL;
static jobject JavaRenderer = NULL;
static jmethodID JavaSwapBuffers = NULL;
static void SdlGlRenderInit();
@@ -361,10 +355,7 @@ static int ANDROID_FlipHWSurface(_THIS, SDL_Surface *surface)
if( ! sdl_opengl )
{
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, memX, memY, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, memBuffer);
if( SDL_ANDROID_sWindowHeight < memY || SDL_ANDROID_sWindowWidth < memX )
glDrawTexiOES(0, 0, 1, SDL_ANDROID_sWindowWidth, SDL_ANDROID_sWindowHeight); // Larger than screen - shrink to fit
else
glDrawTexiOES(0, SDL_ANDROID_sWindowHeight-memY, 1, memX, memY); // Smaller than screen - do not scale, it's faster that way
glDrawTexiOES(0, 0, 1, SDL_ANDROID_sWindowWidth, SDL_ANDROID_sWindowHeight); // Stretch to screen
if( surface->flags & SDL_DOUBLEBUF )
{
@@ -378,14 +369,12 @@ static int ANDROID_FlipHWSurface(_THIS, SDL_Surface *surface)
SDL_ANDROID_CallJavaSwapBuffers();
SDL_Delay(10);
return(0);
};
void ANDROID_GL_SwapBuffers(_THIS)
{
ANDROID_FlipHWSurface(this, NULL);
SDL_ANDROID_CallJavaSwapBuffers();
};
int ANDROID_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors)

22
alienblaster/project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c
View File

@@ -457,22 +457,18 @@ void ANDROID_InitOSKeymap()
keymap[KEYCODE_SYM] = SDL_KEY(LGUI);
keymap[KEYCODE_NUM] = SDL_KEY(NUMLOCKCLEAR);
keymap[KEYCODE_ALT_LEFT] = SDL_KEY(KP_7);
keymap[KEYCODE_ALT_RIGHT] = SDL_KEY(KP_9);
keymap[KEYCODE_ALT_LEFT] = SDL_KEY(KP_7); // Used by orientation sensor code, do not change
keymap[KEYCODE_ALT_RIGHT] = SDL_KEY(KP_9); // Used by orientation sensor code, do not change
// TODO: Too lazy to define that
keymap[KEYCODE_SHIFT_LEFT] = SDL_KEY(F1);
keymap[KEYCODE_SHIFT_RIGHT] = SDL_KEY(F2);
/*
keymap[KEYCODE_SHIFT_LEFT] = SDL_KEY(VOLUMEUP);
keymap[KEYCODE_SHIFT_RIGHT] = SDL_KEY(VOLUMEDOWN);
keymap[KEYCODE_EXPLORER] = SDL_KEY(F3);
keymap[KEYCODE_ENVELOPE] = SDL_KEY(F4);
keymap[KEYCODE_EXPLORER] = SDL_KEY(WWW);
keymap[KEYCODE_ENVELOPE] = SDL_KEY(MAIL);
keymap[KEYCODE_HEADSETHOOK] = SDL_KEY(AC_SEARCH);
keymap[KEYCODE_FOCUS] = SDL_KEY(AC_REFRESH);
keymap[KEYCODE_NOTIFICATION] = SDL_KEY(AC_BOOKMARKS);
*/
keymap[KEYCODE_HEADSETHOOK] = SDL_KEY(F5);
keymap[KEYCODE_FOCUS] = SDL_KEY(F6);
keymap[KEYCODE_NOTIFICATION] = SDL_KEY(F7);
}