Merge remote-tracking branch 'upstream/master' into pair_symbols_tool

15 files changed, 0 insertions, 882 deletions

diff --git a/platform/android/.old/java/AndroidManifest.xml b/platform/android/.old/java/AndroidManifest.xml
deleted file mode 100644
index c05a681fe3..0000000000
--- a/platform/android/.old/java/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.android.godot"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:label="@string/godot" android:icon="@drawable/icon">
-        <activity android:name="Godot"
-                  android:label="@string/godot"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:launchMode="singleTask"
-                  android:configChanges="orientation|keyboardHidden">
-                                                                  
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <uses-feature android:glEsVersion="0x00020000"/>
-    <uses-sdk android:minSdkVersion="8"/>
-         
-</manifest> 
diff --git a/platform/android/.old/java/build.properties b/platform/android/.old/java/build.properties
deleted file mode 100644
index ee52d86d94..0000000000
--- a/platform/android/.old/java/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/platform/android/.old/java/build.xml b/platform/android/.old/java/build.xml
deleted file mode 100644
index 6dc5eb874c..0000000000
--- a/platform/android/.old/java/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Godot" default="help">
-
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
-    <property file="local.properties" />
-    <property name="asset-dir" value="assets" />
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="build.properties" />
-
-    <!-- The default.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
-
-
-    <!-- Required pre-setup import -->
-    <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/tools/ant/
-         Depending on the project type it can be either:
-         - main_rules.xml
-         - lib_rules.xml
-         - test_rules.xml
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <setup> task.
-             - customize it to your needs.
-         - Customize the whole script.
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
-             - customize to your needs.
-    -->
-    <setup />
-
-</project>
diff --git a/platform/android/.old/java/default.properties b/platform/android/.old/java/default.properties
deleted file mode 100644
index e2e8061f26..0000000000
--- a/platform/android/.old/java/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-8
diff --git a/platform/android/.old/java/libs/armeabi/gdbserver b/platform/android/.old/java/libs/armeabi/gdbserver
deleted file mode 100755
index 39634a8147..0000000000
--- a/platform/android/.old/java/libs/armeabi/gdbserver
+++ /dev/null
diff --git a/platform/android/.old/java/local.properties b/platform/android/.old/java/local.properties
deleted file mode 100644
index 18e2b6b0cb..0000000000
--- a/platform/android/.old/java/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/red/bin/android-sdk-linux_x86
diff --git a/platform/android/.old/java/proguard.cfg b/platform/android/.old/java/proguard.cfg
deleted file mode 100644
index 12dd0392c0..0000000000
--- a/platform/android/.old/java/proguard.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
diff --git a/platform/android/.old/java/res/drawable-hdpi/icon.png b/platform/android/.old/java/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c571..0000000000
--- a/platform/android/.old/java/res/drawable-hdpi/icon.png
+++ /dev/null
diff --git a/platform/android/.old/java/res/drawable-ldpi/icon.png b/platform/android/.old/java/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584ec2..0000000000
--- a/platform/android/.old/java/res/drawable-ldpi/icon.png
+++ /dev/null
diff --git a/platform/android/.old/java/res/drawable-mdpi/icon.png b/platform/android/.old/java/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69fa5a..0000000000
--- a/platform/android/.old/java/res/drawable-mdpi/icon.png
+++ /dev/null
diff --git a/platform/android/.old/java/res/values/strings.xml b/platform/android/.old/java/res/values/strings.xml
deleted file mode 100644
index f92332ad4c..0000000000
--- a/platform/android/.old/java/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="godot">Godot</string>
-</resources>
diff --git a/platform/android/.old/java/src/com/android/godot/Godot.java b/platform/android/.old/java/src/com/android/godot/Godot.java
deleted file mode 100644
index 475caf3362..0000000000
--- a/platform/android/.old/java/src/com/android/godot/Godot.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.android.godot;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MotionEvent;
-
-public class Godot extends Activity
-{
-
-
-	GodotView mView;
-
-	static public GodotIO io;
-
-
-	@Override protected void onCreate(Bundle icicle) {
-		super.onCreate(icicle);
-		io = new GodotIO(getAssets());
-		GodotLib.io=io;
-		mView = new GodotView(getApplication(),io);
-		setContentView(mView);
-	}
-
-	@Override protected void onPause() {
-		super.onPause();
-		mView.onPause();
-	}
-
-	@Override protected void onResume() {
-		super.onResume();
-		mView.onResume();
-	}
-
-	@Override public boolean dispatchTouchEvent (MotionEvent event) {
-
-		super.onTouchEvent(event);
-		int evcount=event.getPointerCount();
-		if (evcount==0)
-			return true;
-
-		int[] arr = new int[event.getPointerCount()*3];
-
-		for(int i=0;i<event.getPointerCount();i++) {
-
-			arr[i*3+0]=(int)event.getPointerId(i);
-			arr[i*3+1]=(int)event.getX(i);
-			arr[i*3+2]=(int)event.getY(i);
-		}
-
-		//System.out.printf("gaction: %d\n",event.getAction());
-		switch(event.getAction()&MotionEvent.ACTION_MASK) {
-
-			case MotionEvent.ACTION_DOWN: {
-				GodotLib.touch(0,0,evcount,arr);
-				//System.out.printf("action down at: %f,%f\n", event.getX(),event.getY());
-			} break;
-			case MotionEvent.ACTION_MOVE: {
-				GodotLib.touch(1,0,evcount,arr);
-				//for(int i=0;i<event.getPointerCount();i++) {
-				//	System.out.printf("%d - moved to: %f,%f\n",i, event.getX(i),event.getY(i));
-				//}
-			} break;
-			case MotionEvent.ACTION_POINTER_UP: {
-				int pointer_idx = event.getActionIndex();
-				GodotLib.touch(4,pointer_idx,evcount,arr);
-				//System.out.printf("%d - s.up at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx));
-			} break;
-			case MotionEvent.ACTION_POINTER_DOWN: {
-				int pointer_idx = event.getActionIndex();
-				GodotLib.touch(3,pointer_idx,evcount,arr);
-				//System.out.printf("%d - s.down at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx));
-			} break;
-			case MotionEvent.ACTION_CANCEL:
-			case MotionEvent.ACTION_UP: {
-				GodotLib.touch(2,0,evcount,arr);
-				//for(int i=0;i<event.getPointerCount();i++) {
-				//	System.out.printf("%d - up! %f,%f\n",i, event.getX(i),event.getY(i));
-				//}
-			} break;
-
-		}
-		return true;
-	}
-
-}
diff --git a/platform/android/.old/java/src/com/android/godot/GodotIO.java b/platform/android/.old/java/src/com/android/godot/GodotIO.java
deleted file mode 100644
index a673f79b8d..0000000000
--- a/platform/android/.old/java/src/com/android/godot/GodotIO.java
+++ /dev/null
@@ -1,277 +0,0 @@
-
-package com.android.godot;
-import java.util.HashMap;
-
-import android.content.res.AssetManager;
-import java.io.InputStream;
-import java.io.IOException;
-
-// Wrapper for native library
-
-public class GodotIO {
-
-
-	AssetManager am;
-
-
-	/// FILES
-
-	public int last_file_id=1;
-
-	class AssetData {
-
-
-		public boolean eof=false;
-		public String path;
-		public InputStream is;
-		public int len;
-		public int pos;
-	}
-
-
-	HashMap<Integer,AssetData> streams;
-
-
-	public int file_open(String path,boolean write) {
-
-		System.out.printf("file_open: Attempt to Open %s\n",path);
-
-		if (write)
-			return -1;
-
-
-		AssetData ad = new AssetData();
-
-		try {
-			ad.is = am.open(path);
-
-		} catch (Exception e) {
-
-			System.out.printf("Exception on file_open: %s\n",e);
-			return -1;
-		}
-
-		try {
-			ad.len=ad.is.available();
-		} catch (Exception e) {
-
-			System.out.printf("Exception availabling on file_open: %s\n",e);
-			return -1;
-		}
-
-		ad.path=path;
-		ad.pos=0;
-		++last_file_id;
-		streams.put(last_file_id,ad);
-
-		return last_file_id;
-	}
-	public int file_get_size(int id) {
-
-		if (!streams.containsKey(id)) {
-			System.out.printf("file_get_size: Invalid file id: %d\n",id);
-			return -1;
-		}
-
-		return streams.get(id).len;
-
-	}
-	public void file_seek(int id,int bytes) {
-
-		if (!streams.containsKey(id)) {
-			System.out.printf("file_get_size: Invalid file id: %d\n",id);
-			return;
-		}
-		//seek sucks
-		AssetData ad = streams.get(id);
-		if (bytes>ad.len)
-			bytes=ad.len;
-		if (bytes<0)
-			bytes=0;
-
-		try {
-
-		if (bytes > (int)ad.pos) {
-			int todo=bytes-(int)ad.pos;
-			while(todo>0) {
-				todo-=ad.is.skip(todo);
-			}
-			ad.pos=bytes;
-		} else if (bytes<(int)ad.pos) {
-
-			ad.is=am.open(ad.path);
-
-			ad.pos=bytes;
-			int todo=bytes;
-			while(todo>0) {
-				todo-=ad.is.skip(todo);
-			}
-		}
-
-		ad.eof=false;
-		} catch (IOException e) {
-
-			System.out.printf("Exception on file_seek: %s\n",e);
-			return;
-		}
-
-
-	}
-
-	public int file_tell(int id) {
-
-		if (!streams.containsKey(id)) {
-			System.out.printf("file_read: Can't tell eof for invalid file id: %d\n",id);
-			return 0;
-		}
-
-		AssetData ad = streams.get(id);
-		return ad.pos;
-	}
-	public boolean file_eof(int id) {
-
-		if (!streams.containsKey(id)) {
-			System.out.printf("file_read: Can't check eof for invalid file id: %d\n",id);
-			return false;
-		}
-
-		AssetData ad = streams.get(id);
-		return ad.eof;
-	}
-
-	public byte[] file_read(int id, int bytes) {
-
-		if (!streams.containsKey(id)) {
-			System.out.printf("file_read: Can't read invalid file id: %d\n",id);
-			return new byte[0];
-		}
-
-
-		AssetData ad = streams.get(id);
-
-		if (ad.pos + bytes > ad.len) {
-
-			bytes=ad.len-ad.pos;
-			ad.eof=true;
-		}
-
-
-		if (bytes==0) {
-
-			return new byte[0];
-		}
-
-
-
-		byte[] buf1=new byte[bytes];
-		int r=0;
-		try {
-			r = ad.is.read(buf1);
-		} catch (IOException e) {
-
-			System.out.printf("Exception on file_read: %s\n",e);
-			return new byte[bytes];
-		}
-
-		if (r==0) {
-			return new byte[0];
-		}
-
-		ad.pos+=r;
-
-		if (r<bytes) {
-
-			byte[] buf2=new byte[r];
-			for(int i=0;i<r;i++)
-				buf2[i]=buf1[i];
-			return buf2;
-		} else {
-
-			return buf1;
-		}
-
-	}
-
-	public void file_close(int id) {
-
-		if (!streams.containsKey(id)) {
-			System.out.printf("file_close: Can't close invalid file id: %d\n",id);
-			return;
-		}
-
-		streams.remove(id);
-
-	}
-
-
-	/// DIRECTORIES
-
-
-	class AssetDir {
-
-		public String[] files;
-		public int current;
-	}
-
-	public int last_dir_id=1;
-
-	HashMap<Integer,AssetDir> dirs;
-
-	public int dir_open(String path) {
-
-		AssetDir ad = new AssetDir();
-		ad.current=0;
-
-		try {
-			ad.files = am.list(path);
-		} catch (IOException e) {
-
-			System.out.printf("Exception on dir_open: %s\n",e);
-			return -1;
-		}
-
-		++last_dir_id;
-		dirs.put(last_dir_id,ad);
-
-		return last_dir_id;
-
-	}
-
-	public String dir_next(int id) {
-
-		if (!dirs.containsKey(id)) {
-			System.out.printf("dir_next: invalid dir id: %d\n",id);
-			return "";
-		}
-
-		AssetDir ad = dirs.get(id);
-		if (ad.current>=ad.files.length)
-			return "";
-		String r = ad.files[ad.current];
-		ad.current++;
-		return r;
-
-	}
-
-	public void dir_close(int id) {
-
-		if (!dirs.containsKey(id)) {
-			System.out.printf("dir_close: invalid dir id: %d\n",id);
-			return;
-		}
-
-		dirs.remove(id);
-	}
-
-
-	GodotIO(AssetManager p_am) {
-
-		am=p_am;
-		streams=new HashMap<Integer,AssetData>();
-		dirs=new HashMap<Integer,AssetDir>();
-
-
-	}
-
-
-}
diff --git a/platform/android/.old/java/src/com/android/godot/GodotLib.java b/platform/android/.old/java/src/com/android/godot/GodotLib.java
deleted file mode 100644
index 2ef49a5222..0000000000
--- a/platform/android/.old/java/src/com/android/godot/GodotLib.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.android.godot;
-
-// Wrapper for native library
-
-public class GodotLib {
-
-
-     public static GodotIO io;
-
-     static {
-	 System.loadLibrary("godot_android");
-     }
-
-    /**
-     * @param width the current view width
-     * @param height the current view height
-     */
-
-     public static native void init(int width, int height);
-     public static native void step();
-     public static native void touch(int what,int pointer,int howmany, int[] arr);
-}
diff --git a/platform/android/.old/java/src/com/android/godot/GodotView.java b/platform/android/.old/java/src/com/android/godot/GodotView.java
deleted file mode 100644
index c5eb3d17ad..0000000000
--- a/platform/android/.old/java/src/com/android/godot/GodotView.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package com.android.godot;
-import android.content.Context;
-import android.graphics.PixelFormat;
-import android.opengl.GLSurfaceView;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.content.ContextWrapper;
-
-import java.io.File;
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.opengles.GL10;
-
-/**
- * A simple GLSurfaceView sub-class that demonstrate how to perform
- * OpenGL ES 2.0 rendering into a GL Surface. Note the following important
- * details:
- *
- * - The class must use a custom context factory to enable 2.0 rendering.
- *   See ContextFactory class definition below.
- *
- * - The class must use a custom EGLConfigChooser to be able to select
- *   an EGLConfig that supports 2.0. This is done by providing a config
- *   specification to eglChooseConfig() that has the attribute
- *   EGL10.ELG_RENDERABLE_TYPE containing the EGL_OPENGL_ES2_BIT flag
- *   set. See ConfigChooser class definition below.
- *
- * - The class must select the surface's format, then choose an EGLConfig
- *   that matches it exactly (with regards to red/green/blue/alpha channels
- *   bit depths). Failure to do so would result in an EGL_BAD_MATCH error.
- */
-class GodotView extends GLSurfaceView {
-    private static String TAG = "GodotView";
-    private static final boolean DEBUG = false;
-    private static Context ctx;
-
-    private static GodotIO io;
-
-    public GodotView(Context context,GodotIO p_io) {
-	super(context);
-	ctx=context;
-	io=p_io;
-
-	init(false, 0, 0);
-    }
-
-    public GodotView(Context context, boolean translucent, int depth, int stencil) {
-	super(context);
-	init(translucent, depth, stencil);
-    }
-
-    private void init(boolean translucent, int depth, int stencil) {
-
-	/* By default, GLSurfaceView() creates a RGB_565 opaque surface.
-	 * If we want a translucent one, we should change the surface's
-	 * format here, using PixelFormat.TRANSLUCENT for GL Surfaces
-	 * is interpreted as any 32-bit surface with alpha by SurfaceFlinger.
-	 */
-	if (translucent) {
-	    this.getHolder().setFormat(PixelFormat.TRANSLUCENT);
-	}
-
-	/* Setup the context factory for 2.0 rendering.
-	 * See ContextFactory class definition below
-	 */
-	setEGLContextFactory(new ContextFactory());
-
-	/* We need to choose an EGLConfig that matches the format of
-	 * our surface exactly. This is going to be done in our
-	 * custom config chooser. See ConfigChooser class definition
-	 * below.
-	 */
-	setEGLConfigChooser( translucent ?
-			     new ConfigChooser(8, 8, 8, 8, depth, stencil) :
-			     new ConfigChooser(5, 6, 5, 0, depth, stencil) );
-
-	/* Set the renderer responsible for frame rendering */
-	setRenderer(new Renderer());
-    }
-
-    private static class ContextFactory implements GLSurfaceView.EGLContextFactory {
-	private static int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-	public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
-	    Log.w(TAG, "creating OpenGL ES 2.0 context");
-	    checkEglError("Before eglCreateContext", egl);
-	    int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
-	    EGLContext context = egl.eglCreateContext(display, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
-	    checkEglError("After eglCreateContext", egl);
-	    return context;
-	}
-
-	public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
-	    egl.eglDestroyContext(display, context);
-	}
-    }
-
-    private static void checkEglError(String prompt, EGL10 egl) {
-	int error;
-	while ((error = egl.eglGetError()) != EGL10.EGL_SUCCESS) {
-	    Log.e(TAG, String.format("%s: EGL error: 0x%x", prompt, error));
-	}
-    }
-
-    private static class ConfigChooser implements GLSurfaceView.EGLConfigChooser {
-
-	public ConfigChooser(int r, int g, int b, int a, int depth, int stencil) {
-	    mRedSize = r;
-	    mGreenSize = g;
-	    mBlueSize = b;
-	    mAlphaSize = a;
-	    mDepthSize = depth;
-	    mStencilSize = stencil;
-	}
-
-	/* This EGL config specification is used to specify 2.0 rendering.
-	 * We use a minimum size of 4 bits for red/green/blue, but will
-	 * perform actual matching in chooseConfig() below.
-	 */
-	private static int EGL_OPENGL_ES2_BIT = 4;
-	private static int[] s_configAttribs2 =
-	{
-	    EGL10.EGL_RED_SIZE, 4,
-	    EGL10.EGL_GREEN_SIZE, 4,
-	    EGL10.EGL_BLUE_SIZE, 4,
-	    EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-	    EGL10.EGL_NONE
-	};
-
-	public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
-
-	    /* Get the number of minimally matching EGL configurations
-	     */
-	    int[] num_config = new int[1];
-	    egl.eglChooseConfig(display, s_configAttribs2, null, 0, num_config);
-
-	    int numConfigs = num_config[0];
-
-	    if (numConfigs <= 0) {
-		throw new IllegalArgumentException("No configs match configSpec");
-	    }
-
-	    /* Allocate then read the array of minimally matching EGL configs
-	     */
-	    EGLConfig[] configs = new EGLConfig[numConfigs];
-	    egl.eglChooseConfig(display, s_configAttribs2, configs, numConfigs, num_config);
-
-	    if (DEBUG) {
-		 printConfigs(egl, display, configs);
-	    }
-	    /* Now return the "best" one
-	     */
-	    return chooseConfig(egl, display, configs);
-	}
-
-	public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
-		EGLConfig[] configs) {
-	    for(EGLConfig config : configs) {
-		int d = findConfigAttrib(egl, display, config,
-			EGL10.EGL_DEPTH_SIZE, 0);
-		int s = findConfigAttrib(egl, display, config,
-			EGL10.EGL_STENCIL_SIZE, 0);
-
-		// We need at least mDepthSize and mStencilSize bits
-		if (d < mDepthSize || s < mStencilSize)
-		    continue;
-
-		// We want an *exact* match for red/green/blue/alpha
-		int r = findConfigAttrib(egl, display, config,
-			EGL10.EGL_RED_SIZE, 0);
-		int g = findConfigAttrib(egl, display, config,
-			    EGL10.EGL_GREEN_SIZE, 0);
-		int b = findConfigAttrib(egl, display, config,
-			    EGL10.EGL_BLUE_SIZE, 0);
-		int a = findConfigAttrib(egl, display, config,
-			EGL10.EGL_ALPHA_SIZE, 0);
-
-		if (r == mRedSize && g == mGreenSize && b == mBlueSize && a == mAlphaSize)
-		    return config;
-	    }
-	    return null;
-	}
-
-	private int findConfigAttrib(EGL10 egl, EGLDisplay display,
-		EGLConfig config, int attribute, int defaultValue) {
-
-	    if (egl.eglGetConfigAttrib(display, config, attribute, mValue)) {
-		return mValue[0];
-	    }
-	    return defaultValue;
-	}
-
-	private void printConfigs(EGL10 egl, EGLDisplay display,
-	    EGLConfig[] configs) {
-	    int numConfigs = configs.length;
-	    Log.w(TAG, String.format("%d configurations", numConfigs));
-	    for (int i = 0; i < numConfigs; i++) {
-		Log.w(TAG, String.format("Configuration %d:\n", i));
-		printConfig(egl, display, configs[i]);
-	    }
-	}
-
-	private void printConfig(EGL10 egl, EGLDisplay display,
-		EGLConfig config) {
-	    int[] attributes = {
-		    EGL10.EGL_BUFFER_SIZE,
-		    EGL10.EGL_ALPHA_SIZE,
-		    EGL10.EGL_BLUE_SIZE,
-		    EGL10.EGL_GREEN_SIZE,
-		    EGL10.EGL_RED_SIZE,
-		    EGL10.EGL_DEPTH_SIZE,
-		    EGL10.EGL_STENCIL_SIZE,
-		    EGL10.EGL_CONFIG_CAVEAT,
-		    EGL10.EGL_CONFIG_ID,
-		    EGL10.EGL_LEVEL,
-		    EGL10.EGL_MAX_PBUFFER_HEIGHT,
-		    EGL10.EGL_MAX_PBUFFER_PIXELS,
-		    EGL10.EGL_MAX_PBUFFER_WIDTH,
-		    EGL10.EGL_NATIVE_RENDERABLE,
-		    EGL10.EGL_NATIVE_VISUAL_ID,
-		    EGL10.EGL_NATIVE_VISUAL_TYPE,
-		    0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
-		    EGL10.EGL_SAMPLES,
-		    EGL10.EGL_SAMPLE_BUFFERS,
-		    EGL10.EGL_SURFACE_TYPE,
-		    EGL10.EGL_TRANSPARENT_TYPE,
-		    EGL10.EGL_TRANSPARENT_RED_VALUE,
-		    EGL10.EGL_TRANSPARENT_GREEN_VALUE,
-		    EGL10.EGL_TRANSPARENT_BLUE_VALUE,
-		    0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
-		    0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
-		    0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
-		    0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
-		    EGL10.EGL_LUMINANCE_SIZE,
-		    EGL10.EGL_ALPHA_MASK_SIZE,
-		    EGL10.EGL_COLOR_BUFFER_TYPE,
-		    EGL10.EGL_RENDERABLE_TYPE,
-		    0x3042 // EGL10.EGL_CONFORMANT
-	    };
-	    String[] names = {
-		    "EGL_BUFFER_SIZE",
-		    "EGL_ALPHA_SIZE",
-		    "EGL_BLUE_SIZE",
-		    "EGL_GREEN_SIZE",
-		    "EGL_RED_SIZE",
-		    "EGL_DEPTH_SIZE",
-		    "EGL_STENCIL_SIZE",
-		    "EGL_CONFIG_CAVEAT",
-		    "EGL_CONFIG_ID",
-		    "EGL_LEVEL",
-		    "EGL_MAX_PBUFFER_HEIGHT",
-		    "EGL_MAX_PBUFFER_PIXELS",
-		    "EGL_MAX_PBUFFER_WIDTH",
-		    "EGL_NATIVE_RENDERABLE",
-		    "EGL_NATIVE_VISUAL_ID",
-		    "EGL_NATIVE_VISUAL_TYPE",
-		    "EGL_PRESERVED_RESOURCES",
-		    "EGL_SAMPLES",
-		    "EGL_SAMPLE_BUFFERS",
-		    "EGL_SURFACE_TYPE",
-		    "EGL_TRANSPARENT_TYPE",
-		    "EGL_TRANSPARENT_RED_VALUE",
-		    "EGL_TRANSPARENT_GREEN_VALUE",
-		    "EGL_TRANSPARENT_BLUE_VALUE",
-		    "EGL_BIND_TO_TEXTURE_RGB",
-		    "EGL_BIND_TO_TEXTURE_RGBA",
-		    "EGL_MIN_SWAP_INTERVAL",
-		    "EGL_MAX_SWAP_INTERVAL",
-		    "EGL_LUMINANCE_SIZE",
-		    "EGL_ALPHA_MASK_SIZE",
-		    "EGL_COLOR_BUFFER_TYPE",
-		    "EGL_RENDERABLE_TYPE",
-		    "EGL_CONFORMANT"
-	    };
-	    int[] value = new int[1];
-	    for (int i = 0; i < attributes.length; i++) {
-		int attribute = attributes[i];
-		String name = names[i];
-		if ( egl.eglGetConfigAttrib(display, config, attribute, value)) {
-		    Log.w(TAG, String.format("  %s: %d\n", name, value[0]));
-		} else {
-		    // Log.w(TAG, String.format("  %s: failed\n", name));
-		    while (egl.eglGetError() != EGL10.EGL_SUCCESS);
-		}
-	    }
-	}
-
-	// Subclasses can adjust these values:
-	protected int mRedSize;
-	protected int mGreenSize;
-	protected int mBlueSize;
-	protected int mAlphaSize;
-	protected int mDepthSize;
-	protected int mStencilSize;
-	private int[] mValue = new int[1];
-    }
-
-    private static class Renderer implements GLSurfaceView.Renderer {
-
-
-	public void onDrawFrame(GL10 gl) {
-	    GodotLib.step();
-	}
-
-	public void onSurfaceChanged(GL10 gl, int width, int height) {
-
-
-	    System.out.printf("** CONTENT DIR %s\n",ctx.getFilesDir().getPath());
-	    GodotLib.init(width, height);
-	}
-
-	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-	    // Do nothing.
-	}
-    }
-}