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

Re-enabled core to restore and save OpenGL state for on-screen keyboard, it just makes your life so much easier

Browse Source
This commit is contained in:
pelya
2012-06-19 20:16:18 +03:00
parent 8624100d5c
commit f476666b4b
6 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/application/commandergenius/AndroidAppSettings.cfg
View File

@@ -36,7 +36,7 @@ FirstStartMenuOptions=''
MultiABI=n
AppVersionCode=40011
AppVersionName="0.4.0.11"
ResetSdlConfigForThisVersion=y
ResetSdlConfigForThisVersion=n
DeleteFilesOnUpgrade="%"
CompiledLibraries="tremor ogg"
CustomBuildScript=n

2
project/jni/physfs/Android.mk
View File

@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wil
LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := lzma
LOCAL_SHARED_LIBRARIES :=
LOCAL_LDLIBS := -lz

9
project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
View File

@@ -115,8 +115,7 @@ oldGlState;
static inline void beginDrawingTex()
{
// Save OpenGL state
// TODO: this code does not work on 1.6 emulator, and on some devices
/*
// TODO: this code does not work on 1.6 emulator, and on some older devices
oldGlState.texture2d = glIsEnabled(GL_TEXTURE_2D);
glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldGlState.textureId);
glGetFloatv(GL_CURRENT_COLOR, &(oldGlState.color[0]));
@@ -127,14 +126,12 @@ static inline void beginDrawingTex()
glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, &oldGlState.texFilter1);
glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &oldGlState.texFilter2);
// It's very unlikely that some app will use GL_TEXTURE_CROP_RECT_OES, so just skip it
*/
glEnable(GL_TEXTURE_2D);
}
static inline void endDrawingTex()
{
/*
// Restore OpenGL state
if( oldGlState.texture2d == GL_FALSE)
glDisable(GL_TEXTURE_2D);
@@ -146,9 +143,11 @@ static inline void endDrawingTex()
glBlendFunc(oldGlState.blend1, oldGlState.blend2);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, oldGlState.texFilter1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, oldGlState.texFilter2);
*/
/*
glDisable(GL_BLEND);
glDisable(GL_TEXTURE_2D);
*/
}
static inline void drawCharTexFlip(GLTexture_t * tex, SDL_Rect * src, SDL_Rect * dest, int flipX, int flipY, Uint8 r, Uint8 g, Uint8 b, Uint8 a)