Fix PShape rects

JakubValtar · JakubValtar · commit c755524def22 · 2015-07-29T17:12:18.000-04:00
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -1789,7 +1789,7 @@ public PShape createShape(int kind, float... p) {
       return createShapePrimitive(kind, p);
 
     } else if (kind == RECT) {
-      if (len != 4 && len != 5 && len != 8 && len != 9) {
+      if (len != 4 && len != 5 && len != 8) {
         throw new IllegalArgumentException("Wrong number of parameters for createShape(RECT), see the reference");
       }
       return createShapePrimitive(kind, p);
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
@@ -1637,18 +1637,22 @@ protected void drawPrimitive(PGraphics g) {
 
     } else if (kind == RECT) {
       if (image != null) {
-        g.imageMode(CORNER);
         g.image(image, params[0], params[1], params[2], params[3]);
       } else {
-        if(params.length != 5){
-          g.rectMode(CORNER);
-        }
-        else{
-          g.rectMode((int) params[4]);
+        if (params.length == 4) {
+          g.rect(params[0], params[1],
+                 params[2], params[3]);
+        } else if (params.length == 5) {
+          g.rect(params[0], params[1],
+                 params[2], params[3],
+                 params[4]);
+        } else if (params.length == 8) {
+          g.rect(params[0], params[1],
+                 params[2], params[3],
+                 params[4], params[5],
+                 params[6], params[7]);
         }
-        g.rect(params[0], params[1], params[2], params[3]);
       }
-
     } else if (kind == ELLIPSE) {
       g.ellipseMode(CORNER);
       g.ellipse(params[0], params[1], params[2], params[3]);
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
@@ -3129,11 +3129,15 @@ protected void tessellateRect() {
       b = params[1];
       c = params[2];
       d = params[3];
+      rounded = false;
       if (params.length == 5) {
-        mode = (int)(params[4]);
+        tl = params[4];
+        tr = params[4];
+        br = params[4];
+        bl = params[4];
+        rounded = true;
       }
-      rounded = false;
-    } else if (params.length == 8 || params.length == 9) {
+    } else if (params.length == 8) {
       a = params[0];
       b = params[1];
       c = params[2];
@@ -3142,9 +3146,6 @@ protected void tessellateRect() {
       tr = params[5];
       br = params[6];
       bl = params[7];
-      if (params.length == 9) {
-        mode = (int)(params[8]);
-      }
       rounded = true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1789,7 +1789,7 @@ public PShape createShape(int kind, float... p) {`
`1789`	`1789`	`return createShapePrimitive(kind, p);`
`1790`	`1790`
`1791`	`1791`	`} else if (kind == RECT) {`
`1792`		`- if (len != 4 && len != 5 && len != 8 && len != 9) {`
	`1792`	`+ if (len != 4 && len != 5 && len != 8) {`
`1793`	`1793`	`throw new IllegalArgumentException("Wrong number of parameters for createShape(RECT), see the reference");`
`1794`	`1794`	`}`
`1795`	`1795`	`return createShapePrimitive(kind, p);`