diff options
Diffstat (limited to 'src')
4 files changed, 2 insertions, 23 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java index 33e04d05b..e7e393e18 100644 --- a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java +++ b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java @@ -32,7 +32,6 @@ import java.io.File; import java.io.IOException; import java.net.URISyntaxException; -import com.jogamp.opengl.GL; import com.jogamp.opengl.GL2ES2; import com.jogamp.opengl.GLAnimatorControl; import com.jogamp.opengl.GLAutoDrawable; diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java index 9e61e8661..26c31ae24 100644 --- a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java +++ b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java @@ -64,11 +64,9 @@ import com.jogamp.opengl.demos.es2.TextureSequenceES2; import com.jogamp.opengl.demos.graph.TextRendererGLELBase; import com.jogamp.opengl.demos.util.MiscUtils; import com.jogamp.opengl.util.Animator; -import com.jogamp.opengl.util.GLArrayDataServer; import com.jogamp.opengl.util.GLReadBufferUtil; import com.jogamp.opengl.util.av.GLMediaPlayer; import com.jogamp.opengl.util.av.GLMediaPlayer.GLMediaEventListener; -import com.jogamp.opengl.util.av.GLMediaPlayer.StreamException; import com.jogamp.opengl.util.av.GLMediaPlayerFactory; import com.jogamp.opengl.util.texture.TextureSequence.TextureFrame; @@ -86,12 +84,10 @@ public class MovieSimple implements GLEventListener { private static boolean waitForKey = false; private int surfWidth, surfHeight; private int prevMouseX; // , prevMouseY; - private final int rotate = 0; private boolean orthoProjection = true; private float zoom0; private float zoom1; private float zoom; - private long startTime; private int effects = EFFECT_NORMAL; private float alpha = 1.0f; private int swapInterval = 1; @@ -100,9 +96,6 @@ public class MovieSimple implements GLEventListener { private TextureSequenceES2 screen=null; private GLMediaPlayer mPlayer; private final boolean mPlayerShared; - private boolean mPlayerScaleOrig; - private final float[] verts = null; - private GLArrayDataServer interleavedVBO; private volatile boolean resetGLState = false; private volatile GLAutoDrawable autoDrawable = null; @@ -405,7 +398,6 @@ public class MovieSimple implements GLEventListener { public MovieSimple(final GLMediaPlayer sharedMediaPlayer) throws IllegalStateException { screenshot = new GLReadBufferUtil(false, false); mPlayer = sharedMediaPlayer; - mPlayerScaleOrig = false; mPlayerShared = null != mPlayer; if( !mPlayerShared ) { mPlayer = GLMediaPlayerFactory.createDefault(); @@ -423,10 +415,6 @@ public class MovieSimple implements GLEventListener { public GLMediaPlayer getGLMediaPlayer() { return mPlayer; } - public void setScaleOrig(final boolean v) { - mPlayerScaleOrig = v; - } - /** defaults to true */ public void setOrthoProjection(final boolean v) { orthoProjection=v; } public boolean getOrthoProjection() { return orthoProjection; } @@ -477,8 +465,6 @@ public class MovieSimple implements GLEventListener { } screen.init(drawable); - startTime = System.currentTimeMillis(); - final Object upstreamWidget = drawable.getUpstreamWidget(); if (upstreamWidget instanceof Window) { final Window window = (Window) upstreamWidget; @@ -681,7 +667,6 @@ public class MovieSimple implements GLEventListener { int height = 600; int textureCount = 3; // default - threaded boolean ortho = true; - boolean zoom = false; boolean forceES2 = false; boolean forceES3 = false; @@ -736,8 +721,6 @@ public class MovieSimple implements GLEventListener { swapInterval = MiscUtils.atoi(args[i], swapInterval); } else if(args[i].equals("-projection")) { ortho=false; - } else if(args[i].equals("-zoom")) { - zoom=true; } else if(args[i].equals("-loop")) { loopEOS=true; } else if(args[i].equals("-urlN")) { @@ -812,7 +795,6 @@ public class MovieSimple implements GLEventListener { }); mss[i] = new MovieSimple(null); mss[i].setSwapInterval(swapInterval); - mss[i].setScaleOrig(!zoom); mss[i].setOrthoProjection(ortho); mss[i].mPlayer.attachObject(WINDOW_KEY, windows[i]); mss[i].mPlayer.addEventListener(myGLMediaEventListener); diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java b/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java index f23548b8a..22e3664c1 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java @@ -318,16 +318,14 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB if( drawFPS ) { pmv.glPushMatrix(); final float pixelSizeFPS = FontScale.toPixels(fontSizeFPS, dpiV); - final float lfps, tfps, td; + final float lfps, tfps; final GLAnimatorControl animator = drawable.getAnimator(); if( null != animator ) { lfps = animator.getLastFPS(); tfps = animator.getTotalFPS(); - td = animator.getTotalFPSDuration()/1000f; } else { lfps = 0f; tfps = 0f; - td = 0f; } final String modeS = Region.getRenderModeString(regionFPS.getRenderModes()); final String text = String.format("%03.1f/%03.1f fps, v-sync %d, dpiV %.2f %.2f px/mm, font[head %.1fpt %.2fpx %.2fmm, center %.1fpt %.2fpx %.2fmm], %s-samples[%d, this %d], blend %b, alpha %d", 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 61f5a37ac..76615b2c7 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java @@ -121,7 +121,7 @@ public class UIShapeDemo01 implements GLEventListener { window.setVisible(true); final Animator animator = new Animator(); - // animator.setUpdateFPSFrames(60, System.err); + animator.setUpdateFPSFrames(5*60, null); animator.add(window); window.addKeyListener(new KeyAdapter() { |