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

Some improvements on Teeworlds port - it still crashes for no reason when I'm pressing 5-th button

Browse Source
This commit is contained in:
pelya
2010-09-08 12:52:26 +03:00
parent 7787b90910
commit b3571c8a67
11 changed files with 101 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/jni/application/teeworlds/src/engine/client/ec_gfx.cpp
+73 -2
View File
@@ -34,6 +34,10 @@
#include <stdio.h>
#include <math.h>
#if defined(ANDROID)
#include <SDL_screenkeyboard.h>
#endif
#include "ec_font.h"
/* compressed textures */
@@ -146,9 +150,35 @@ static void flush()
for(i = 0; i < num_vertices / 4; i++)
{
#define SINGLE_COLOR_PER_TEXTURE 1
// #define USE_GL_DRAW_TEX 1
// #define USE_GL_DRAW_TEX 1 // Does not work yet
#define TEXTURE_OUT_OF_SCREEN_CHECK 1 // Some GLES renderers seems to not have this check
#ifdef TEXTURE_OUT_OF_SCREEN_CHECK
if(
( vertices[i * 4 + 0].pos.x < screen_x0 &&
vertices[i * 4 + 1].pos.x < screen_x0 &&
vertices[i * 4 + 2].pos.x < screen_x0 &&
vertices[i * 4 + 3].pos.x < screen_x0 )
||
( vertices[i * 4 + 0].pos.x > screen_x1 &&
vertices[i * 4 + 1].pos.x > screen_x1 &&
vertices[i * 4 + 2].pos.x > screen_x1 &&
vertices[i * 4 + 3].pos.x > screen_x1 )
||
( vertices[i * 4 + 0].pos.y < screen_y0 &&
vertices[i * 4 + 1].pos.y < screen_y0 &&
vertices[i * 4 + 2].pos.y < screen_y0 &&
vertices[i * 4 + 3].pos.y < screen_y0 )
||
( vertices[i * 4 + 0].pos.y > screen_y1 &&
vertices[i * 4 + 1].pos.y > screen_y1 &&
vertices[i * 4 + 2].pos.y > screen_y1 &&
vertices[i * 4 + 3].pos.y > screen_y1 )
)
continue;
#endif
#ifndef SINGLE_COLOR_PER_TEXTURE
// GL_COLOR_ARRAY is too damn slow for textures, so we'll set per-texture color
@@ -268,6 +298,47 @@ static int try_init()
screen_width = config.gfx_screen_width;
screen_height = config.gfx_screen_height;
#if defined(ANDROID)
// Redefine button layout
{
SDL_Rect pos = {0, 0, 0, 0};
SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_DPAD, &pos);
pos.x = screen_width - screen_width / 16;
pos.y = screen_height - screen_height / 8;
pos.w = screen_width / (SDL_ANDROID_GetScreenKeyboardSize() + 2) / 4;
pos.h = pos.w;
pos.x -= pos.w/2;
pos.y -= pos.h/2;
SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_0, &pos);
pos.x -= screen_width / 8;
SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_1, &pos);
pos.x = screen_width / 16;
pos.x -= pos.w/2;
SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_2, &pos);
pos.x += screen_width / 8;
SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_3, &pos);
pos.y = screen_height - screen_height / 8 - screen_height / 4;
pos.y -= pos.h/2;
pos.x = screen_width / 16;
pos.x -= pos.w/2;
SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_4, &pos);
pos.x = screen_width - screen_width / 16;
pos.x -= pos.w/2;
SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_5, &pos);
}
#endif
info = SDL_GetVideoInfo();
project/jni/application/teeworlds/src/engine/e_config_variables.h
+1 -1
View File
@@ -27,7 +27,7 @@ MACRO_CONFIG_INT(b_filter_pure, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter ou
MACRO_CONFIG_INT(b_filter_pure_map, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out non-standard maps in browser")
MACRO_CONFIG_INT(b_filter_compatversion, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out non-compatible servers in browser")
MACRO_CONFIG_INT(b_sort, 0, 0, 256, CFGFLAG_SAVE|CFGFLAG_CLIENT, "")
MACRO_CONFIG_INT(b_sort, 1, 0, 256, CFGFLAG_SAVE|CFGFLAG_CLIENT, "") // Sort by ping
MACRO_CONFIG_INT(b_sort_order, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "")
MACRO_CONFIG_INT(b_max_requests, 10, 0, 1000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Number of requests to use when refreshing server browser")