From a095b7da968533120306ff9ef019685b6698272c Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 4 Oct 2011 02:48:22 +0200
Subject: Graph Shader Simplification, 'a'/'b' redefined; GraphUI 2-pass demo;

Graph Shader Simplification

  - remove enable factor and 2nd 'discard' branch

  - use build-in 'max'/'clamp' functions, supposed to be faster

Graph Shader 'a'/'b' redefined

  - 'a' is 1-pass shader only

  - 'b' is 2-pass incl. (1st pass + 2nd pass)
    - Works well on ARM Mali-400 MP (Galaxy S2).
    - Doesn't work on NV tegra2 (P1202: Texture's gl states do not match with shader's),
      however 2-pass on mobile seems to be overkill for now.
      We may create a workaround (switch shader ..).

GraphUI 2-pass demo;
  - Propagate renderModes and texSize to UIShape's render(..)
  - TODO: Remove GL dependency in UIShape, maybe use a callback or visitor model
  - Adding GarpUI 2-pass launcher (Android and Standalone)
---
 make/resources/android/AndroidManifest-launcher.xml   | 19 ++++++++++++++++---
 .../resources/android/res-launcher/values/strings.xml | 10 ++++++----
 make/scripts/tests.sh                                 |  3 ++-
 3 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'make')

diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml
index 0f4daa4f7..e48b61e45 100644
--- a/make/resources/android/AndroidManifest-launcher.xml
+++ b/make/resources/android/AndroidManifest-launcher.xml
@@ -69,12 +69,25 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGraphUIActivity"
+        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGraphUI1pActivity"
                   android:finishOnTaskLaunch="true"
                   android:launchMode="standard"
                   android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_graphui_name"
-                  android:description="@string/activity_graphui_descr"
+                  android:label="@string/activity_graphui1p_name"
+                  android:description="@string/activity_graphui1p_descr"
+                  android:exported="true"
+                  >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGraphUI2pActivity"
+                  android:finishOnTaskLaunch="true"
+                  android:launchMode="standard"
+                  android:configChanges="keyboardHidden|orientation"
+                  android:label="@string/activity_graphui2p_name"
+                  android:description="@string/activity_graphui2p_descr"
                   android:exported="true"
                   >
             <intent-filter>
diff --git a/make/resources/android/res-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml
index c039d6864..f4b558df3 100644
--- a/make/resources/android/res-launcher/values/strings.xml
+++ b/make/resources/android/res-launcher/values/strings.xml
@@ -3,16 +3,18 @@
     <string name="hello">Jogl Launcher</string>
     <string name="app_name">JogAmp\'s Jogl Launcher</string>
     <string name="app_descr">Launches Jogl Applications.</string>
-    <string name="activity_redsquarees1_name">RedSquareES1</string>
+    <string name="activity_redsquarees1_name">RedSqrES1</string>
     <string name="activity_redsquarees1_descr">RedSquareES1</string>
-    <string name="activity_redsquarees2_name">RedSquareES2</string>
+    <string name="activity_redsquarees2_name">RedSqrES2</string>
     <string name="activity_redsquarees2_descr">RedSquareES2</string>
     <string name="activity_gearses1_name">GearsES1</string>
     <string name="activity_gearses1_descr">GearsES1</string>
     <string name="activity_gearses2_name">GearsES2</string>
     <string name="activity_gearses2_descr">GearsES2</string>
-    <string name="activity_graphui_name">GraphUI</string>
-    <string name="activity_graphui_descr">GraphUI</string>
+    <string name="activity_graphui1p_name">GraphUI1p</string>
+    <string name="activity_graphui1p_descr">GraphUI 1-pass</string>
+    <string name="activity_graphui2p_name">GraphUI2p</string>
+    <string name="activity_graphui2p_descr">GraphUI 2-pass</string>
     <string name="activity_elektro_name">Elektro</string>
     <string name="activity_elektro_descr">Elektro</string>
 </resources>
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 9680b6611..fdba483e6 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -88,7 +88,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL"
     #D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock"
-    #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode"
+    #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState"
     #D_ARGS="-Djogamp.debug.JARUtil"
     #D_ARGS="-Djogamp.debug.TempFileCache"
@@ -251,6 +251,7 @@ function testawtmt() {
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $*
 testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo02 $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $*
-- 
cgit v1.2.3