Fix PShape arcs

JakubValtar · JakubValtar · commit 366c865d6390 · 2015-07-29T17:11:53.000-04:00
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -1802,7 +1802,7 @@ public PShape createShape(int kind, float... p) {
 
     } else if (kind == ARC) {
       if (len != 6 && len != 7) {
-        throw new IllegalArgumentException("Use createShape(ARC, x, y, w, h, start, stop)");
+        throw new IllegalArgumentException("Use createShape(ARC, x, y, w, h, start, stop) or createShape(ARC, x, y, w, h, start, stop, arcMode)");
       }
       return createShapePrimitive(kind, p);
 
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
@@ -1654,9 +1654,16 @@ protected void drawPrimitive(PGraphics g) {
       g.ellipse(params[0], params[1], params[2], params[3]);
 
     } else if (kind == ARC) {
-      g.ellipseMode(CORNER);
-      g.arc(params[0], params[1], params[2], params[3], params[4], params[5]);
-
+      if (params.length == 6) {
+        g.arc(params[0], params[1],
+              params[2], params[3],
+              params[4], params[5]);
+      } else if (params.length == 7) {
+        g.arc(params[0], params[1],
+              params[2], params[3],
+              params[4], params[5],
+              (int) params[6]);
+      }
     } else if (kind == BOX) {
       if (params.length == 1) {
         g.box(params[0]);
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
@@ -3257,6 +3257,7 @@ protected void tessellateArc() {
     float a = 0, b = 0, c = 0, d = 0;
     float start = 0, stop = 0;
     int mode = ellipseMode;
+    int arcMode = 0;
 
     if (6 <= params.length) {
       a = params[0];
@@ -3266,7 +3267,7 @@ protected void tessellateArc() {
       start = params[4];
       stop = params[5];
       if (params.length == 7) {
-        mode = (int)(params[6]);
+        arcMode = (int)(params[6]);
       }
     }
 
@@ -3301,13 +3302,13 @@ protected void tessellateArc() {
         }
 
         if (stop - start > TWO_PI) {
-          start = 0;
-          stop = TWO_PI;
+          // don't change start, it is visible in PIE mode
+          stop = start + TWO_PI;
         }
         inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
                           ambientColor, specularColor, emissiveColor, shininess);
         inGeo.setNormal(normalX, normalY, normalZ);
-        inGeo.addArc(x, y, w, h, start, stop, fill, stroke, mode);
+        inGeo.addArc(x, y, w, h, start, stop, fill, stroke, arcMode);
         tessellator.tessellateTriangleFan();
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1802,7 +1802,7 @@ public PShape createShape(int kind, float... p) {`
`1802`	`1802`
`1803`	`1803`	`} else if (kind == ARC) {`
`1804`	`1804`	`if (len != 6 && len != 7) {`
`1805`		`- throw new IllegalArgumentException("Use createShape(ARC, x, y, w, h, start, stop)");`
	`1805`	`+ throw new IllegalArgumentException("Use createShape(ARC, x, y, w, h, start, stop) or createShape(ARC, x, y, w, h, start, stop, arcMode)");`
`1806`	`1806`	`}`
`1807`	`1807`	`return createShapePrimitive(kind, p);`
`1808`	`1808`
Original file line number	Diff line number	Diff line change
`@@ -3257,6 +3257,7 @@ protected void tessellateArc() {`
`3257`	`3257`	`float a = 0, b = 0, c = 0, d = 0;`
`3258`	`3258`	`float start = 0, stop = 0;`
`3259`	`3259`	`int mode = ellipseMode;`
	`3260`	`+ int arcMode = 0;`
`3260`	`3261`
`3261`	`3262`	`if (6 <= params.length) {`
`3262`	`3263`	`a = params[0];`
`@@ -3266,7 +3267,7 @@ protected void tessellateArc() {`
`3266`	`3267`	`start = params[4];`
`3267`	`3268`	`stop = params[5];`
`3268`	`3269`	`if (params.length == 7) {`
`3269`		`- mode = (int)(params[6]);`
	`3270`	`+ arcMode = (int)(params[6]);`
`3270`	`3271`	`}`
`3271`	`3272`	`}`
`3272`	`3273`
`@@ -3301,13 +3302,13 @@ protected void tessellateArc() {`
`3301`	`3302`	`}`
`3302`	`3303`
`3303`	`3304`	`if (stop - start > TWO_PI) {`
`3304`		`- start = 0;`
`3305`		`- stop = TWO_PI;`
	`3305`	`+ // don't change start, it is visible in PIE mode`
	`3306`	`+ stop = start + TWO_PI;`
`3306`	`3307`	`}`
`3307`	`3308`	`inGeo.setMaterial(fillColor, strokeColor, strokeWeight,`
`3308`	`3309`	`ambientColor, specularColor, emissiveColor, shininess);`
`3309`	`3310`	`inGeo.setNormal(normalX, normalY, normalZ);`
`3310`		`- inGeo.addArc(x, y, w, h, start, stop, fill, stroke, mode);`
	`3311`	`+ inGeo.addArc(x, y, w, h, start, stop, fill, stroke, arcMode);`
`3311`	`3312`	`tessellator.tessellateTriangleFan();`
`3312`	`3313`	`}`
`3313`	`3314`	`}`