rename transluent to transparent, correctly set the setZOrderOnTop before the view is attached to the Window, only if the view is transparent.

tito · tito · commit 335adb9c35dd · 2013-11-07T10:56:59.000+01:00
fix a issue with lost buffer / loading screen, now loading should always be displayed.
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -140,8 +140,8 @@ component.
 
     * - Token
       - Description
-    * - `surface.transluent`
-      - If set to 1, the created surface will be transluent (can be used
+    * - `surface.transparent`
+      - If set to 1, the created surface will be transparent (can be used
         to add background Android widget in the background, or use accelerated
         widgets)
     * - `surface.depth`
@@ -150,3 +150,7 @@ component.
         support the depth you want.
     * - `surface.stencil`
       - Size of the stencil component, default to 8.
+    * - `android.background_color`
+      - Color (32bits RGBA color), used for the background window. Usually, the
+        background is covered by the OpenGL Background, unless
+        `surface.transparent` is set.
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -144,6 +144,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Hardware.view = mView;
         setContentView(mView);
+
+        // Force the background window color if asked
+        if ( this.mInfo.metaData.containsKey("android.background_color") ) {
+            getWindow().getDecorView().setBackgroundColor(
+                this.mInfo.metaData.getInt("android.background_color"));
+        }
     }
 
     /**
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -372,6 +372,11 @@ public SDLSurfaceView(PythonActivity act, String argument) {
             }
         } catch (PackageManager.NameNotFoundException e) {
         }
+
+        if ( ai.metaData.getInt("surface.transparent") != 0 ) {
+            Log.d(TAG, "Surface will be transparent, so put on the top.");
+            setZOrderOnTop(true);
+        }
     }
 
 
@@ -530,6 +535,11 @@ static void ackStop() {
      */
     public void surfaceCreated(SurfaceHolder holder) {
         //Log.i(TAG, "surfaceCreated() is not handled :|");
+        synchronized (this) {
+            if (!mStarted) {
+                this.notifyAll();
+            }
+        }
     }
 
     /**
@@ -545,7 +555,7 @@ public void surfaceDestroyed(SurfaceHolder holder) {
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
-        //Log.i(TAG, "surfaceChanged() :|");
+        //Log.i(TAG, String.format("surfaceChanged() fmt=%d size=%dx%d", format, w, h));
         mWidth = w;
         mHeight = h;
 
@@ -653,14 +663,14 @@ public void run() {
             return;
         }
 
-        if ( ai.metaData.getInt("surface.transluent") != 0 ) {
-            Log.i(TAG, "Surface will be transluent");
-            getHolder().setFormat(PixelFormat.TRANSLUCENT);
+        if ( ai.metaData.getInt("surface.transparent") != 0 ) {
+            Log.i(TAG, "Surface will be transparent");
+            getHolder().setFormat(PixelFormat.TRANSPARENT);
         } else {
-            Log.i(TAG, "Surface will NOT be transluent");
+            Log.i(TAG, "Surface will NOT be transparent");
         }
 
-        Log.w(TAG, "Done");
+        //Log.d(TAG, "Done");
         waitForStart();
 
         nativeResize(mWidth, mHeight);
@@ -815,9 +825,15 @@ private void waitForStart() {
         Matrix.multiplyMM(mMVPMatrix, 0, mProjMatrix, 0, mMVPMatrix, 0);
 
         GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
-        GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 6);
-        checkGlError("glDrawArrays");
-        swapBuffers();
+
+        // Ensure that, even with double buffer, or if we lost one buffer (like
+        // BufferQueue has been abandoned!), it will work.
+        for ( int i = 0; i < 2; i++ ) {
+            GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
+            GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 6);
+            checkGlError("glDrawArrays");
+            swapBuffers();
+        }
 
         // Wait to be notified it's okay to start Python.
         synchronized (this) {
@@ -830,7 +846,6 @@ private void waitForStart() {
                 try {
                     this.wait(250);
                 } catch (InterruptedException e) {
-                    continue;
                 }
             }
         }
