Merge pull request #8197 from processing/fix/rect-uvs

Fix generation of UVs in rounded rectangles

Author: davepagurek

src/webgl/3d_primitives.js

@@ -1967,7 +1967,7 @@ function primitives3D(p5, fn){
       const prevOrder = this.bezierOrder();
       this.bezierOrder(2);
       this.beginShape();
-      const addUVs = (x, y) => [x, y, (x - x1)/width, (y - y1)/height];
+      const addUVs = (x, y) => [x, y, 0, (x - x1)/width, (y - y1)/height];
       if (tr !== 0) {
         this.vertex(...addUVs(x2 - tr, y1));
         this.bezierVertex(...addUVs(x2, y1));

test/unit/visual/cases/webgl.js

@@ -673,4 +673,24 @@ visualSuite('WebGL', function() {
       screenshot();
     });
   });
+
+  visualSuite('texture()', () => {
+    visualTest('on a rect', async (p5, screenshot) => {
+      p5.createCanvas(50, 50, p5.WEBGL);
+      const tex = await p5.loadImage('/unit/assets/cat.jpg');
+      p5.texture(tex);
+      p5.texture(tex);
+      p5.rect(-20, -20, 40, 40);
+      screenshot();
+    });
+
+    visualTest('on a rect with rounded corners', async (p5, screenshot) => {
+      p5.createCanvas(50, 50, p5.WEBGL);
+      const tex = await p5.loadImage('/unit/assets/cat.jpg');
+      p5.texture(tex);
+      p5.texture(tex);
+      p5.rect(-20, -20, 40, 40, 10);
+      screenshot();
+    });
+  });
 });

test/unit/visual/screenshots/WebGL/texture()/on a rect with rounded corners/000.png

@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}

test/unit/visual/screenshots/WebGL/texture()/on a rect with rounded corners/metadata.json

@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}