eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Manindra Moharana
2015-09-07 20:54:02 -07:00
parent 074b306d4a cdffca3e5c
commit e227a77dcd
4 changed files with 109 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PGL.java
+57 -30
View File
@@ -1,9 +1,12 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Processing project - http://processing.org
Processing OpenGL (c) 2011-2015 Andres Colubri
Copyright (c) 2011-13 Ben Fry and Casey Reas
Part of the Processing project - http://processing.org
Copyright (c) 2001-04 Massachusetts Institute of Technology
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2012-15 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -252,6 +255,13 @@ public abstract class PGL {
protected FloatBuffer depthBuffer;
protected ByteBuffer stencilBuffer;
//........................................................
// Rendering information
/** Used to register amount of geometry rendered in each frame. */
protected int geomCount = 0;
protected int pgeomCount;
// ........................................................
@@ -652,14 +662,18 @@ public abstract class PGL {
// Frame rendering
protected void beginDraw(boolean pclear) {
protected void beginRender(boolean pclearColor) {
pgeomCount = geomCount;
geomCount = 0;
if (requestedFBOLayer) {
if (requestedFBOLayerReset) {
destroyFBOLayer();
requestedFBOLayerReset = false;
}
if (!fboLayerCreated) createFBOLayer();
if (!fboLayerCreated) createFBOLayer(pclearColor);
// Draw to the back texture
bindFramebufferImpl(FRAMEBUFFER, glColorFbo.get(0));
framebufferTexture2D(FRAMEBUFFER, COLOR_ATTACHMENT0,
TEXTURE_2D, glColorTex.get(backTex), 0);
@@ -677,7 +691,7 @@ public abstract class PGL {
float b = ((argb) & 0xff) / 255.0f;
clearColor(r, g, b, a);
clear(COLOR_BUFFER_BIT);
} else if (!pclear) {
} else if (!pclearColor) {
// Render previous back texture (now is the front) as background,
// because no background() is being used ("incremental drawing")
int x = 0;
@@ -702,7 +716,7 @@ public abstract class PGL {
}
protected void endDraw(boolean clear, int windowColor) {
protected void endRender(boolean pclearColor, int windowColor) {
if (fboLayerInUse) {
syncBackTexture();
@@ -761,7 +775,7 @@ public abstract class PGL {
int temp = frontTex;
frontTex = backTex;
backTex = temp;
} else if (!clear && 0 < pg.parent.frameCount || !pg.parent.isLooping()) {
} else if (!pclearColor && 0 < pg.parent.frameCount || !pg.parent.isLooping()) {
requestFBOLayer();
}
}
@@ -798,7 +812,7 @@ public abstract class PGL {
protected void endGL() { }
private void createFBOLayer() {
private void createFBOLayer(boolean pclearColor) {
float scale = pg.getPixelScale();
if (hasNpotTexSupport()) {
@@ -883,36 +897,37 @@ public abstract class PGL {
if (0 < pg.parent.frameCount) {
// Copy the contents of the front and back screen buffers to the textures
// of the FBO, so they are properly initialized.
if (pg.parent.isLooping()) {
bindFramebufferImpl(READ_FRAMEBUFFER, FRONT);
// of the FBO, so they are properly initialized. Note that the front buffer
// of the default framebuffer (the screen) contains the previous frame:
// https://www.opengl.org/wiki/Default_Framebuffer
// so it is copied to the front texture of the FBO layer:
if (pclearColor || 0 < pgeomCount || !pg.parent.isLooping()) {
readBuffer(FRONT);
} else {
bindFramebufferImpl(READ_FRAMEBUFFER, BACK);
// ...except when the previous frame has not been cleared and nothing was
// renderered while looping. In this case the back buffer, which holds the
// initial state of the previous frame, still contains the most up-to-date
// screen state.
readBuffer(BACK);
}
bindFramebufferImpl(DRAW_FRAMEBUFFER, glColorFbo.get(0));
framebufferTexture2D(FRAMEBUFFER, COLOR_ATTACHMENT0,
TEXTURE_2D, glColorTex.get(backTex), 0);
drawBuffer(COLOR_ATTACHMENT0);
blitFramebuffer(0, 0, fboWidth, fboHeight,
0, 0, fboWidth, fboHeight,
COLOR_BUFFER_BIT, NEAREST);
if (pg.parent.isLooping()) {
bindFramebufferImpl(READ_FRAMEBUFFER, BACK);
readBuffer(BACK);
} else {
bindFramebufferImpl(READ_FRAMEBUFFER, FRONT);
readBuffer(FRONT);
}
bindFramebufferImpl(DRAW_FRAMEBUFFER, glColorFbo.get(0));
framebufferTexture2D(FRAMEBUFFER, COLOR_ATTACHMENT0,
TEXTURE_2D, glColorTex.get(frontTex), 0);
drawBuffer(COLOR_ATTACHMENT0);
blitFramebuffer(0, 0, fboWidth, fboHeight,
0, 0, fboWidth, fboHeight,
COLOR_BUFFER_BIT, NEAREST);
readBuffer(BACK);
bindFramebufferImpl(DRAW_FRAMEBUFFER, glColorFbo.get(0));
framebufferTexture2D(FRAMEBUFFER, COLOR_ATTACHMENT0,
TEXTURE_2D, glColorTex.get(backTex), 0);
drawBuffer(COLOR_ATTACHMENT0);
blitFramebuffer(0, 0, fboWidth, fboHeight,
0, 0, fboWidth, fboHeight,
COLOR_BUFFER_BIT, NEAREST);
bindFramebufferImpl(FRAMEBUFFER, 0);
}
fboLayerCreated = true;
@@ -2941,8 +2956,20 @@ public abstract class PGL {
public abstract void vertexAttribPointer(int index, int size, int type, boolean normalized, int stride, int offset);
public abstract void enableVertexAttribArray(int index);
public abstract void disableVertexAttribArray(int index);
public abstract void drawArrays(int mode, int first, int count);
public abstract void drawElements(int mode, int count, int type, int offset);
public void drawArrays(int mode, int first, int count) {
geomCount += count;
drawArraysImpl(mode, first, count);
}
public abstract void drawArraysImpl(int mode, int first, int count);
public void drawElements(int mode, int count, int type, int offset) {
geomCount += count;
drawElementsImpl(mode, count, type, offset);
}
public abstract void drawElementsImpl(int mode, int count, int type, int offset);
//////////////////////////////////////////////////////////////////////////////
@@ -3091,10 +3118,10 @@ public abstract class PGL {
public abstract void depthMask(boolean mask);
public abstract void stencilMask(int mask);
public abstract void stencilMaskSeparate(int face, int mask);
public abstract void clear(int buf);
public abstract void clearColor(float r, float g, float b, float a);
public abstract void clearDepth(float d);
public abstract void clearStencil(int s);
public abstract void clear(int buf);
///////////////////////////////////////////////////////////
core/src/processing/opengl/PGraphicsOpenGL.java
+10 -9
View File
@@ -1,9 +1,12 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Processing project - http://processing.org
Processing OpenGL (c) 2011-2015 Andres Colubri
Copyright (c) 2004-13 Ben Fry and Casey Reas
Part of the Processing project - http://processing.org
Copyright (c) 2001-04 Massachusetts Institute of Technology
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2012-15 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -5922,9 +5925,6 @@ public class PGraphicsOpenGL extends PGraphics {
protected void backgroundImpl(PImage image) {
backgroundImpl();
set(0, 0, image);
if (0 < parent.frameCount) {
clearColor = true;
}
// Setting the background as opaque. If this an offscreen surface, the
// alpha channel will be set to 1 in endOffscreenDraw(), even if
// blending operations during draw create translucent areas in the
@@ -6457,8 +6457,9 @@ public class PGraphicsOpenGL extends PGraphics {
}
boolean needEndDraw = false;
if (primaryGraphics) pgl.requestFBOLayer();
else if (!drawing) {
if (primaryGraphics) {
pgl.requestFBOLayer();
} else if (!drawing) {
beginDraw();
needEndDraw = true;
}
@@ -6964,7 +6965,7 @@ public class PGraphicsOpenGL extends PGraphics {
protected void beginOnscreenDraw() {
updatePixelSize();
pgl.beginDraw(clearColor);
pgl.beginRender(pclearColor);
if (drawFramebuffer == null) {
drawFramebuffer = new FrameBuffer(this, pixelWidth, pixelHeight, true);
@@ -6986,7 +6987,7 @@ public class PGraphicsOpenGL extends PGraphics {
protected void endOnscreenDraw() {
pgl.endDraw(clearColor, parent.sketchWindowColor());
pgl.endRender(clearColor, parent.sketchWindowColor());
}
core/src/processing/opengl/PJOGL.java
+12 -9
View File
@@ -1,9 +1,12 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Processing project - http://processing.org
Processing OpenGL (c) 2011-2015 Andres Colubri
Copyright (c) 2011-12 Ben Fry and Casey Reas
Part of the Processing project - http://processing.org
Copyright (c) 2001-04 Massachusetts Institute of Technology
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2012-15 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -1126,12 +1129,12 @@ public class PJOGL extends PGL {
}
@Override
public void drawArrays(int mode, int first, int count) {
public void drawArraysImpl(int mode, int first, int count) {
gl.glDrawArrays(mode, first, count);
}
@Override
public void drawElements(int mode, int count, int type, int offset) {
public void drawElementsImpl(int mode, int count, int type, int offset) {
gl.glDrawElements(mode, count, type, offset);
}
@@ -1642,11 +1645,6 @@ public class PJOGL extends PGL {
gl2.glStencilMaskSeparate(face, mask);
}
@Override
public void clear(int buf) {
gl.glClear(buf);
}
@Override
public void clearColor(float r, float g, float b, float a) {
gl.glClearColor(r, g, b, a);
@@ -1662,6 +1660,11 @@ public class PJOGL extends PGL {
gl.glClearStencil(s);
}
@Override
public void clear(int buf) {
gl.glClear(buf);
}
///////////////////////////////////////////////////////////
// Framebuffers Objects
core/src/processing/opengl/PSurfaceJOGL.java
+30 -2
View File
@@ -1,3 +1,29 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Processing OpenGL (c) 2011-2015 Andres Colubri
Part of the Processing project - http://processing.org
Copyright (c) 2001-04 Massachusetts Institute of Technology
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2012-15 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
package processing.opengl;
import java.awt.Component;
@@ -695,8 +721,10 @@ public class PSurfaceJOGL implements PSurface {
int pframeCount = sketch.frameCount;
sketch.handleDraw();
if (pframeCount == sketch.frameCount) {
pgl.beginDraw(false);
pgl.endDraw(false, sketch.sketchWindowColor());
// This hack allows the FBO layer to be swapped normally even if
// the sketch is no looping, otherwise background artifacts will occur.
pgl.beginRender(false);
pgl.endRender(false, sketch.sketchWindowColor());
}
if (sketch.frameCount == 1) {