Merge pull request #7287 from davepagurek/model-perf

Performance improvements for WebGL shape drawing

Author: davepagurek

src/webgl/loading.js

@@ -474,6 +474,7 @@ p5.prototype.loadModel = function(path,options) {
           if (flipV) {
             model.flipV();
           }
+          model._makeTriangleEdges();
 
           self._decrementPreload();
           if (typeof successCallback === 'function') {
@@ -1117,11 +1118,6 @@ p5.prototype.model = function(model) {
   p5._validateParameters('model', arguments);
   if (model.vertices.length > 0) {
     if (!this._renderer.geometryInHash(model.gid)) {
-
-      if (model.edges.length === 0) {
-        model._makeTriangleEdges();
-      }
-
       model._edgesToVertices();
       this._renderer.createBuffers(model.gid, model);
     }
@@ -1293,6 +1289,8 @@ p5.prototype.createModel = function(modelString, fileType=' ', options) {
     model.flipV();
   }
 
+  model._makeTriangleEdges();
+
   if (typeof successCallback === 'function') {
     successCallback(model);
   }
@@ -1301,4 +1299,4 @@ p5.prototype.createModel = function(modelString, fileType=' ', options) {
 };
 
 
-export default p5;
+export default p5;

src/webgl/p5.RendererGL.Immediate.js

@@ -214,7 +214,7 @@ p5.RendererGL.prototype.endShape = function(
   if (this.immediateMode.geometry.vertices.length === 3 &&
       this.immediateMode.shapeMode === constants.TESS
   ) {
-    this.immediateMode.shapeMode === constants.TRIANGLES;
+    this.immediateMode.shapeMode = constants.TRIANGLES;
   }
 
   this.isProcessingVertices = true;