FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch 'master' of github.com:processing/processing · craftoid/processing@416f2e5 · GitHub

  1. craftoid
  2. processing

Repository navigation

Commit 416f2e5

Browse files
benfry
committed
Merge branch 'master' of github.com:processing/processing
2 parents 7a49121 + f1a938a commit 416f2e5

6 files changed

Lines changed: 50 additions & 12 deletions

File tree

‎core/src/processing/opengl/PGraphicsOpenGL.java‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ public class PGraphicsOpenGL extends PGraphics {
7676
"for the rest of the sketch's execution";
7777
static final String UNSUPPORTED_SHAPE_FORMAT_ERROR =
7878
"Unsupported shape format";
79+
static final String MISSING_UV_TEXCOORDS_ERROR =
80+
"No uv texture coordinates supplied with vertex() call";
7981
static final String INVALID_FILTER_SHADER_ERROR =
8082
"Your shader needs to be of TEXTURE type to be used as a filter";
8183
static final String INCONSISTENT_SHADER_TYPES =
@@ -2114,6 +2116,7 @@ public void endContour() {
21142116
@Override
21152117
public void vertex(float x, float y) {
21162118
vertexImpl(x, y, 0, 0, 0);
2119+
if (textureImage != null) PGraphics.showWarning(MISSING_UV_TEXCOORDS_ERROR);
21172120
}
21182121

21192122

@@ -2126,6 +2129,7 @@ public void vertex(float x, float y, float u, float v) {
21262129
@Override
21272130
public void vertex(float x, float y, float z) {
21282131
vertexImpl(x, y, z, 0, 0);
2132+
if (textureImage != null) PGraphics.showWarning(MISSING_UV_TEXCOORDS_ERROR);
21292133
}
21302134

21312135

@@ -5036,6 +5040,11 @@ protected void backgroundImpl(PImage image) {
50365040
if (0 < parent.frameCount) {
50375041
clearColorBuffer = true;
50385042
}
5043+
// Setting the background as opaque. If this an offscreen surface, the
5044+
// alpha channel will be set to 1 in endOffscreenDraw(), even if
5045+
// blending operations during draw create translucent areas in the
5046+
// color buffer.
5047+
backgroundA = 1;
50395048
}
50405049

50415050

@@ -5324,17 +5333,17 @@ protected void setImpl(PImage sourceImage,
53245333
setgetPixels = true;
53255334
super.setImpl(sourceImage, sourceX, sourceY, sourceWidth, sourceHeight,
53265335
targetX, targetY);
5327-
// do we need this?
5328-
// see https://github.com/processing/processing/issues/2125
5329-
// if (sourceImage.format == RGB) {
5330-
// int targetOffset = targetY * width + targetX;
5331-
// for (int y = sourceY; y < sourceY + sourceHeight; y++) {
5332-
// for (int x = targetOffset; x < targetOffset + sourceWidth; x++) {
5333-
// pixels[x] |= 0xff000000;
5334-
// }
5335-
// targetOffset += width;
5336-
// }
5337-
// }
5336+
// do we need this?
5337+
// see https://github.com/processing/processing/issues/2125
5338+
// if (sourceImage.format == RGB) {
5339+
// int targetOffset = targetY * width + targetX;
5340+
// for (int y = sourceY; y < sourceY + sourceHeight; y++) {
5341+
// for (int x = targetOffset; x < targetOffset + sourceWidth; x++) {
5342+
// pixels[x] |= 0xff000000;
5343+
// }
5344+
// targetOffset += width;
5345+
// }
5346+
// }
53385347
}
53395348

53405349

@@ -6097,6 +6106,15 @@ protected void beginOffscreenDraw() {
60976106

60986107

60996108
protected void endOffscreenDraw() {
6109+
// Set alpha channel to opaque in order to match behavior of JAVA2D:
6110+
// https://github.com/processing/processing/issues/1844
6111+
// but still not working as expected. Some strange artifacts with multismapled
6112+
// surfaces (see second code example in the issue above).
6113+
// pgl.colorMask(false, false, false, true);
6114+
// pgl.clearColor(0, 0, 0, 1);
6115+
// pgl.clear(PGL.COLOR_BUFFER_BIT);
6116+
// pgl.colorMask(true, true, true, true);
6117+
61006118
if (offscreenMultisample) {
61016119
multisampleFramebuffer.copy(offscreenFramebuffer, currentFramebuffer);
61026120
}

‎core/src/processing/opengl/PJOGL.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,18 @@ protected void initSurface(int antialias) {
245245
} catch (GLException ex) {
246246
profile = GLProfile.getMaxProgrammable(true);
247247
}
248+
if (!profile.isGL3()) {
249+
PGraphics.showWarning("Requested profile GL3 but is not available, got: " + profile);
250+
}
248251
} else if (PROFILE == 4) {
249252
try {
250253
profile = GLProfile.getGL4ES3();
251254
} catch (GLException ex) {
252255
profile = GLProfile.getMaxProgrammable(true);
253256
}
257+
if (!profile.isGL4()) {
258+
PGraphics.showWarning("Requested profile GL4 but is not available, got: " + profile);
259+
}
254260
} else throw new RuntimeException(UNSUPPORTED_GLPROF_ERROR);
255261

256262
if (2 < PROFILE) {

‎core/src/processing/opengl/PShapeOpenGL.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,6 +1003,8 @@ protected void endContourImpl() {
10031003
@Override
10041004
public void vertex(float x, float y) {
10051005
vertexImpl(x, y, 0, 0, 0);
1006+
if (image != null)
1007+
PGraphics.showWarning(PGraphicsOpenGL.MISSING_UV_TEXCOORDS_ERROR);
10061008
}
10071009

10081010

@@ -1015,6 +1017,8 @@ public void vertex(float x, float y, float u, float v) {
10151017
@Override
10161018
public void vertex(float x, float y, float z) {
10171019
vertexImpl(x, y, z, 0, 0);
1020+
if (image != null)
1021+
PGraphics.showWarning(PGraphicsOpenGL.MISSING_UV_TEXCOORDS_ERROR);
10181022
}
10191023

10201024

‎java/libraries/lwjgl/src/processing/lwjgl/PLWJGL.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,9 @@ public void next() {
967967
RGBA4 = GL11.GL_RGBA4;
968968
RGB5_A1 = GL11.GL_RGB5_A1;
969969
RGB565 = ARBES2Compatibility.GL_RGB565;
970+
RGB8 = GL11.GL_RGB8;
971+
RGBA8 = GL11.GL_RGBA8;
972+
ALPHA8 = GL11.GL_ALPHA8;
970973

971974
READ_ONLY = GL15.GL_READ_ONLY;
972975
WRITE_ONLY = GL15.GL_WRITE_ONLY;
@@ -1181,7 +1184,6 @@ public void next() {
11811184
READ_FRAMEBUFFER = GL30.GL_READ_FRAMEBUFFER;
11821185
DRAW_FRAMEBUFFER = GL30.GL_DRAW_FRAMEBUFFER;
11831186

1184-
RGBA8 = GL11.GL_RGBA8;
11851187
DEPTH24_STENCIL8 = GL30.GL_DEPTH24_STENCIL8;
11861188

11871189
DEPTH_COMPONENT = GL11.GL_DEPTH_COMPONENT;

‎java/libraries/video/src/processing/video/Capture.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@ public void dispose() {
270270

271271
pipeline.dispose();
272272
pipeline = null;
273+
274+
parent.g.removeCache(this);
275+
parent.unregisterMethod("dispose", this);
276+
parent.unregisterMethod("post", this);
273277
}
274278
}
275279

‎java/libraries/video/src/processing/video/Movie.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ public void dispose() {
135135

136136
playbin.dispose();
137137
playbin = null;
138+
139+
parent.g.removeCache(this);
140+
parent.unregisterMethod("dispose", this);
141+
parent.unregisterMethod("post", this);
138142
}
139143
}
140144

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL