diff options
author | Sven Gothel <[email protected]> | 2011-10-04 02:48:22 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-10-04 02:48:22 +0200 |
commit | a095b7da968533120306ff9ef019685b6698272c (patch) | |
tree | f04c4043eafbfb7df255ea19aeeeeca69bd6e40c /src/android | |
parent | c76e858c7f4481cab2dae6e079e0db35e3b591e6 (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 'src/android')
-rw-r--r-- | src/android/com/jogamp/android/launcher/NEWTLauncherGraphUI1pActivity.java (renamed from src/android/com/jogamp/android/launcher/NEWTLauncherGraphUIActivity.java) | 4 | ||||
-rw-r--r-- | src/android/com/jogamp/android/launcher/NEWTLauncherGraphUI2pActivity.java | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherGraphUIActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherGraphUI1pActivity.java index 6a185fecc..1af0de1f2 100644 --- a/src/android/com/jogamp/android/launcher/NEWTLauncherGraphUIActivity.java +++ b/src/android/com/jogamp/android/launcher/NEWTLauncherGraphUI1pActivity.java @@ -1,7 +1,7 @@ package com.jogamp.android.launcher; -public class NEWTLauncherGraphUIActivity extends NEWTLauncherActivity { - static String demo = "com.jogamp.opengl.test.android.NEWTGraphUIActivity"; +public class NEWTLauncherGraphUI1pActivity extends NEWTLauncherActivity { + static String demo = "com.jogamp.opengl.test.android.NEWTGraphUI1pActivity"; static String pkg = "com.jogamp.opengl.test"; @Override diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherGraphUI2pActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherGraphUI2pActivity.java new file mode 100644 index 000000000..0a5f8d265 --- /dev/null +++ b/src/android/com/jogamp/android/launcher/NEWTLauncherGraphUI2pActivity.java @@ -0,0 +1,15 @@ +package com.jogamp.android.launcher; + +public class NEWTLauncherGraphUI2pActivity extends NEWTLauncherActivity { + static String demo = "com.jogamp.opengl.test.android.NEWTGraphUI2pActivity"; + static String pkg = "com.jogamp.opengl.test"; + + @Override + public String getUserActivityName() { + return demo; + } + @Override + public String getUserPackageName() { + return pkg; + } +} |