From 2cfc59f99b47c0a77fbc59e27d78e2580a87034f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 11 Apr 2012 19:47:31 +0200 Subject: Refine API doc --- src/jogl/classes/javax/media/opengl/GLAutoDrawable.java | 8 ++++---- src/jogl/classes/javax/media/opengl/GLRunnable.java | 14 ++++++++------ .../opengl/android/av/AndroidGLMediaPlayerAPI14.java | 1 - 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java index c427a9804..f0101a90c 100644 --- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java +++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java @@ -181,15 +181,15 @@ public interface GLAutoDrawable extends GLDrawable { /** *

- * Enqueues a one-shot {@link javax.media.opengl.GLRunnable}, + * Enqueues a one-shot {@link javax.media.opengl.GLRunnable GLRunnable}, * which will be executed with the next {@link #display()} call.

*

- * If no {@link javax.media.opengl.GLAnimatorControl} is registered, or if it is not animating, the default situation,
+ * If no {@link javax.media.opengl.GLAnimatorControl GLAnimatorControl} is animating (default),
* or if the current thread is the animator thread,
* a {@link #display()} call is issued after enqueue the GLRunnable.
* No extra synchronization is performed in case wait is true, since it is executed in the current thread.

*

- * If {@link javax.media.opengl.GLAnimatorControl} is registered and is animating,
+ * If an {@link javax.media.opengl.GLAnimatorControl GLAnimatorControl} is animating,
* no {@link #display()} call is issued, since the animator thread performs it.
* If wait is true, the implementation waits until the GLRunnable is executed.
*


@@ -217,7 +217,7 @@ public interface GLAutoDrawable extends GLDrawable { *

*

diff --git a/src/jogl/classes/javax/media/opengl/GLRunnable.java b/src/jogl/classes/javax/media/opengl/GLRunnable.java index cbd086c77..141d07c19 100644 --- a/src/jogl/classes/javax/media/opengl/GLRunnable.java +++ b/src/jogl/classes/javax/media/opengl/GLRunnable.java @@ -39,12 +39,14 @@ package javax.media.opengl; */ public interface GLRunnable { /** - * Called by the drawable to initiate one-shot OpenGL commands by the - * client, like {@link GLEventListener#display(GLAutoDrawable)}. - * - * @param drawable the associated drawable the implementation shall use - * @return false if impl invalidates the back buffers, hence {@link GLAutoDrawable#display()} will - * issue another {@link GLEventListener#display(GLAutoDrawable)} call. Otherwise true. + * Initiate one-shot OpenGL commands with a valid current context, + * processed by {@link GLAutoDrawable#display()}, enqueued by + * {@link GLAutoDrawable#invoke(boolean, GLRunnable)}. + * + * @param drawable the associated drawable and current context for this call + * @return true if the GL [back] framebuffer remain intact by this runnable, otherwise false. + * If returning false and hence the impl signals an invalidated back buffer, + * another {@link GLEventListener#display(GLAutoDrawable)} call will be issued. */ boolean run(GLAutoDrawable drawable); } diff --git a/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java b/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java index a50f1507f..1239db742 100644 --- a/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java +++ b/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java @@ -228,7 +228,6 @@ public class AndroidGLMediaPlayerAPI14 extends GLMediaPlayerImpl { @Override protected TextureSequence.TextureFrame createTexImage(GL gl, int idx, int[] tex) { lastTexFrame = new TextureSequence.TextureFrame( createTexImageImpl(gl, idx, tex, true) ); - // lastTexFrame = super.createTexImage(gl, idx, tex); return lastTexFrame; } -- cgit v1.2.3