eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 18:10:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2014-02-06 22:02:36 -05:00
parent 62a85815f6 9e732cb922
commit 719565eb30
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/processing/opengl/PJOGL.java
View File

@@ -151,13 +151,13 @@ public class PJOGL extends PGL {
protected GLCanvas canvasAWT;
/** The shared AWT-OpenGL canvas */
protected static GLCanvas sharedCanvasAWT;
// protected static GLCanvas sharedCanvasAWT;
/** The NEWT window */
protected GLWindow windowNEWT;
/** The shared NEWT window */
protected static GLWindow sharedWindowNEWT;
// protected static GLWindow sharedWindowNEWT;
/** The NEWT-OpenGL canvas */
protected NewtCanvasAWT canvasNEWT;
@@ -281,12 +281,12 @@ public class PJOGL extends PGL {
if (canvasAWT != null || canvasNEWT != null) {
// Restarting...
if (canvasAWT != null) {
sharedCanvasAWT = null;
// sharedCanvasAWT = null;
canvasAWT.removeGLEventListener(listener);
pg.parent.removeListeners(canvasAWT);
pg.parent.remove(canvasAWT);
} else if (canvasNEWT != null) {
sharedWindowNEWT = null;
// sharedWindowNEWT = null;
windowNEWT.removeGLEventListener(listener);
pg.parent.remove(canvasNEWT);
}
@@ -334,11 +334,11 @@ public class PJOGL extends PGL {
if (WINDOW_TOOLKIT == AWT) {
canvasAWT = new GLCanvas(caps);
if (sharedCanvasAWT == null) {
sharedCanvasAWT = canvasAWT;
} else {
canvasAWT.setSharedAutoDrawable(sharedCanvasAWT);
}
// if (sharedCanvasAWT == null) {
// sharedCanvasAWT = canvasAWT;
// } else {
// canvasAWT.setSharedAutoDrawable(sharedCanvasAWT);
// }
canvasAWT.setBounds(0, 0, pg.width, pg.height);
canvasAWT.setBackground(new Color(pg.backgroundColor, true));
canvasAWT.setFocusable(true);
@@ -351,11 +351,11 @@ public class PJOGL extends PGL {
canvasNEWT = null;
} else if (WINDOW_TOOLKIT == NEWT) {
windowNEWT = GLWindow.create(caps);
if (sharedWindowNEWT == null) {
sharedWindowNEWT = windowNEWT;
} else {
windowNEWT.setSharedAutoDrawable(sharedWindowNEWT);
}
// if (sharedWindowNEWT == null) {
// sharedWindowNEWT = windowNEWT;
// } else {
// windowNEWT.setSharedAutoDrawable(sharedWindowNEWT);
// }
canvasNEWT = new NewtCanvasAWT(windowNEWT);
canvasNEWT.setBounds(0, 0, pg.width, pg.height);
canvasNEWT.setBackground(new Color(pg.backgroundColor, true));