From 99d205d0c5f047ef9a6a6e21f351abe415ed3b15 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 28 Oct 2010 01:24:58 +0200 Subject: Animator Fix/Cleanup - Fix AnimatorBase: Finally using 'com.jogamp.opengl.util.AWTAnimatorImpl', wrong FQN lead to never use it, hence deadlock in case of AWT usage (AWT-EDT). - Animator - remove volatile for synced state isAnimated - new state isPaused, since shouldPause give the wrong answer for isPaused() - Cleanup wait condition for lifecycle tasks (start/stop/pause/resume) - 'AnimatorImpl' -> 'DefaultAnimatorImpl implements AnimatorBase.AnimatorImpl' - 'AWTAnimatorImpl implements AnimatorBase.AnimatorImpl', hence no derivation of a complete overwritten AnimatorImpl needed. - GLWindow.destroyActionPreLock() - Stop animator if unrecoverable, else pause only. Tests: - No explicit animator stop, hence tests implicit stop/pause by GLDrawableHelper and/or GLWindow. --- src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java') diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java index e8df40b13..5b1858c41 100644 --- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java +++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java @@ -320,11 +320,9 @@ public class GLDrawableHelper { if(null==initAction) { // disposal case - if(!context.isCreated()) { throw new GLException("Dispose case (no init action given): Native context must be created: "+context); } - GLAnimatorControl animCtrl = getAnimator(); if(null!=animCtrl && animCtrl.isAnimating()) { animCtrl.pause(); -- cgit v1.2.3