diff options
author | Sven Gothel <[email protected]> | 2023-08-13 02:38:21 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-08-13 02:38:21 +0200 |
commit | 52b745ed2196d3e00102e8fccace25f41386a016 (patch) | |
tree | d03045b5da9c7b422711645dc1d38fa580de618e /src/demos | |
parent | c25a2900e52505ff894701928227d5bcd70b72d3 (diff) |
Animator*: Add ctor variants passing modeBits directly, i.e. enable/disable AWT rendering thread support. Adopt it in tests and demos
Diffstat (limited to 'src/demos')
26 files changed, 32 insertions, 29 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/Launcher0.java b/src/demos/com/jogamp/opengl/demos/Launcher0.java index d9d66d434..2eff980ca 100644 --- a/src/demos/com/jogamp/opengl/demos/Launcher0.java +++ b/src/demos/com/jogamp/opengl/demos/Launcher0.java @@ -203,8 +203,11 @@ public class Launcher0 { if(waitForKey) { glWindow.addGLEventListener(new GLEventListener() { + @Override public void init(final GLAutoDrawable drawable) { } + @Override public void dispose(final GLAutoDrawable drawable) { } + @Override public void display(final GLAutoDrawable drawable) { final GLAnimatorControl actrl = drawable.getAnimator(); if(waitForKey && actrl.getTotalFPSFrames() == 60*3) { @@ -213,22 +216,24 @@ public class Launcher0 { waitForKey = false; } } + @Override public void reshape(final GLAutoDrawable drawable, final int x, final int y, final int width, final int height) { } }); } - final Animator animator = useAnimator ? new Animator() : null; + final Animator animator = useAnimator ? new Animator(0 /* w/o AWT */) : null; if( useAnimator ) { - animator.setModeBits(false, AnimatorBase.MODE_EXPECT_AWT_RENDERING_THREAD); animator.setExclusiveContext(exclusiveContext); } glWindow.addWindowListener(new WindowAdapter() { + @Override public void windowResized(final WindowEvent e) { System.err.println("window resized: "+glWindow.getBounds()+" "+glWindow.getSurfaceWidth()+"x"+glWindow.getSurfaceHeight()); NEWTDemoListener.setTitle(glWindow); } + @Override public void windowMoved(final WindowEvent e) { System.err.println("window moved: "+glWindow.getBounds()+" "+glWindow.getSurfaceWidth()+"x"+glWindow.getSurfaceHeight()); NEWTDemoListener.setTitle(glWindow); diff --git a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java index cdaf39f2b..e9572d6ff 100644 --- a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java +++ b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java @@ -87,7 +87,7 @@ public class MovieCubeActivity0a extends NewtBaseActivity { scrn.addReference(); try { - final Animator anim = new Animator(); + final Animator anim = new Animator(0 /* w/o AWT */); // Main final GLWindow glWindowMain = GLWindow.create(scrn, capsMain); diff --git a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java index 1b4696180..06ae92bc4 100644 --- a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java +++ b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java @@ -89,7 +89,7 @@ public class MovieCubeActivity0b extends NewtBaseActivity { scrn.addReference(); try { - final Animator anim = new Animator(); + final Animator anim = new Animator(0 /* w/o AWT */); // Main final GLWindow glWindowMain = GLWindow.create(scrn, capsMain); diff --git a/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java b/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java index c80afab89..6316e1bba 100644 --- a/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java +++ b/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java @@ -87,7 +87,7 @@ public class MovieSimpleActivity0 extends NewtBaseActivity { final com.jogamp.newt.Screen scrn = NewtFactory.createScreen(dpy, 0); scrn.addReference(); - final Animator anim = new Animator(); + final Animator anim = new Animator(0 /* w/o AWT */); // Main final GLWindow glWindowMain = GLWindow.create(scrn, capsMain); diff --git a/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity1.java b/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity1.java index 287f8b3de..23bbf6971 100644 --- a/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity1.java +++ b/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity1.java @@ -113,7 +113,7 @@ public class MovieSimpleActivity1 extends NewtBaseActivity { final com.jogamp.newt.Screen scrn = NewtFactory.createScreen(dpy, 0); scrn.addReference(); - final Animator anim = new Animator(); + final Animator anim = new Animator(0 /* w/o AWT */); // Main final GLWindow glWindowMain = GLWindow.create(scrn, capsMain); diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java index 2bbb9de05..d170d204f 100644 --- a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java +++ b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java @@ -788,7 +788,7 @@ public class MovieSimple implements GLEventListener { final MovieSimple[] mss = new MovieSimple[windowCount]; final GLWindow[] windows = new GLWindow[windowCount]; for(int i=0; i<windowCount; i++) { - final Animator anim = new Animator(); + final Animator anim = new Animator(0 /* w/o AWT */); anim.start(); windows[i] = GLWindow.create(caps); windows[i].addWindowListener(new WindowAdapter() { diff --git a/src/demos/com/jogamp/opengl/demos/av/StereoDemo01.java b/src/demos/com/jogamp/opengl/demos/av/StereoDemo01.java index 139c9f140..1097b37d8 100644 --- a/src/demos/com/jogamp/opengl/demos/av/StereoDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/av/StereoDemo01.java @@ -271,9 +271,8 @@ public class StereoDemo01 { window.setAutoSwapBufferMode(useAutoSwap); window.setUndecorated(true); - final Animator animator = useAnimator ? new Animator() : null; + final Animator animator = useAnimator ? new Animator(0 /* w/o AWT */) : null; if( useAnimator ) { - animator.setModeBits(false, AnimatorBase.MODE_EXPECT_AWT_RENDERING_THREAD); animator.setExclusiveContext(exclusiveContext); } diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURegionNewtDemo.java b/src/demos/com/jogamp/opengl/demos/graph/GPURegionNewtDemo.java index 5e2ac39ca..070371713 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURegionNewtDemo.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURegionNewtDemo.java @@ -135,7 +135,7 @@ public class GPURegionNewtDemo { window.setVisible(true); //FPSAnimator animator = new FPSAnimator(60); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(60, System.err); animator.add(window); diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java b/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java index 5952326c8..06f39d8ba 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java @@ -162,7 +162,7 @@ public class GPUTextNewtDemo { } // FPSAnimator animator = new FPSAnimator(60); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(60, null); animator.add(window); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java index a8d82fcc4..c927b8639 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java @@ -119,7 +119,7 @@ public class FontView01 { } System.out.println("Requested: " + caps); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(1*60, null); // System.err); final GLWindow window = GLWindow.create(caps); window.setSize(options.surface_width, options.surface_height); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java index 6acb50af7..905bb7d15 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java @@ -118,7 +118,7 @@ public class UILayoutBox01 { final GLProfile reqGLP = GLProfile.get(options.glProfileName); System.err.println("GLProfile: "+reqGLP); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); final GLCapabilities caps = new GLCapabilities(reqGLP); caps.setAlphaBits(4); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java index 2bd9c0dfb..32cf213c6 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java @@ -118,7 +118,7 @@ public class UILayoutGrid01 { final GLProfile reqGLP = GLProfile.get(options.glProfileName); System.err.println("GLProfile: "+reqGLP); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); final GLCapabilities caps = new GLCapabilities(reqGLP); caps.setAlphaBits(4); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java index 9c8177699..ad038cada 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java @@ -84,7 +84,7 @@ public class UISceneDemo00 { scene.setClearParams(new float[] { 1f, 1f, 1f, 1f}, GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); scene.addShape(shape); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); final GLCapabilities caps = new GLCapabilities(reqGLP); caps.setAlphaBits(4); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java index 1bebb8e40..64c677d48 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java @@ -93,7 +93,7 @@ public class UISceneDemo01 { scene.setPMVMatrixSetup(new MyPMVMatrixSetup()); scene.addShape(shape); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); final GLCapabilities caps = new GLCapabilities(reqGLP); caps.setAlphaBits(4); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java index c9ae88a8d..59e4ca4c3 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java @@ -101,7 +101,7 @@ public class UISceneDemo01b { scene.setPMVMatrixSetup(new MyPMVMatrixSetup()); scene.addShape(shape); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); final GLCapabilities caps = new GLCapabilities(reqGLP); caps.setAlphaBits(4); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java index 7e74f1db5..51d8f38a1 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java @@ -105,7 +105,7 @@ public class UISceneDemo02 { scene.addShape(destText); scene.addShape(movingGlyph); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(1*60, null); // System.err); final GLCapabilities caps = new GLCapabilities(reqGLP); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java index 0c00508d8..61cd4fc76 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java @@ -136,7 +136,7 @@ public class UISceneDemo03 { // scene.setFrustumCullingEnabled(true); glyphGroup.setFrustumCullingEnabled(true); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(1 * 60, null); // System.err); final GLCapabilities caps = new GLCapabilities(reqGLP); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java index 805d9dafc..4a9f447b7 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java @@ -145,7 +145,7 @@ public class UISceneDemo03b { scene.setFrustumCullingEnabled(true); glyphGroup.setFrustumCullingEnabled(true); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(1 * 60, null); // System.err); final GLCapabilities caps = new GLCapabilities(reqGLP); 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 30babc583..12cb2cb1a 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java @@ -158,7 +158,7 @@ public class UISceneDemo10 { window.addGLEventListener(scene); scene.attachInputListenerTo(window); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(5*60, null); animator.add(window); 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 6c20247c2..6a6cfe4cb 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java @@ -101,7 +101,7 @@ public class UISceneDemo11 { scene.addShape(groupA0); scene.setFrustumCullingEnabled(true); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); final GLCapabilities caps = new GLCapabilities(reqGLP); caps.setAlphaBits(4); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java index 436bab31a..f95ec6494 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java @@ -175,7 +175,7 @@ public class UISceneDemo20 implements GLEventListener { final UISceneDemo20 scene = new UISceneDemo20(fontfilename, filmURL, options.renderModes, DEBUG, TRACE); window.addGLEventListener(scene); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(5*60, null); animator.add(window); @@ -722,7 +722,6 @@ public class UISceneDemo20 implements GLEventListener { button.addMouseListener(dragZoomRotateListener); final ALAudioSink[] alAudioSink = { null }; - final com.jogamp.openal.sound3d.Listener audioListener = new com.jogamp.openal.sound3d.Listener(); button.addMouseListener(new Shape.MouseGestureAdapter() { @Override diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java index c3d12c8d3..19db00cbe 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java @@ -141,7 +141,7 @@ public class UISceneDemoU01a { font = FontFactory.get(FontFactory.UBUNTU).get(FontSet.FAMILY_LIGHT, FontSet.STYLE_SERIF); System.err.println("Font: "+font.getFullFamilyName()); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); final GLCapabilities caps = new GLCapabilities(reqGLP); caps.setAlphaBits(4); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java index 28dfe1068..7d39003dd 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java @@ -119,7 +119,7 @@ public class UIShapeDemo01 implements GLEventListener { window.addGLEventListener(uiGLListener); window.setVisible(true); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); animator.setUpdateFPSFrames(5*60, null); animator.add(window); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java index e26b1dbaa..b1b3825f8 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java @@ -132,7 +132,7 @@ public class UITypeDemo01 implements GLEventListener { window.addGLEventListener(uiGLListener); window.setVisible(true); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); // animator.setUpdateFPSFrames(60, System.err); animator.add(window); diff --git a/src/demos/com/jogamp/opengl/demos/ios/Hello.java b/src/demos/com/jogamp/opengl/demos/ios/Hello.java index 5750c7b90..f7463140a 100644 --- a/src/demos/com/jogamp/opengl/demos/ios/Hello.java +++ b/src/demos/com/jogamp/opengl/demos/ios/Hello.java @@ -209,7 +209,7 @@ public class Hello { ", isCAEAGLLayer "+IOSUtil.isCAEAGLLayer(caeaglLayer)); } - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); // animator.setExclusiveContext(exclusiveContext); animator.setUpdateFPSFrames(60, System.err); animator.add(glWindow); diff --git a/src/demos/com/jogamp/opengl/demos/ios/Hello1.java b/src/demos/com/jogamp/opengl/demos/ios/Hello1.java index 5dc7b14a2..6d1e9899a 100644 --- a/src/demos/com/jogamp/opengl/demos/ios/Hello1.java +++ b/src/demos/com/jogamp/opengl/demos/ios/Hello1.java @@ -202,7 +202,7 @@ public class Hello1 { System.out.println("Choosen demo "+demo.getClass().getName()); glad.addGLEventListener(demo); - final Animator animator = new Animator(); + final Animator animator = new Animator(0 /* w/o AWT */); // animator.setExclusiveContext(exclusiveContext); animator.setUpdateFPSFrames(60, System.err); animator.add(glad); |