Add test cases for font file loading in 2D + WebGL

processing · Dec 15, 2024 · 797e4e0 · 797e4e0
1 parent 7fb18e8
commit 797e4e0
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 2 deletions.
diff --git a/src/webgl/text.js b/src/webgl/text.js
@@ -733,8 +733,11 @@ function text(p5, fn){
       sh.setUniform('uStrokeImageSize', [strokeImageWidth, strokeImageHeight]);
       sh.setUniform('uGridSize', [charGridWidth, charGridHeight]);
     }
+
+    const curFillColor = this.states.fillSet ? this.states.curFillColor : [0, 0, 0, 255];
+
     this._setGlobalUniforms(sh);
-    this._applyColorBlend(this.states.curFillColor);
+    this._applyColorBlend(curFillColor);
 
     let g = this.geometryBufferCache.getGeometryByID('glyph');
     if (!g) {
@@ -759,7 +762,7 @@ function text(p5, fn){
     this._bindBuffer(this.geometryBufferCache.cache.glyph.indexBuffer, gl.ELEMENT_ARRAY_BUFFER);
 
     // this will have to do for now...
-    sh.setUniform('uMaterialColor', this.states.curFillColor);
+    sh.setUniform('uMaterialColor', curFillColor);
     gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
 
     try {

diff --git a/test/unit/visual/cases/typography.js b/test/unit/visual/cases/typography.js
@@ -30,6 +30,30 @@ visualSuite("Typography", function () {
       p5.text('p5*js', 0, 10, p5.width);
       screenshot();
     });
+
+    visualTest('with a font file', async function(p5, screenshot) {
+      p5.createCanvas(100, 100);
+      const font = await p5.loadFont(
+        '/unit/assets/Inconsolata-Bold.ttf'
+      );
+      p5.textFont(font);
+      p5.textAlign(p5.LEFT, p5.TOP);
+      p5.textSize(35);
+      p5.text('p5*js', 0, 10, p5.width);
+      screenshot();
+    });
+
+    visualTest('with a font file in WebGL', async function(p5, screenshot) {
+      p5.createCanvas(100, 100, p5.WEBGL);
+      const font = await p5.loadFont(
+        '/unit/assets/Inconsolata-Bold.ttf'
+      );
+      p5.textFont(font);
+      p5.textAlign(p5.LEFT, p5.TOP);
+      p5.textSize(35);
+      p5.text('p5*js', -p5.width/2, -p5.height/2 + 10, p5.width);
+      screenshot();
+    });
   });
 
   visualSuite('textWeight', function() {

diff --git a/test/unit/visual/screenshots/Typography/textFont/with a font file in WebGL/000.png b/test/unit/visual/screenshots/Typography/textFont/with a font file in WebGL/000.png
diff --git a/test/unit/visual/screenshots/Typography/textFont/with a font file in WebGL/metadata.json b/test/unit/visual/screenshots/Typography/textFont/with a font file in WebGL/metadata.json
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
diff --git a/test/unit/visual/screenshots/Typography/textFont/with a font file/000.png b/test/unit/visual/screenshots/Typography/textFont/with a font file/000.png
diff --git a/test/unit/visual/screenshots/Typography/textFont/with a font file/metadata.json b/test/unit/visual/screenshots/Typography/textFont/with a font file/metadata.json
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}