Merge pull request processing#7951 from processing/fix/textToModel-warnings

Skip adding degenerate faces in textToModel

Author: perminder-17

src/type/p5.Font.js

@@ -537,8 +537,11 @@ export class Font {
     ({ width, height, options } = this._parseArgs(width, height, options));
     const extrude = options?.extrude || 0;
     const contours = this.textToContours(str, x, y, width, height, options);
+
     const geom = this._pInst.buildGeometry(() => {
       if (extrude === 0) {
+        const prevValidateFaces = this._pInst._renderer._validateFaces;
+        this._pInst._renderer._validateFaces = true;
         this._pInst.beginShape();
         this._pInst.normal(0, 0, 1);
         for (const contour of contours) {
@@ -549,7 +552,11 @@ export class Font {
           this._pInst.endContour(this._pInst.CLOSE);
         }
         this._pInst.endShape();
+        this._pInst._renderer._validateFaces = prevValidateFaces;
       } else {
+        const prevValidateFaces = this._pInst._renderer._validateFaces;
+        this._pInst._renderer._validateFaces = true;
+
         // Draw front faces
         for (const side of [1, -1]) {
           this._pInst.beginShape();
@@ -561,8 +568,9 @@ export class Font {
             this._pInst.endContour(this._pInst.CLOSE);
           }
           this._pInst.endShape();
-          this._pInst.beginShape();
         }
+        this._pInst._renderer._validateFaces = prevValidateFaces;
+
         // Draw sides
         for (const contour of contours) {
           this._pInst.beginShape(this._pInst.QUAD_STRIP);

src/webgl/GeometryBuilder.js

@@ -108,7 +108,7 @@ class GeometryBuilder {
    * Adds geometry from the renderer's immediate mode into the builder's
    * combined geometry.
    */
-  addImmediate(geometry, shapeMode) {
+  addImmediate(geometry, shapeMode, { validateFaces = false } = {}) {
     const faces = [];
 
     if (this.renderer.states.fillColor) {
@@ -129,7 +129,14 @@ class GeometryBuilder {
         }
       } else {
         for (let i = 0; i < geometry.vertices.length; i += 3) {
-          faces.push([i, i + 1, i + 2]);
+          if (
+            !validateFaces ||
+            geometry.vertices[i].copy().sub(geometry.vertices[i+1])
+              .cross(geometry.vertices[i].copy().sub(geometry.vertices[i+2]))
+              .magSq() > 0
+          ) {
+            faces.push([i, i + 1, i + 2]);
+          }
         }
       }
     }

src/webgl/p5.RendererGL.js

@@ -455,6 +455,10 @@ class RendererGL extends Renderer {
       }
       return this._internalDisable.call(this.drawingContext, key);
     };
+
+    // Whether or not to remove degenerate faces from geometry. This is usually
+    // set to false for performance.
+    this._validateFaces = false;
   }
 
   remove() {
@@ -562,7 +566,8 @@ class RendererGL extends Renderer {
     if (this.geometryBuilder) {
       this.geometryBuilder.addImmediate(
         this.shapeBuilder.geometry,
-        this.shapeBuilder.shapeMode
+        this.shapeBuilder.shapeMode,
+        { validateFaces: this._validateFaces }
       );
     } else if (this.states.fillColor || this.states.strokeColor) {
       if (this.shapeBuilder.shapeMode === constants.POINTS) {
@@ -2614,7 +2619,7 @@ function rendererGL(p5, fn) {
    * }
    * </code>
    * </div>
-   * 
+   *
    * <div>
    * <code>
    *  // Now with the antialias attribute set to true.