Fix PShape ellipses

JakubValtar · JakubValtar · commit f54f3cdfb89f · 2015-07-29T17:14:48.000-04:00
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -1795,8 +1795,8 @@ public PShape createShape(int kind, float... p) {
       return createShapePrimitive(kind, p);
 
     } else if (kind == ELLIPSE) {
-      if (len != 4 && len != 5) {
-        throw new IllegalArgumentException("Use createShape(ELLIPSE, x, y, w, h) or createShape(ELLIPSE, x, y, w, h, mode)");
+      if (len != 4) {
+        throw new IllegalArgumentException("Use createShape(ELLIPSE, x, y, w, h)");
       }
       return createShapePrimitive(kind, p);
 
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
@@ -1654,9 +1654,8 @@ protected void drawPrimitive(PGraphics g) {
         }
       }
     } else if (kind == ELLIPSE) {
-      g.ellipseMode(CORNER);
-      g.ellipse(params[0], params[1], params[2], params[3]);
-
+      g.ellipse(params[0], params[1],
+                params[2], params[3]);
     } else if (kind == ARC) {
       if (params.length == 6) {
         g.arc(params[0], params[1],
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
@@ -3211,9 +3211,6 @@ protected void tessellateEllipse() {
       b = params[1];
       c = params[2];
       d = params[3];
-      if (params.length == 5) {
-        mode = (int)(params[4]);
-      }
     }
 
     float x = a;

Original file line number	Diff line number	Diff line change
`@@ -1795,8 +1795,8 @@ public PShape createShape(int kind, float... p) {`
`1795`	`1795`	`return createShapePrimitive(kind, p);`
`1796`	`1796`
`1797`	`1797`	`} else if (kind == ELLIPSE) {`
`1798`		`- if (len != 4 && len != 5) {`
`1799`		`- throw new IllegalArgumentException("Use createShape(ELLIPSE, x, y, w, h) or createShape(ELLIPSE, x, y, w, h, mode)");`
	`1798`	`+ if (len != 4) {`
	`1799`	`+ throw new IllegalArgumentException("Use createShape(ELLIPSE, x, y, w, h)");`
`1800`	`1800`	`}`
`1801`	`1801`	`return createShapePrimitive(kind, p);`
`1802`	`1802`
Original file line number	Diff line number	Diff line change
`@@ -1654,9 +1654,8 @@ protected void drawPrimitive(PGraphics g) {`
`1654`	`1654`	`}`
`1655`	`1655`	`}`
`1656`	`1656`	`} else if (kind == ELLIPSE) {`
`1657`		`- g.ellipseMode(CORNER);`
`1658`		`- g.ellipse(params[0], params[1], params[2], params[3]);`
`1659`		`-`
	`1657`	`+ g.ellipse(params[0], params[1],`
	`1658`	`+ params[2], params[3]);`
`1660`	`1659`	`} else if (kind == ARC) {`
`1661`	`1660`	`if (params.length == 6) {`
`1662`	`1661`	`g.arc(params[0], params[1],`
Original file line number	Diff line number	Diff line change
`@@ -3211,9 +3211,6 @@ protected void tessellateEllipse() {`
`3211`	`3211`	`b = params[1];`
`3212`	`3212`	`c = params[2];`
`3213`	`3213`	`d = params[3];`
`3214`		`- if (params.length == 5) {`
`3215`		`- mode = (int)(params[4]);`
`3216`		`- }`
`3217`	`3214`	`}`
`3218`	`3215`
`3219`	`3216`	`float x = a;`