Fix rectMode() in 3D

jbuck · Sep 15, 2011 · c1855dd · c1855dd
1 parent 558d58b
commit c1855dd
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 0 deletions.
diff --git a/processing.js b/processing.js
@@ -13748,6 +13748,19 @@
         throw "rect() with rounded corners is not supported in 3D mode";
       }
 
+      if (curRectMode === PConstants.CORNERS) {
+        width -= x;
+        height -= y;
+      }
+      if (curRectMode === PConstants.RADIUS) {
+        width *= 2;
+        height *= 2;
+      }
+      if (curRectMode === PConstants.CENTER || curRectMode === PConstants.RADIUS) {
+        x -= width / 2;
+        y -= height / 2;
+      }
+
       // Modeling transformation
       var model = new PMatrix3D();
       model.translate(x, y, 0);

diff --git a/test/ref/rectMode-3d.pde b/test/ref/rectMode-3d.pde
diff --git a/test/ref/tests.js b/test/ref/tests.js
@@ -200,6 +200,7 @@ var tests = [
   { path: "continuous-curve.pde", tags: ["2D"], epsilonOverride: 0.09 },
   { path: "points-lines.pde", tags: ["2D", "Crisp"] },
   { path: "rectMode.pde", tags: ["2D", "Crisp"] },
+  { path: "rectMode-3d.pde", tags: ["3D"] },
   { path: "rect-quad.pde", tags: ["2D"] },
   { path: "size-fill-rect.pde", tags: ["2D"] },
   { path: "triangle.pde", tags: ["2D"] },