Handle 2D PATH shapes in PShapeOpenGL

Author: codeanticode

core/src/processing/opengl/PShapeOpenGL.java

@@ -988,20 +988,32 @@ public void solid(boolean solid) {
 
  @Override
  protected void beginContourImpl() {
+ if (family == PShape.PATH) {
+ super.beginContourImpl();
+ return;
+ }
  breakShape = true;
  }
 
 
  @Override
  protected void endContourImpl() {
+ if (family == PShape.PATH) {
+ super.endContourImpl();
+ }
  }
 
 
  @Override
  public void vertex(float x, float y) {
+ if (family == PShape.PATH) {
+ super.vertex(x, y);
+ return;
+ }
  vertexImpl(x, y, 0, 0, 0);
- if (image != null)
+ if (image != null) {
  PGraphics.showWarning(PGraphicsOpenGL.MISSING_UV_TEXCOORDS_ERROR);
+ }
  }
 
 
@@ -1013,9 +1025,14 @@ public void vertex(float x, float y, float u, float v) {
 
  @Override
  public void vertex(float x, float y, float z) {
+ if (family == PShape.PATH) {
+ super.vertex(x, y);
+ return;
+ }
  vertexImpl(x, y, z, 0, 0);
- if (image != null)
+ if (image != null) {
  PGraphics.showWarning(PGraphicsOpenGL.MISSING_UV_TEXCOORDS_ERROR);
+ }
  }
 
 
@@ -1493,6 +1510,10 @@ public void bezierDetail(int detail) {
  public void bezierVertex(float x2, float y2,
  float x3, float y3,
  float x4, float y4) {
+ if (family == PShape.PATH) {
+ super.bezierVertex(x2, y2, x3, y3, x4, y4);
+ return;
+ }
  bezierVertexImpl(x2, y2, 0,
  x3, y3, 0,
  x4, y4, 0);
@@ -1524,6 +1545,10 @@ protected void bezierVertexImpl(float x2, float y2, float z2,
  @Override
  public void quadraticVertex(float cx, float cy,
  float x3, float y3) {
+ if (family == PShape.PATH) {
+ super.quadraticVertex(cx, cy, x3, y3);
+ return;
+ }
  quadraticVertexImpl(cx, cy, 0,
  x3, y3, 0);
  }
@@ -1576,6 +1601,10 @@ public void curveTightness(float tightness) {
 
  @Override
  public void curveVertex(float x, float y) {
+ if (family == PShape.PATH) {
+ super.curveVertex(x, y);
+ return;
+ }
  curveVertexImpl(x, y, 0);
  }
 
@@ -3001,9 +3030,7 @@ protected void tessellateImpl() {
  tessellateSphere();
  }
  } else if (family == PATH) {
- // TODO workaround for vertices being wiped out,
- // but need to identify the real problem here
- if (vertices != null) inGeo.clear();
+ inGeo.clear();
  tessellatePath();
  }
 
@@ -3385,11 +3412,6 @@ protected void tessellatePath() {
  for (int i = 0; i < vertexCount; i++) {
  inGeo.addVertex(vertices[i][X], vertices[i][Y], VERTEX, false);
  }
- } else { // drawing 3D vertices
- for (int i = 0; i < vertexCount; i++) {
- inGeo.addVertex(vertices[i][X], vertices[i][Y], vertices[i][Z],
- VERTEX, false);
- }
  }
  } else { // coded set of vertices
  int idx = 0;
@@ -3429,57 +3451,6 @@ protected void tessellatePath() {
  idx++;
  break;
 
- case BREAK:
- brk = true;
- }
- }
- } else { // tessellating a 3D path
- for (int j = 0; j < vertexCodeCount; j++) {
- switch (vertexCodes[j]) {
-
- case VERTEX:
- inGeo.addVertex(vertices[idx][X], vertices[idx][Y],
- vertices[idx][Z], brk);
- brk = false;
- idx++;
- break;
-
- case QUADRATIC_VERTEX:
- inGeo.addQuadraticVertex(vertices[idx+0][X],
- vertices[idx+0][Y],
- vertices[idx+0][Z],
- vertices[idx+1][X],
- vertices[idx+1][Y],
- vertices[idx+0][Z],
- brk);
- brk = false;
- idx += 2;
- break;
-
- case BEZIER_VERTEX:
- inGeo.addBezierVertex(vertices[idx+0][X],
- vertices[idx+0][Y],
- vertices[idx+0][Z],
- vertices[idx+1][X],
- vertices[idx+1][Y],
- vertices[idx+1][Z],
- vertices[idx+2][X],
- vertices[idx+2][Y],
- vertices[idx+2][Z],
- brk);
- brk = false;
- idx += 3;
- break;
-
- case CURVE_VERTEX:
- inGeo.addCurveVertex(vertices[idx][X],
- vertices[idx][Y],
- vertices[idx][Z],
- brk);
- brk = false;
- idx++;
- break;
-
  case BREAK:
  brk = true;
  }