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

Fixed calculation of texture matrix, some tweaks in beginDraw()

Browse Source
This commit is contained in:
codeanticode
2012-03-22 20:48:40 +00:00
parent e0c085413d
commit 9ca741bedd
5 changed files with 96 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/PGL.java
+14 -14
View File
@@ -359,20 +359,7 @@ public class PGL {
setFramerate = true;
}
public void updatePrimary() {
if (!setFramerate) {
setFramerate(targetFramerate);
}
}
public void updateOffscreen(PGL primary) {
gl = primary.gl;
gl2 = primary.gl2;
}
public void initPrimarySurface(int antialias) {
if (profile == null) {
profile = GLProfile.getDefault();
@@ -439,7 +426,20 @@ public class PGL {
capabilities = primary.capabilities;
drawable = null;
initialized = true;
}
}
public void updatePrimary() {
if (!setFramerate) {
setFramerate(targetFramerate);
}
}
public void updateOffscreen(PGL primary) {
gl = primary.gl;
gl2 = primary.gl2;
}
///////////////////////////////////////////////////////////////////////////////////
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+32 -16
View File
@@ -305,8 +305,7 @@ public class PGraphicsOpenGL extends PGraphics {
/** Used to detect the occurrence of a frame resize event. */
protected boolean resized = false;
/** Stores previous viewport dimensions. */
protected int[] savedViewport = {0, 0, 0, 0};
/** Viewport dimensions. */
protected int[] viewport = {0, 0, 0, 0};
/** Used to register calls to glClear. */
@@ -1449,8 +1448,7 @@ public class PGraphicsOpenGL extends PGraphics {
pgl.glDisable(PGL.GL_POLYGON_SMOOTH);
}
// setup opengl viewport.
pgl.glGetIntegerv(PGL.GL_VIEWPORT, savedViewport, 0);
// setup opengl viewport.
viewport[0] = 0; viewport[1] = 0; viewport[2] = width; viewport[3] = height;
pgl.glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
if (resized) {
@@ -1510,7 +1508,10 @@ public class PGraphicsOpenGL extends PGraphics {
if (primarySurface) {
pgl.beginOnscreenDraw(clearColorBuffer);
} else {
pgl.beginOffscreenDraw(clearColorBuffer);
pgl.beginOffscreenDraw(clearColorBuffer);
// Just in case the texture was recreated (in a resize event for example)
offscreenFramebuffer.setColorBuffer(texture);
}
if (hints[DISABLE_DEPTH_MASK]) {
@@ -1545,9 +1546,6 @@ public class PGraphicsOpenGL extends PGraphics {
return;
}
// Restoring previous viewport.
pgl.glViewport(savedViewport[0], savedViewport[1], savedViewport[2], savedViewport[3]);
if (primarySurface) {
pgl.endOnscreenDraw(clearColorBuffer0);
pgl.glFlush();
@@ -5604,8 +5602,6 @@ public class PGraphicsOpenGL extends PGraphics {
offscreenFramebufferMultisample.release();
}
// We need the GL2GL3 profile to access the glRenderbufferStorageMultisample
// function used in multisampled (antialiased) offscreen rendering.
if (PGraphicsOpenGL.fboMultisampleSupported && 1 < antialias) {
offscreenFramebufferMultisample = new PFramebuffer(parent, texture.glWidth, texture.glHeight, antialias, 0,
PGL.DEFAULT_DEPTH_BITS, PGL.DEFAULT_STENCIL_BITS,
@@ -6115,16 +6111,26 @@ public class PGraphicsOpenGL extends PGraphics {
}
public void setTexture(PTexture tex) {
float scaleu = tex.maxTexCoordU;
float scalev = tex.maxTexCoordV;
float scaleu = 1;
float scalev = 1;
float dispu = 0;
float dispv = 0;
if (tex.isFlippedX()) {
scaleu = -1;
dispu = 1;
}
if (tex.isFlippedY()) {
scalev *= -1;
scalev = -1;
dispv = 1;
}
scaleu *= tex.maxTexCoordU;
dispu *= tex.maxTexCoordU;
scalev *= tex.maxTexCoordV;
dispv *= tex.maxTexCoordV;
if (tcmat == null) {
tcmat = new float[16];
}
@@ -6190,16 +6196,26 @@ public class PGraphicsOpenGL extends PGraphics {
}
public void setTexture(PTexture tex) {
float scaleu = tex.maxTexCoordU;
float scalev = tex.maxTexCoordV;
float scaleu = 1;
float scalev = 1;
float dispu = 0;
float dispv = 0;
if (tex.isFlippedX()) {
scaleu = -1;
dispu = 1;
}
if (tex.isFlippedY()) {
scalev *= -1;
scalev = -1;
dispv = 1;
}
scaleu *= tex.maxTexCoordU;
dispu *= tex.maxTexCoordU;
scalev *= tex.maxTexCoordV;
dispv *= tex.maxTexCoordV;
if (tcmat == null) {
tcmat = new float[16];
}