Added regression script, updated ScummVM

2011-10-18 15:29:00 +03:00
parent da7b7f110b
commit 85304e9ebe
15 changed files with 879 additions and 3025 deletions
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -10,7 +10,7 @@ VideoDepthBpp=16
 NeedDepthBuffer=n
 NeedStencilBuffer=n
 NeedGles2=n
-SwVideoMode=n
+SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
@@ -18,7 +18,7 @@ AppUsesMouse=y
 AppNeedsTwoButtonMouse=n
 ForceRelativeMouseMode=n
 AppNeedsArrowKeys=y
-AppNeedsTextInput=n
+AppNeedsTextInput=y
 AppUsesJoystick=n
 AppHandlesJoystickSensitivity=n
 AppUsesMultitouch=n
--- a/project/jni/application/ballfield/ballfield.cpp
+++ b/project/jni/application/ballfield/ballfield.cpp
@@ -23,8 +23,10 @@
 /*----------------------------------------------------------
 	Definitions...
 ----------------------------------------------------------*/
+#define	SCREEN_W	320
+#define	SCREEN_H	240

-#define	BALLS	3000
+#define	BALLS	300

 #define	COLORS	2

@@ -47,12 +49,6 @@ typedef struct
 } ballfield_t;


-/*
- * Size of the screen in pixels
- */
-#define	SCREEN_W	800
-#define	SCREEN_H	480
-
 /*
 * Size of the biggest ball image in pixels
 *
--- a/project/jni/application/regression/AndroidAppSettings.cfg
+++ b/project/jni/application/regression/AndroidAppSettings.cfg
@@ -0,0 +1,42 @@
+# The application settings for Android libSDL port
+AppSettingVersion=17
+LibSdlVersion=1.2
+AppName="Ballfield regression"
+AppFullName=net.olofson.ballfield.regression
+ScreenOrientation=h
+InhibitSuspend=n
+AppDataDownloadUrl="Game data is 1 Mb|ballfield.zip"
+VideoDepthBpp=16
+NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
+SwVideoMode=y
+SdlVideoResize=y
+SdlVideoResizeKeepAspect=n
+CompatibilityHacks=n
+AppUsesMouse=y
+AppNeedsTwoButtonMouse=n
+ForceRelativeMouseMode=n
+AppNeedsArrowKeys=y
+AppNeedsTextInput=y
+AppUsesJoystick=n
+AppHandlesJoystickSensitivity=n
+AppUsesMultitouch=n
+NonBlockingSwapBuffers=y
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE"
+AppTouchscreenKeyboardKeysAmount=0
+AppTouchscreenKeyboardKeysAmountAutoFire=0
+RedefinedKeysScreenKb="1 2 3 4 5 6 1 2 3 4"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions='OptionalDownloadConfig'
+FirstStartMenuOptions=''
+MultiABI=n
+AppVersionCode=101
+AppVersionName="1.01"
+CompiledLibraries="sdl_mixer sdl_image"
+CustomBuildScript=n
+AppCflags='-O2 -finline-functions'
+AppLdflags=''
+AppSubdirsBuild=''
+AppCmdline=''
+ReadmeText='^Readme text'
--- a/project/jni/application/regression/AndroidData/ballfield.zip
+++ b/project/jni/application/regression/AndroidData/ballfield.zip
--- a/project/jni/application/regression/ballfield.cpp
+++ b/project/jni/application/regression/ballfield.cpp
@@ -0,0 +1,661 @@
+/*
+ * "Ballfield"
+ *
+ *   (C) David Olofson <david@olofson.net>, 2002, 2003
+ *
+ * This software is released under the terms of the GPL.
+ *
+ * Contact author for permission if you want to use this
+ * software, or work derived from it, under other terms.
+ */
+
+#include <sstream>
+#include <iostream>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <android/log.h>
+
+#include "SDL.h"
+#include "SDL_image.h"
+
+#include "regression.h"
+
+
+/*----------------------------------------------------------
+	Definitions...
+----------------------------------------------------------*/
+#define	SCREEN_W	320
+#define	SCREEN_H	240
+
+#define	BALLS	300
+
+#define	COLORS	2
+
+typedef struct
+{
+	Sint32	x, y, z;	/* Position */
+	Uint32	c;		/* Color */
+} point_t;
+
+
+/*
+ * Ballfield
+ */
+typedef struct
+{
+	point_t		points[BALLS];
+	SDL_Rect	*frames;
+	SDL_Surface	*gfx[COLORS];
+	int		use_alpha;
+} ballfield_t;
+
+
+/*
+ * Size of the biggest ball image in pixels
+ *
+ * Balls are scaled down and *packed*, one pixel
+ * smaller for each frame down to 1x1. The actual
+ * image width is (obviously...) the same as the
+ * width of the first frame.
+ */
+#define	BALL_W	32
+#define	BALL_H	32
+
+
+
+
+/*----------------------------------------------------------
+	General tool functions
+----------------------------------------------------------*/
+
+/*
+ * Bump areas of low and high alpha to 0% or 100%
+ * respectively, just in case the graphics contains
+ * "alpha noise".
+ */
+SDL_Surface *clean_alpha(SDL_Surface *s)
+{
+	SDL_Surface *work;
+	SDL_Rect r;
+	Uint32 *pixels;
+	int pp;
+	int x, y;
+	
+	work = SDL_CreateRGBSurface(SDL_SWSURFACE, s->w, s->h,
+			32, 0xff000000, 0x00ff0000, 0x0000ff00,
+			0x000000ff);
+	if(!work)
+		return NULL;
+
+	r.x = r.y = 0;
+	r.w = s->w;
+	r.h = s->h;
+	if(SDL_BlitSurface(s, &r, work, NULL) < 0)
+	{
+		SDL_FreeSurface(work);
+		return NULL;
+	}
+
+	SDL_LockSurface(work);
+	pixels = (Uint32 *)work->pixels;
+	pp = work->pitch / sizeof(Uint32);
+	for(y = 0; y < work->h; ++y)
+		for(x = 0; x < work->w; ++x)
+		{
+			Uint32 pix = pixels[y*pp + x];
+			switch((pix & 0xff) >> 4)
+			{
+			  case 0:
+				pix = 0x00000000;
+			  	break;
+			  default:
+			  	break;
+			  case 15:
+				pix |= 0xff;
+			  	break;
+			}
+			pixels[y*pp + x] = pix;
+		}
+	SDL_UnlockSurface(work);
+
+	return work;
+}
+
+
+/*
+ * Load and convert an antialiazed, zoomed set of sprites.
+ */
+SDL_Surface *load_zoomed(char *name, int alpha)
+{
+	SDL_Surface *sprites;
+	SDL_Surface *temp = IMG_Load(name);
+	if(!temp)
+		return NULL;
+
+	/*
+	sprites = temp;
+	SDL_SetAlpha(sprites, 0, 255);
+	temp = clean_alpha(sprites);
+	SDL_FreeSurface(sprites);
+	*/
+	if(!temp)
+	{
+		fprintf(stderr, "Could not clean alpha!\n");
+		return NULL;
+	}
+
+	if(alpha)
+	{
+		SDL_SetAlpha(temp, 0, SDL_ALPHA_OPAQUE);
+		sprites = SDL_DisplayFormatAlpha(temp);
+	}
+	else
+	{
+		SDL_SetColorKey(temp, SDL_SRCCOLORKEY,
+				SDL_MapRGB(temp->format, 0, 0, 0));
+		sprites = SDL_DisplayFormat(temp);
+	}
+	SDL_FreeSurface(temp);
+
+	return sprites;
+}
+
+
+void print_num(SDL_Surface *dst, SDL_Surface *font, int x, int y, float value)
+{
+	char buf[16];
+	int val = (int)(value * 10.0);
+	int pos, p = 0;
+	SDL_Rect from;
+
+	/* Sign */
+	if(val < 0)
+	{
+		buf[p++] = 10;
+		val = -val;
+	}
+
+	/* Integer part */
+	pos = 10000000;
+	while(pos > 1)
+	{
+		int num = val / pos;
+		val -= num * pos;
+		pos /= 10;
+		if(p || num)
+			buf[p++] = num;
+	}
+
+	/* Decimals */
+	if(val / pos)
+	{
+		buf[p++] = 11;
+		while(pos > 0)
+		{
+			int num = val / pos;
+			val -= num * pos;
+			pos /= 10;
+			buf[p++] = num;
+		}
+	}
+
+	/* Render! */
+	from.y = 0;
+	from.w = 7;
+	from.h = 10;
+	for(pos = 0; pos < p; ++pos)
+	{
+		SDL_Rect to;
+		to.x = x + pos * 7;
+		to.y = y;
+		from.x = buf[pos] * 7;
+		SDL_BlitSurface(font, &from, dst, &to);
+	}
+}
+
+
+
+/*----------------------------------------------------------
+	ballfield_t functions
+----------------------------------------------------------*/
+
+ballfield_t *ballfield_init(void)
+{
+	int i;
+	ballfield_t *bf = (ballfield_t *)calloc(sizeof(ballfield_t), 1);
+	if(!bf)
+		return NULL;
+	for(i = 0; i < BALLS; ++i)
+	{
+		bf->points[i].x = rand() % 0x20000;
+		bf->points[i].y = rand() % 0x20000;
+		bf->points[i].z = 0x20000 * i / BALLS;
+		if(rand() % 100 > 80)
+			bf->points[i].c = 1;
+		else
+			bf->points[i].c = 0;
+	}
+	return bf;
+}
+
+
+void ballfield_free(ballfield_t *bf)
+{
+	int i;
+	for(i = 0; i < COLORS; ++i)
+		SDL_FreeSurface(bf->gfx[i]);
+}
+
+
+static int ballfield_init_frames(ballfield_t *bf)
+{
+	int i, j;
+	/*
+	 * Set up source rects for all frames
+	 */
+	bf->frames = (SDL_Rect *)calloc(sizeof(SDL_Rect), bf->gfx[0]->w);
+	if(!bf->frames)
+	{
+		fprintf(stderr, "No memory for frame rects!\n");
+		return -1;
+	}
+	for(j = 0, i = 0; i < bf->gfx[0]->w; ++i)
+	{
+		bf->frames[i].x = 0;
+		bf->frames[i].y = j;
+		bf->frames[i].w = bf->gfx[0]->w - i;
+		bf->frames[i].h = bf->gfx[0]->w - i;
+		j += bf->gfx[0]->w - i;
+	}
+	return 0;
+}
+
+
+int ballfield_load_gfx(ballfield_t *bf, char *name, unsigned int color)
+{
+	if(color >= COLORS)
+		return -1;
+
+	bf->gfx[color] = load_zoomed(name, bf->use_alpha);
+	if(!bf->gfx[color])
+		return -2;
+
+	if(!bf->frames)
+		return ballfield_init_frames(bf);
+
+	return 0;
+}
+
+
+void ballfield_move(ballfield_t *bf, Sint32 dx, Sint32 dy, Sint32 dz)
+{
+	int i;
+	for(i = 0; i < BALLS; ++i)
+	{
+		bf->points[i].x += dx;
+		bf->points[i].x &= 0x1ffff;
+		bf->points[i].y += dy;
+		bf->points[i].y &= 0x1ffff;
+		bf->points[i].z += dz;
+		bf->points[i].z &= 0x1ffff;
+	}
+}
+
+
+void ballfield_render(ballfield_t *bf, SDL_Surface *screen)
+{
+	int i, j, z;
+
+	/* 
+	 * Find the ball with the highest Z.
+	 */
+	z = 0;
+	j = 0;
+	for(i = 0; i < BALLS; ++i)
+	{
+		if(bf->points[i].z > z)
+		{
+			j = i;
+			z = bf->points[i].z;
+		}
+	}
+
+	/* 
+	 * Render all balls in back->front order.
+	 */
+	for(i = 0; i < BALLS; ++i)
+	{
+		SDL_Rect r;
+		int f;
+		z = bf->points[j].z;
+		z += 50;
+		f = ((bf->frames[0].w << 12) + 100000) / z;
+		f = bf->frames[0].w - f;
+		if(f < 0)
+			f = 0;
+		else if(f > bf->frames[0].w - 1)
+			f = bf->frames[0].w - 1;
+		z >>= 7;
+		z += 1;
+		r.x = (bf->points[j].x - 0x10000) / z;
+		r.y = (bf->points[j].y - 0x10000) / z;
+		r.x += (screen->w - bf->frames[f].w) >> 1;
+		r.y += (screen->h - bf->frames[f].h) >> 1;
+		SDL_BlitSurface(bf->gfx[bf->points[j].c],
+			&bf->frames[f], screen, &r);
+		if(--j < 0)
+			j = BALLS - 1;
+	}
+}
+
+
+
+/*----------------------------------------------------------
+	Other rendering functions
+----------------------------------------------------------*/
+
+/*
+ * Draw tiled background image with offset.
+ */
+void tiled_back(SDL_Surface *back, SDL_Surface *screen, int xo, int yo)
+{
+	/*
+	int x, y;
+	SDL_Rect r;
+	if(xo < 0)
+		xo += back->w*(-xo/back->w + 1);
+	if(yo < 0)
+		yo += back->h*(-yo/back->h + 1);
+	xo %= back->w;
+	yo %= back->h;
+	for(y = -yo; y < screen->h; y += back->h)
+		for(x = -xo; x < screen->w; x += back->w)
+		{
+			r.x = x;
+			r.y = y;
+			SDL_BlitSurface(back, NULL, screen, &r);
+		}
+	*/
+	SDL_Rect r;
+	xo %= back->w/8;
+	yo %= back->h/8;
+	r.x = xo - back->w/2 + screen->w/2;
+	r.y = yo - back->h/2 + screen->h/2;
+	r.w = back->w;
+	r.h = back->h;
+	SDL_BlitSurface(back, NULL, screen, &r);
+}
+
+
+
+/*----------------------------------------------------------
+	main()
+----------------------------------------------------------*/
+
+int main(int argc, char* argv[])
+{
+	ballfield_t	*balls;
+	SDL_Surface	*screen;
+	SDL_Surface	*temp_image;
+	SDL_Surface	*back, *logo, *font;
+	SDL_Event	event;
+	int		bpp = 16,
+			flags = SDL_DOUBLEBUF | SDL_HWSURFACE,
+			alpha = 1;
+	int		x_offs = 0, y_offs = 0;
+	long		tick,
+			last_tick,
+			last_avg_tick;
+	double		t = 0;
+	float		dt;
+	int		i;
+	float		fps = 0.0;
+	int		fps_count = 0;
+	int		fps_start = 0;
+	float		x_speed, y_speed, z_speed;
+
+	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK);
+
+	atexit(SDL_Quit);
+
+	for(i = 1; i < argc; ++i)
+	{
+		if(strncmp(argv[i], "-na", 3) == 0)
+			alpha = 0;
+		else if(strncmp(argv[i], "-nd", 3) == 0)
+			flags &= ~SDL_DOUBLEBUF;
+		else if(strncmp(argv[i], "-h", 2) == 0)
+		{
+			flags |= SDL_HWSURFACE;
+			flags &= ~SDL_SWSURFACE;
+		}
+		else if(strncmp(argv[i], "-f", 2) == 0)
+			flags |= SDL_FULLSCREEN;
+		else
+			bpp = atoi(&argv[i][1]);
+	}
+
+	screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, bpp, flags);
+	if(!screen)
+	{
+		fprintf(stderr, "Failed to open screen!\n");
+		exit(-1);
+	}
+
+	SDL_WM_SetCaption("Ballfield", "Ballfield");
+	if(flags & SDL_FULLSCREEN)
+		SDL_ShowCursor(0);
+
+	balls = ballfield_init();
+	if(!balls)
+	{
+		fprintf(stderr, "Failed to create ballfield!\n");
+		exit(-1);
+	}
+
+	/*
+	 * Load and prepare balls...
+	 */
+	balls->use_alpha = alpha;
+	if( ballfield_load_gfx(balls, "blueball.png", 0)
+				||
+			ballfield_load_gfx(balls, "redball.png", 1) )
+	{
+		fprintf(stderr, "Could not load balls!\n");
+		exit(-1);
+	}
+
+	/*
+	 * Load background image
+	 */
+	temp_image = IMG_Load("sun.gif");
+	if(!temp_image)
+	{
+		fprintf(stderr, "Could not load background!\n");
+		exit(-1);
+	}
+	back = SDL_DisplayFormat(temp_image);
+	SDL_FreeSurface(temp_image);
+
+	/*
+	 * Load logo
+	 */
+	temp_image = SDL_LoadBMP("logo.bmp");
+	if(!temp_image)
+	{
+		fprintf(stderr, "Could not load logo!\n");
+		exit(-1);
+	}
+	SDL_SetColorKey(temp_image, SDL_SRCCOLORKEY,
+			SDL_MapRGB(temp_image->format, 255, 0, 255));
+	logo = SDL_DisplayFormat(temp_image);
+	SDL_FreeSurface(temp_image);
+
+	/*
+	 * Load font
+	 */
+	temp_image = SDL_LoadBMP("font7x10.bmp");
+	if(!temp_image)
+	{
+		fprintf(stderr, "Could not load font!\n");
+		exit(-1);
+	}
+	SDL_SetColorKey(temp_image, SDL_SRCCOLORKEY,
+			SDL_MapRGB(temp_image->format, 255, 0, 255));
+	font = SDL_DisplayFormat(temp_image);
+	SDL_FreeSurface(temp_image);
+
+	last_avg_tick = last_tick = SDL_GetTicks();
+	
+	enum { MAX_POINTERS = 16, PTR_PRESSED = 4 };
+	int touchPointers[MAX_POINTERS][5];
+	
+	memset(touchPointers, 0, sizeof(touchPointers));
+	SDL_Joystick * joysticks[MAX_POINTERS+1];
+	for(i=0; i<MAX_POINTERS; i++)
+		joysticks[i] = SDL_JoystickOpen(i);
+	
+	while(1)
+	{
+		SDL_Rect r;
+
+		/* Timing */
+		tick = SDL_GetTicks();
+		dt = (tick - last_tick) * 0.001f;
+		last_tick = tick;
+		
+		if( bpp == 32 )
+			SDL_FillRect(screen, NULL, 0); // Clear alpha channel
+
+		/* Background image */
+		tiled_back(back, screen, x_offs>>11, y_offs>>11);
+
+		/* Ballfield */
+		ballfield_render(balls, screen);
+
+		/* Logo */
+		r.x = 2;
+		r.y = 2;
+		SDL_BlitSurface(logo, NULL, screen, &r);
+
+		/* FPS counter */
+		if(tick > fps_start + 1500)
+		{
+			fps = (float)fps_count * 1000.0 / (tick - fps_start);
+			fps_count = 0;
+			fps_start = tick;
+			__android_log_print(ANDROID_LOG_INFO, "Ballfield", "SDL REGRESSION BUILDDATE %s FPS: %f", BUILDDATE, fps);
+		}
+		print_num(screen, font, screen->w-37, screen->h-12, fps);
+		++fps_count;
+
+		for(i=0; i<MAX_POINTERS; i++)
+		{
+			if( !touchPointers[i][PTR_PRESSED] )
+				continue;
+			r.x = touchPointers[i][0];
+			r.y = touchPointers[i][1];
+			r.w = 50 + touchPointers[i][3] / 10;
+			r.h = 50 + touchPointers[i][3] / 10;
+			r.x -= r.w/2;
+			r.y -= r.h/2;
+			Uint32 color = touchPointers[i][3] / 5 + 0x7f;
+			if( color > 0xff )
+				color = 0xff;
+			color = color + color * 0x100 + color * 0x10000;
+			SDL_FillRect(screen, &r, color);
+			print_num(screen, font, r.x, r.y, i+1);
+		}
+		int mx, my;
+		int b = SDL_GetMouseState(&mx, &my);
+		Uint32 color = 0xff;
+		if( b )
+		{
+			color = 0;
+			if( b & SDL_BUTTON_LEFT )
+				color |= 0xff00;
+			if( b & SDL_BUTTON_RIGHT )
+				color |= 0xff0000;
+		}
+		r.x = mx;
+		r.y = my;
+		r.w = 30;
+		r.h = 30;
+		r.x -= r.w/2;
+		r.y -= r.h/2;
+		SDL_FillRect(screen, &r, color);
+
+		SDL_Flip(SDL_GetVideoSurface());
+		SDL_Event evt;
+		while( SDL_PollEvent(&evt) )
+		{
+			if(evt.type == SDL_KEYUP || evt.type == SDL_KEYDOWN)
+			{
+				if(evt.key.keysym.sym == SDLK_ESCAPE)
+					return 0;
+				__android_log_print(ANDROID_LOG_INFO, "Ballfield", "SDL key event: evt %s state %s key %d scancode %d mod %d unicode %d", evt.type == SDL_KEYUP ? "UP  " : "DOWN" , evt.key.state == SDL_PRESSED ? "PRESSED " : "RELEASED", (int)evt.key.keysym.sym, (int)evt.key.keysym.scancode, (int)evt.key.keysym.mod, (int)evt.key.keysym.unicode);
+			}
+			if(evt.type == SDL_VIDEORESIZE)
+				__android_log_print(ANDROID_LOG_INFO, "Ballfield", "SDL resize event: %d x %d", evt.resize.w, evt.resize.h);
+			if(evt.type == SDL_ACTIVEEVENT)
+				__android_log_print(ANDROID_LOG_INFO, "Ballfield", "======= SDL active event: gain %d state %d", evt.active.gain, evt.active.state);
+			if( evt.type == SDL_ACTIVEEVENT && evt.active.gain == 0 && evt.active.state & SDL_APPACTIVE )
+			{
+				// We've lost GL context, we are not allowed to do any GFX output here, or app will crash!
+				while( 1 )
+				{
+					SDL_PollEvent(&evt);
+					if( evt.type == SDL_ACTIVEEVENT && evt.active.gain && evt.active.state & SDL_APPACTIVE )
+					{
+						__android_log_print(ANDROID_LOG_INFO, "Ballfield", "======= SDL active event: gain %d state %d", evt.active.gain, evt.active.state);
+						SDL_Flip(SDL_GetVideoSurface()); // One SDL_Flip() call is required here to restore OpenGL context
+						// Re-load all textures, matrixes and all other GL states if we're in SDL+OpenGL mode
+						// Re-load all images to SDL_Texture if we're using it
+						// Now we can draw
+						break;
+					}
+					// Process network stuff, maybe play some sounds using SDL_ANDROID_PauseAudioPlayback() / SDL_ANDROID_ResumeAudioPlayback()
+					SDL_Delay(300);
+					__android_log_print(ANDROID_LOG_INFO, "Ballfield", "Waiting");
+				}
+			}
+			if( evt.type == SDL_JOYAXISMOTION )
+			{
+				if( evt.jaxis.which == 0 )
+					continue;
+				int joyid = evt.jaxis.which - 1;
+				touchPointers[joyid][evt.jaxis.axis] = evt.jaxis.value;
+			}
+			if( evt.type == SDL_JOYBUTTONDOWN || evt.type == SDL_JOYBUTTONUP )
+			{
+				if( evt.jbutton.which == 0 )
+					continue;
+				int joyid = evt.jbutton.which - 1;
+				touchPointers[joyid][PTR_PRESSED] = (evt.jbutton.state == SDL_PRESSED);
+			}
+		}
+
+		/* Animate */
+		x_speed = 500.0 * sin(t * 0.37);
+		y_speed = 500.0 * sin(t * 0.53);
+		z_speed = 400.0 * sin(t * 0.21);
+
+		ballfield_move(balls, x_speed, y_speed, z_speed);
+		x_offs -= x_speed;
+		y_offs -= y_speed;
+
+		t += dt;
+	}
+
+	ballfield_free(balls);
+	SDL_FreeSurface(back);
+	SDL_FreeSurface(logo);
+	SDL_FreeSurface(font);
+	/*
+	std::ostringstream os;
+	os << "lalala" << std::endl << "more text" << std::endl;
+	std::cout << os.str() << std::endl << "text text" << std::endl;
+	*/
+	exit(0);
+}
--- a/project/jni/application/regression/icon.png
+++ b/project/jni/application/regression/icon.png
--- a/project/jni/application/regression/regression.h
+++ b/project/jni/application/regression/regression.h
@@ -0,0 +1 @@
+#define BUILDDATE "2011-10-18"
--- a/project/jni/application/scummvm/AndroidAppSettings.cfg
+++ b/project/jni/application/scummvm/AndroidAppSettings.cfg
@@ -1,16 +1,22 @@
 # The application settings for Android libSDL port
-AppSettingVersion=16
+AppSettingVersion=17
 LibSdlVersion=1.2
 AppName="ScummVM"
 AppFullName=org.scummvm.sdl
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="Data files size is 3.5 Mb|http://sourceforge.net/projects/libsdl-android/files/ScummVM/scummvm-1.2.0-data.zip/download^MIDI music support (30 Mb) - add soundfont in Options->MIDI|http://sourceforge.net/projects/libsdl-android/files/GeneralUser-GS-FluidSynth-v1.43.sf2.zip/download^Lure of the Temptress (English, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download^Lure of the Temptress (German, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-de-1.1.zip/download^Lure of the Temptress (French, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-fr-1.1.zip/download^Lure of the Temptress (Italian, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-it-1.1.zip/download^Lure of the Temptress (Spanish, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-es-1.1.zip/download^Beneath a Steel Sky (CD version, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/bass-cd-1.2.zip/download^Beneath a Steel Sky (floppy version, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/BASS-Floppy-1.3.zip/download^Flight of the Amazon Queen (23 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Floppy.zip/download^Flight of the Amazon Queen - voice addon (English, 35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Talkie-1.1.zip/download^Flight of the Amazon Queen - voice addon (German, 80 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Ger_talkie-1.0.zip/download^Flight of the Amazon Queen - voice addon (Hebrew, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Heb_talkie.zip/download^Drascula: The Vampire Strikes Back (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-1.0.zip/download^Drascula: The Vampire Strikes Back - translations addon (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-int-1.1.zip/download^Drascula: The Vampire Strikes Back - audio addon (40 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-audio-2.0.zip/download"
+AppDataDownloadUrl="MIDI music support (30 Mb) - add soundfont in Options->MIDI|http://sourceforge.net/projects/libsdl-android/files/GeneralUser-GS-FluidSynth-v1.43.sf2.zip/download^Lure of the Temptress (English, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download^Lure of the Temptress (German, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-de-1.1.zip/download^Lure of the Temptress (French, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-fr-1.1.zip/download^Lure of the Temptress (Italian, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-it-1.1.zip/download^Lure of the Temptress (Spanish, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-es-1.1.zip/download^Beneath a Steel Sky (CD version, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/bass-cd-1.2.zip/download^Beneath a Steel Sky (floppy version, 10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Beneath%20a%20Steel%20Sky/BASS-Floppy-1.3.zip/download^Flight of the Amazon Queen (23 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Floppy.zip/download^Flight of the Amazon Queen - voice addon (English, 35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Talkie-1.1.zip/download^Flight of the Amazon Queen - voice addon (German, 80 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Ger_talkie-1.0.zip/download^Flight of the Amazon Queen - voice addon (Hebrew, 70 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Heb_talkie.zip/download^Drascula: The Vampire Strikes Back (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-1.0.zip/download^Drascula: The Vampire Strikes Back - translations addon (35 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-int-1.1.zip/download^Drascula: The Vampire Strikes Back - audio addon (40 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-audio-2.0.zip/download^!ScummVM data|data1.zip^!ScummVM data|data2.zip"
+VideoDepthBpp=16
+NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
+SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
-NeedDepthBuffer=n
+CompatibilityHacks=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
+ForceRelativeMouseMode=n
 AppNeedsArrowKeys=n
 AppNeedsTextInput=n
 AppUsesJoystick=n
@@ -21,14 +27,16 @@ RedefinedKeys="LALT RETURN ESCAPE F7 ESCAPE F5 F5 RETURN DELETE F7 F7"
 AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LALT RETURN ESCAPE F7"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions=''
+FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=12102
-AppVersionName="1.2.1.02"
+AppVersionCode=13102
+AppVersionName="1.3.1.02"
 CompiledLibraries="mad tremor flac ogg jpeg png fluidsynth"
 CustomBuildScript=y
 AppCflags=''
 AppLdflags=''
 AppSubdirsBuild=''
-AppUseCrystaXToolchain=n
 AppCmdline=''
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
--- a/project/jni/application/scummvm/AndroidData/data1.zip
+++ b/project/jni/application/scummvm/AndroidData/data1.zip
--- a/project/jni/application/scummvm/AndroidData/data2.zip
+++ b/project/jni/application/scummvm/AndroidData/data2.zip
--- a/project/jni/application/scummvm/configure
+++ b/project/jni/application/scummvm/configure
--- a/project/jni/application/scummvm/scummvm
+++ b/project/jni/application/scummvm/scummvm
@@ -1 +1 @@
-../../../../../scummvm.1.2.0/
+scummvm-1.3.1
--- a/project/jni/application/scummvm/scummvm-1.3.1.diff
+++ b/project/jni/application/scummvm/scummvm-1.3.1.diff
@@ -0,0 +1,96 @@
+diff -u -r scummvm-1.3.1-old/configure scummvm-1.3.1/configure
+--- scummvm-1.3.1-old/configure	2011-07-03 23:44:51.000000000 +0300
+++ scummvm-1.3.1/configure	2011-10-17 16:32:52.498962514 +0300
+@@ -653,7 +653,7 @@
+   -h, --help              display this help and exit
+   --backend=BACKEND       backend to build (android, dc, dingux, ds, gp2x, gph,
+                           iphone, linuxmoto, maemo, n64, null, openpandora, ps2,
+-                          psp, samsungtv, sdl, symbian, webos, wii, wince) [sdl]
+                          psp, samsungtv, sdl, symbian, webos, wii, wince, androidsdl) [sdl]
+ 
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+@@ -680,6 +680,7 @@
+ Special configuration feature:
+   --host=HOST             cross-compile to target HOST (arm-linux, ...)
+                           special targets: android for Android
+                                           androidsdl for Android with SDL backend
+                                            caanoo for Caanoo
+                                            dingux for Dingux
+                                            dreamcast for Sega Dreamcast
+@@ -984,6 +985,11 @@
+ 	_host_cpu=arm
+ 	_host_alias=arm-linux-androideabi
+ 	;;
+androidsdl)
+	_host_os=androidsdl
+	_host_cpu=arm
+	_host_alias=arm-linux-androideabi
+	;;
+ arm-riscos)
+ 	_host_os=riscos
+ 	_host_cpu=arm
+@@ -1288,9 +1294,9 @@
+ 
+ 	if test -n "$_host"; then
+ 		# In cross-compiling mode, we cannot run the result
+-		eval "$1 $CXXFLAGS $LDFLAGS -o $TMPO.o -c tmp_cxx_compiler.cpp" 2> /dev/null && cc_check_clean tmp_cxx_compiler.cpp
+		eval "$1 $CXXFLAGS $LDFLAGS -o $TMPO.o -c tmp_cxx_compiler.cpp" && cc_check_clean tmp_cxx_compiler.cpp
+ 	else
+-		eval "$1 $CXXFLAGS $LDFLAGS -o $TMPO$HOSTEXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && eval "$TMPO$HOSTEXEEXT 2> /dev/null" && cc_check_clean tmp_cxx_compiler.cpp
+		eval "$1 $CXXFLAGS $LDFLAGS -o $TMPO$HOSTEXEEXT tmp_cxx_compiler.cpp" && eval "$TMPO$HOSTEXEEXT 2> /dev/null" && cc_check_clean tmp_cxx_compiler.cpp
+ 	fi
+ }
+ 
+@@ -1559,6 +1565,11 @@
+ 		_unix=yes
+ 		_seq_midi=no
+ 		;;
+	androidsdl)
+		CXXFLAGS="$CXXFLAGS -Os"
+		_unix=yes
+		_seq_midi=no
+		;;
+ 	beos*)
+ 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+ 		# Needs -lbind -lsocket for the timidity MIDI driver
+@@ -1729,6 +1740,12 @@
+ 			_mt32emu=no
+ 			_timidity=no
+ 			;;
+		androidsdl)
+			DEFINES="$DEFINES -DANDROID"
+			_unix=yes
+			_need_memalign=yes
+			_seq_midi=no
+			;;
+ 		arm-linux|arm*-linux-gnueabi|arm-*-linux)
+ 			_unix=yes
+ 			_need_memalign=yes
+@@ -2123,7 +2140,7 @@
+ # Enable 16bit support only for backends which support it
+ #
+ case $_backend in
+-	android | dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | webos | wii)
+	android | androidsdl | dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | webos | wii)
+ 		if test "$_16bit" = auto ; then
+ 			_16bit=yes
+ 		else
+@@ -3180,7 +3197,7 @@
+ 		case $_host_os in
+ 		# newlib-based system include files suppress non-C89 function
+ 		# declarations under __STRICT_ANSI__
+-		amigaos* | android | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | wii | wince )
+		amigaos* | android | androidsdl | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | wii | wince )
+ 			CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
+ 			;;
+ 		*)
+@@ -3203,7 +3220,7 @@
+ 
+ # Some platforms use certain GNU extensions in header files
+ case $_host_os in
+-android | gamecube | psp | wii)
+android | androidsdl | gamecube | psp | wii )
+ 	;;
+ *)
+ 	# ICC does not support pedantic
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-ballfield
+regression
--- a/regression.sh
+++ b/regression.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+if [ -z "$1" ] ; then
+	echo "Usage: $0 startdate [enddate=now] [revisions-step=10]"
+	echo "Runs regression tests for all Git revisions up to specified date,"
+	echo "and produces the FPS measurements for each of the revisions."
+	echo "Naturally, you'll need to have an Android device connected to USB port."
+	echo "Also, it messes up your current Git branch, so backup all your current changes."
+fi
+
+if echo "$0" | grep "regression/run-regression.sh" ; then
+echo Running FPS regression tests
+else
+mkdir -p regression
+cp -f "$0" regression/run-regression.sh
+chmod a+x regression/run-regression.sh
+regression/run-regression.sh "$@"
+exit $?
+fi
+
+FROM="$1"
+FROM="`git log -n 1 --format='%cD' \"@{$FROM}\" --`"
+TO="$2"
+if [ -z "$TODATE" ] ; then
+	TO="`git log -n 1 --format='%cD' --`"
+fi
+STEP="$3"
+if [ -z "$STEP" ] ; then
+	STEP=10
+fi
+
+echo Revisions from "$FROM" to "$TO" , step "$STEP"
+rm -rf regression/regression
+cp -r project/jni/application/regression regression/regression
+
+git checkout -f "@{$TO}"
+CURRENT="`git log -n 1 --format='%cD' --`"
+while [ `date -d "$CURRENT" "+%s"` -gt `date -d "$FROM" "+%s"` ] ; do
+CURFMT="`git log -n 1 --format='%ci' -- | sed 's/[+].*//' | sed 's/ /::/'`"
+echo $CURFMT
+rm -f project/jni/application/src
+rm -rf project/jni/application/regression
+cp -rf regression/regression project/jni/application/regression
+ln -s regression project/jni/application/src
+./ChangeAppSettings.sh -a
+cd project
+rm -rf obj
+echo "#define BUILDDATE \"$CURFMT\"" > project/jni/application/regression/regression.h
+nice -n19 ndk-build V=1 -j4 && ant debug && cp -f bin/DemoActivity-debug.apk ../regression/$CURFMT.apk
+cd ..
+adb install -r $CURFMT.apk
+adb shell am start -n net.olofson.ballfield.regression/.MainActivity
+sleep 5
+adb shell logcat -d -t 20 | grep "SDL REGRESSION BUILDDATE $CURFMT" >> regression/regression.txt
+
+git checkout -f "@{$STEP}"
+CURRENT="`git log -n 1 --format='%cD' --`"
+done