diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglCanvas.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglCanvas.java index 1e9b0db25..a4646b44f 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglCanvas.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglCanvas.java @@ -65,6 +65,8 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext public void destroy(boolean waitFor){ if (waitFor) waitFor(false); + if (animator.isAnimating()) + animator.stop(); } @Override @@ -89,6 +91,12 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext listener.initialize(); } + @Override + protected void startGLCanvas() { + frameRate = settings.getFrameRate(); + super.startGLCanvas(); + } + public void display(GLAutoDrawable glad) { if (!created.get() && renderer != null){ listener.destroy(); @@ -115,7 +123,7 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext animator.stop(); wasAnimating = false; } - + listener.update(); renderer.onFrame(); @@ -126,7 +134,7 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext } @Override - public void dispose(GLAutoDrawable arg0) { + public void dispose(GLAutoDrawable arg0) { } } diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtCanvas.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtCanvas.java index 6b6824938..cb84c94a9 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtCanvas.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtCanvas.java @@ -48,7 +48,7 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas super(); initGLCanvas(); } - + @Override protected final void initGLCanvas() { super.initGLCanvas(); @@ -85,6 +85,8 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas public void destroy(boolean waitFor){ if (waitFor) waitFor(false); + if (animator.isAnimating()) + animator.stop(); } @Override @@ -109,6 +111,12 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas listener.initialize(); } + @Override + protected void startGLCanvas() { + frameRate = settings.getFrameRate(); + super.startGLCanvas(); + } + public void display(GLAutoDrawable glad) { if (!created.get() && renderer != null){ listener.destroy();