summaryrefslogtreecommitdiffstats
path: root/src/demos
diff options
context:
space:
mode:
Diffstat (limited to 'src/demos')
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java68
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java32
2 files changed, 42 insertions, 58 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java
index 0345515fc..dbbde184f 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java
@@ -55,7 +55,6 @@ import com.jogamp.opengl.GLCapabilities;
import com.jogamp.opengl.GLEventListener;
import com.jogamp.opengl.GLProfile;
import com.jogamp.opengl.demos.es2.GearsES2;
-import com.jogamp.opengl.demos.util.MiscUtils;
import com.jogamp.opengl.math.Recti;
import com.jogamp.opengl.math.Vec3f;
import com.jogamp.opengl.math.geom.AABBox;
@@ -74,61 +73,38 @@ public class UISceneDemo10 {
static final boolean DEBUG = false;
static final boolean TRACE = false;
+ static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT);
+
static private final String defaultMediaPath = "http://archive.org/download/BigBuckBunny_328/BigBuckBunny_512kb.mp4";
static private String filmPath = defaultMediaPath;
public static void main(final String[] args) throws IOException {
- int sceneMSAASamples = 0;
- boolean graphVBAAMode = true;
- boolean graphMSAAMode = false;
-
Font font = null;
- final int width = 1280, height = 720;
-
if( 0 != args.length ) {
- for(int i=0; i<args.length; i++) {
- if(args[i].equals("-gnone")) {
- sceneMSAASamples = 0;
- graphMSAAMode = false;
- graphVBAAMode = false;
- } else if(args[i].equals("-smsaa")) {
- i++;
- sceneMSAASamples = MiscUtils.atoi(args[i], sceneMSAASamples);
- graphMSAAMode = false;
- graphVBAAMode = false;
- } else if(args[i].equals("-gmsaa")) {
- sceneMSAASamples = 0;
- graphMSAAMode = true;
- graphVBAAMode = false;
- } else if(args[i].equals("-gvbaa")) {
- sceneMSAASamples = 0;
- graphMSAAMode = false;
- graphVBAAMode = true;
- } else if(args[i].equals("-font")) {
- i++;
- font = FontFactory.get(new File(args[i]));
- } else if(args[i].equals("-film")) {
- i++;
- filmPath = args[i];
+ final int[] idx = { 0 };
+ for (idx[0] = 0; idx[0] < args.length; ++idx[0]) {
+ if( options.parse(args, idx) ) {
+ continue;
+ } else if(args[idx[0]].equals("-font")) {
+ ++idx[0];
+ font = FontFactory.get(new File(args[idx[0]]));
+ } else if(args[idx[0]].equals("-film")) {
+ ++idx[0];
+ filmPath = args[idx[0]];
}
}
}
- final int renderModes;
- if( graphVBAAMode ) {
- renderModes = Region.VBAA_RENDERING_BIT;
- } else if( graphMSAAMode ) {
- renderModes = Region.MSAA_RENDERING_BIT;
- } else {
- renderModes = 0;
- }
- final GLProfile glp = GLProfile.getGL2ES2();
+ System.err.println(options);
+
+ final GLProfile reqGLP = GLProfile.get(options.glProfileName);
+ System.err.println("GLProfile: "+reqGLP);
- final GLCapabilities caps = new GLCapabilities(glp);
+ final GLCapabilities caps = new GLCapabilities(reqGLP);
caps.setAlphaBits(4);
- if( sceneMSAASamples > 0 ) {
+ if( options.sceneMSAASamples > 0 ) {
caps.setSampleBuffers(true);
- caps.setNumSamples(sceneMSAASamples);
+ caps.setNumSamples(options.sceneMSAASamples);
}
System.out.println("Requested: " + caps);
final GLWindow window = GLWindow.create(caps);
@@ -140,8 +116,8 @@ public class UISceneDemo10 {
font = FontFactory.get(FontFactory.UBUNTU).get(FontSet.FAMILY_LIGHT, FontSet.STYLE_SERIF);
}
System.err.println("Font: "+font.getFullFamilyName());
- final Shape shape = makeShape(window, font, renderModes);
- System.err.println("m0 shape bounds "+shape.getBounds(glp));
+ final Shape shape = makeShape(window, font, options.renderModes);
+ System.err.println("m0 shape bounds "+shape.getBounds(reqGLP));
System.err.println("m0 "+shape);
// Scene for Shape ...
@@ -175,7 +151,7 @@ public class UISceneDemo10 {
} );
scene.addShape(shape);
- window.setSize(width, height);
+ window.setSize(options.surface_width, options.surface_height);
window.setTitle(UISceneDemo10.class.getSimpleName()+": "+window.getSurfaceWidth()+" x "+window.getSurfaceHeight());
window.setVisible(true);
window.addGLEventListener(scene);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java
index 43cd9fc07..3e9c3f4bf 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java
@@ -60,19 +60,21 @@ import com.jogamp.opengl.util.PMVMatrix;
* </p>
*/
public class UISceneDemo11 {
- public static void main(final String[] args) throws IOException {
- final int surface_width = 1280, surface_height = 720;
- final int renderModes = Region.VBAA_RENDERING_BIT;
- final GLProfile glp = GLProfile.getGL2ES2();
+ static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT);
- boolean keepRunning = false;
+ public static void main(final String[] args) throws IOException {
if( 0 != args.length ) {
- for(int i=0; i<args.length; i++) {
- if(args[i].equals("-keep")) {
- keepRunning = true;
+ final int[] idx = { 0 };
+ for (idx[0] = 0; idx[0] < args.length; ++idx[0]) {
+ if( options.parse(args, idx) ) {
+ continue;
}
}
}
+ System.err.println(options);
+
+ final GLProfile reqGLP = GLProfile.get(options.glProfileName);
+ System.err.println("GLProfile: "+reqGLP);
//
// Resolution independent, no screen size
@@ -100,12 +102,16 @@ public class UISceneDemo11 {
final Animator animator = new Animator();
- final GLCapabilities caps = new GLCapabilities(glp);
+ final GLCapabilities caps = new GLCapabilities(reqGLP);
caps.setAlphaBits(4);
+ if( options.sceneMSAASamples > 0 ) {
+ caps.setSampleBuffers(true);
+ caps.setNumSamples(options.sceneMSAASamples);
+ }
System.out.println("Requested: " + caps);
final GLWindow window = GLWindow.create(caps);
- window.setSize(surface_width, surface_height);
+ window.setSize(options.surface_width, options.surface_height);
window.setTitle(UISceneDemo11.class.getSimpleName()+": "+window.getSurfaceWidth()+" x "+window.getSurfaceHeight());
window.setVisible(true);
window.addGLEventListener(scene);
@@ -136,6 +142,7 @@ public class UISceneDemo11 {
System.err.println("SceneBox "+sceneBox);
System.err.println("Group-A0 "+groupA0);
groupA0.forAll( (shape) -> { System.err.println("Shape... "+shape); return false; });
+ groupA0.moveTo(0, sceneBox.getMinY(), 0f); // move shape to min start position
try { Thread.sleep(1000); } catch (final InterruptedException e1) { }
final Shape mobileShape = groupA0;
@@ -168,7 +175,7 @@ public class UISceneDemo11 {
final long t0_us = Clock.currentNanos() / 1000; // [us]
long t1_us = t0_us;
- mobileShape.moveTo(min_obj, 0f, 0f); // move shape to min start position
+ mobileShape.moveTo(min_obj, sceneBox.getMinY(), 0f); // move shape to min start position
while( mobileShape.getPosition().x() < max_obj && window.isNativeValid() ) {
final long t2_us = Clock.currentNanos() / 1000;
final float dt_s = ( t2_us - t1_us ) / 1e6f;
@@ -184,13 +191,14 @@ public class UISceneDemo11 {
return true;
});
}
+ mobileShape.moveTo(max_obj, sceneBox.getMinY(), 0f); // move shape to min start position
final float has_dur_s = ( ( Clock.currentNanos() / 1000 ) - t0_us ) / 1e6f; // [us]
System.err.printf("Actual travel-duration %.3f s, delay %.3f s%n", has_dur_s, has_dur_s-exp_dur_s);
System.err.println("Group-A0 bounds "+groupA0);
groupA0.forAll( (shape) -> { System.err.println("Shape... "+shape); return false; });
try { Thread.sleep(1000); } catch (final InterruptedException e1) { }
}
- if( !keepRunning ) {
+ if( !options.stayOpen ) {
window.destroy();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 08:57:42 +0000