summaryrefslogtreecommitdiffstats
path: root/make/resources/android/AndroidManifest-launcher.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-10-04 02:48:22 +0200
committerSven Gothel <[email protected]>2011-10-04 02:48:22 +0200
commita095b7da968533120306ff9ef019685b6698272c (patch)
treef04c4043eafbfb7df255ea19aeeeeca69bd6e40c /make/resources/android/AndroidManifest-launcher.xml
parentc76e858c7f4481cab2dae6e079e0db35e3b591e6 (diff)
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)
Diffstat (limited to 'make/resources/android/AndroidManifest-launcher.xml')
-rw-r--r--make/resources/android/AndroidManifest-launcher.xml19
1 files changed, 16 insertions, 3 deletions
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>