Merge branch 'android-tegra-playground' of git://github.com/sgothel/jogl into android-tegra-playground

4 files changed, 58 insertions, 8 deletions

diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java
index 81bc26572..12574c8d0 100644
--- a/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java
+++ b/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java
@@ -54,21 +54,26 @@ public abstract class NEWTLauncherActivity extends Activity {
        Log.d(TAG, "onCreate - S");
        super.onCreate(savedInstanceState);
        
+       System.setProperty("jogamp.debug.JNILibLoader", "true");
+       System.setProperty("jogamp.debug.NativeLibrary", "true");
+       // System.setProperty("jogamp.debug.NativeLibrary.Lookup", "true");
+       // System.setProperty("jogamp.debug.IOUtil", "true");       
+
        // System.setProperty("nativewindow.debug", "all");
+       // System.setProperty("nativewindow.debug.GraphicsConfiguration", "true");
+
        // System.setProperty("jogl.debug", "all");
-       System.setProperty("jogl.debug.GLProfile", "true");
+       // System.setProperty("jogl.debug.GLProfile", "true");
        System.setProperty("jogl.debug.GLDrawable", "true");
+       System.setProperty("jogl.debug.GLSLCode", "true");
+       System.setProperty("jogl.debug.DebugGL", "true");
+       System.setProperty("jogl.debug.TraceGL", "true");
+
        // System.setProperty("newt.debug", "all");
        System.setProperty("newt.debug.Window", "true");
        // System.setProperty("newt.debug.Window.MouseEvent", "true");
        // System.setProperty("newt.debug.Window.KeyEvent", "true");
-       // System.setProperty("jogamp.debug.IOUtil", "true");       
-       System.setProperty("jogamp.debug.JNILibLoader", "true");
-       System.setProperty("jogamp.debug.NativeLibrary", "true");
-       // System.setProperty("jogamp.debug.NativeLibrary.Lookup", "true");
-       System.setProperty("jogl.debug.GLSLCode", "true");
-       System.setProperty("nativewindow.debug.GraphicsConfiguration", "true");
-              
+
        ClassLoader cl = ClassLoaderUtil.createJogampClassLoaderSingleton(this, getUserPackageName());
        if(null != cl) {
            try {
diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherElektronActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherElektronActivity.java
new file mode 100644
index 000000000..85a751ea6
--- /dev/null
+++ b/src/android/com/jogamp/android/launcher/NEWTLauncherElektronActivity.java
@@ -0,0 +1,15 @@
+package com.jogamp.android.launcher;
+
+public class NEWTLauncherElektronActivity extends NEWTLauncherActivity {
+    static String demo = "com.jogamp.opengl.test.android.NEWTElektronActivity";
+    static String pkg = "com.jogamp.opengl.test";
+    
+    @Override
+    public String getUserActivityName() {
+        return demo;
+    }
+    @Override
+    public String getUserPackageName() {
+        return pkg;
+    }
+}
diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherRedSquareES1Activity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherRedSquareES1Activity.java
new file mode 100644
index 000000000..af5270569
--- /dev/null
+++ b/src/android/com/jogamp/android/launcher/NEWTLauncherRedSquareES1Activity.java
@@ -0,0 +1,15 @@
+package com.jogamp.android.launcher;
+
+public class NEWTLauncherRedSquareES1Activity extends NEWTLauncherActivity {
+    static String demo = "com.jogamp.opengl.test.android.NEWTRedSquareES1Activity";
+    static String pkg = "com.jogamp.opengl.test";
+
+    @Override
+    public String getUserActivityName() {
+        return demo;
+    }
+    @Override
+    public String getUserPackageName() {
+        return pkg;
+    }
+}
diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherRedSquareES2Activity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherRedSquareES2Activity.java
new file mode 100644
index 000000000..03e2ad7d3
--- /dev/null
+++ b/src/android/com/jogamp/android/launcher/NEWTLauncherRedSquareES2Activity.java
@@ -0,0 +1,15 @@
+package com.jogamp.android.launcher;
+
+public class NEWTLauncherRedSquareES2Activity extends NEWTLauncherActivity {
+    static String demo = "com.jogamp.opengl.test.android.NEWTRedSquareES2Activity";
+    static String pkg = "com.jogamp.opengl.test";
+
+    @Override
+    public String getUserActivityName() {
+        return demo;
+    }
+    @Override
+    public String getUserPackageName() {
+        return pkg;
+    }
+}