eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-29 03:11:08 +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
2015-05-15 14:24:33 -04:00
parent 761bd8bf4a 4ecb56e952
commit 79ba41cede
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/processing/opengl/PSurfaceJOGL.java
View File

@@ -190,7 +190,10 @@ public class PSurfaceJOGL implements PSurface {
fullScreen = true;
}
// if (fullScreen || spanDisplays) {
if (fullScreen) {
presentMode = sketchWidth < screenRect.width && sketchHeight < screenRect.height;
}
if (spanDisplays) {
sketchWidth = screenRect.width;
sketchHeight = screenRect.height;
@@ -198,6 +201,10 @@ public class PSurfaceJOGL implements PSurface {
// window..setBackground(new Color(backgroundColor, true));
window.setSize(sketchWidth, sketchHeight);
sketch.width = sketch.sketchWidth();
sketch.height = sketch.sketchHeight();
graphics.setSize(sketch.width, sketch.height);
System.out.println("deviceIndex: " + deviceIndex);
System.out.println(displayDevice);
@@ -206,6 +213,7 @@ public class PSurfaceJOGL implements PSurface {
// This example could be useful:
// com.jogamp.opengl.test.junit.newt.mm.TestScreenMode01cNEWT
if (fullScreen) {
window.setPosition(sketchX, sketchY);
PApplet.hideMenuBar();
if (spanDisplays) {
window.setFullscreen(monitors);
@@ -238,6 +246,8 @@ public class PSurfaceJOGL implements PSurface {
DrawListener drawlistener = new DrawListener();
window.addGLEventListener(drawlistener);
System.err.println("1. create animator");
animator = new FPSAnimator(window, 60);
drawException = null;
@@ -402,7 +412,7 @@ public class PSurfaceJOGL implements PSurface {
float offsetX;
float offsetY;
public void placePresent(int stopColor) {
if (sketchWidth < screenRect.width || sketchHeight < screenRect.height) {
if (presentMode) {
System.err.println("Present mode");
// System.err.println("WILL USE FBO");
presentMode = pgl.presentMode = true;
@@ -460,13 +470,18 @@ public class PSurfaceJOGL implements PSurface {
}
public void setSize(int width, int height) {
// if (frame != null) {
System.err.println("3. set size");
if (animator.isAnimating()) {
System.err.println("3. set size");
sketchWidth = sketch.width = width;
sketchHeight = sketch.height = height;
graphics.setSize(width, height);
// }
if (!presentMode) {
sketch.width = width;
sketch.height = height;
graphics.setSize(width, height);
}
sketchWidth = width;
sketchHeight = height;
}
}
public Component getComponent() {
@@ -683,7 +698,8 @@ public class PSurfaceJOGL implements PSurface {
if (presentMode) {
if (20 < nativeEvent.getX() && nativeEvent.getX() < 20 + 100 &&
if (peAction == KeyEvent.RELEASE &&
20 < nativeEvent.getX() && nativeEvent.getX() < 20 + 100 &&
screenRect.height - 70 < nativeEvent.getY() && nativeEvent.getY() < screenRect.height - 20) {
System.err.println("clicked on exit button");
// if (externalMessages) {