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

Updated OpenTTD, fixed build scripts

Browse Source
This commit is contained in:
pelya
2011-12-08 14:17:58 +02:00
parent c3475c07c9
commit a4b406c424
11 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/java/GLSurfaceView_SDL.java
View File

@@ -596,8 +596,6 @@ public class GLSurfaceView_SDL extends SurfaceView implements SurfaceHolder.Call
mSwapBuffersCallback = c;
}
public abstract void DrawLogo(GL10 gl);
private SwapBuffersCallback mSwapBuffersCallback = null;
}
@@ -993,8 +991,6 @@ public class GLSurfaceView_SDL extends SurfaceView implements SurfaceHolder.Call
mNeedStart = true;
mSizeChanged = true;
SwapBuffers();
mRenderer.DrawLogo(mGL);
SwapBuffers();
mRenderer.onDrawFrame(mGL);

12
project/java/Video.java
View File

@@ -262,18 +262,22 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
public void onSurfaceCreated(GL10 gl, EGLConfig config) {
System.out.println("libSDL: DemoRenderer.onSurfaceCreated(): paused " + mPaused + " mFirstTimeStart " + mFirstTimeStart );
mGlSurfaceCreated = true;
mGl = gl;
if( ! mPaused && ! mFirstTimeStart )
nativeGlContextRecreated();
mFirstTimeStart = false;
}
public void onSurfaceChanged(GL10 gl, int w, int h) {
System.out.println("libSDL: DemoRenderer.onSurfaceChanged(): paused " + mPaused + " mFirstTimeStart " + mFirstTimeStart );
mWidth = w;
mHeight = h;
mGl = gl;
nativeResize(w, h, Globals.KeepAspectRatio ? 1 : 0);
}
public void onSurfaceDestroyed() {
System.out.println("libSDL: DemoRenderer.onSurfaceDestroyed(): paused " + mPaused + " mFirstTimeStart " + mFirstTimeStart );
mGlSurfaceCreated = false;
mGlContextLost = true;
nativeGlContextLost();
@@ -281,6 +285,10 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
public void onDrawFrame(GL10 gl) {
mGl = gl;
DrawLogo(mGl);
SwapBuffers();
nativeInitJavaCallbacks();
// Make main thread priority lower so audio thread won't get underrun
@@ -339,6 +347,8 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
if(mGlContextLost) {
mGlContextLost = false;
Settings.SetupTouchscreenKeyboardGraphics(context); // Reload on-screen buttons graphics
DrawLogo(mGl);
super.SwapBuffers();
}
return 1;
@@ -377,6 +387,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
}
public void DrawLogo(GL10 gl)
{
System.out.println("libSDL: DrawLogo");
BitmapDrawable bmp = null;
try
{
@@ -441,6 +452,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
private MainActivity context = null;
public AccelerometerReader accelerometer = null;
private GL10 mGl = null;
private EGL10 mEgl = null;
private EGLDisplay mEglDisplay = null;
private EGLSurface mEglSurface = null;