sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated JOGL canvas classes to fix shutdown bug. Also added frame rate

Browse Source 
support.
This commit is contained in:
unknown 2014-09-19 13:24:01 -04:00
parent 24984048e6
commit 0644c286ef
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jme3-jogl/src/main/java/com/jme3/system/jogl/JoglCanvas.java
View File

@ -65,6 +65,7 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext
public void destroy(boolean waitFor){ public void destroy(boolean waitFor){
if (waitFor) if (waitFor)
waitFor(false); waitFor(false);
animator.stop();
} }
@Override @Override
@ -89,6 +90,12 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext
listener.initialize(); listener.initialize();
} }
@Override
protected void startGLCanvas() {
frameRate = settings.getFrameRate();
super.startGLCanvas();
}
public void display(GLAutoDrawable glad) { public void display(GLAutoDrawable glad) {
if (!created.get() && renderer != null){ if (!created.get() && renderer != null){
listener.destroy(); listener.destroy();

9
jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtCanvas.java
View File

@ -48,7 +48,7 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas
super(); super();
initGLCanvas(); initGLCanvas();
} }
@Override @Override
protected final void initGLCanvas() { protected final void initGLCanvas() {
super.initGLCanvas(); super.initGLCanvas();
@ -85,6 +85,7 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas
public void destroy(boolean waitFor){ public void destroy(boolean waitFor){
if (waitFor) if (waitFor)
waitFor(false); waitFor(false);
animator.stop();
} }
@Override @Override
@ -109,6 +110,12 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas
listener.initialize(); listener.initialize();
} }
@Override
protected void startGLCanvas() {
frameRate = settings.getFrameRate();
super.startGLCanvas();
}
public void display(GLAutoDrawable glad) { public void display(GLAutoDrawable glad) {
if (!created.get() && renderer != null){ if (!created.get() && renderer != null){
listener.destroy(); listener.destroy();