Merge pull request #7479 from processing/fix/model-buildgeometry

Fix usage of model() in buildGeometry()

Author: davepagurek

src/webgl/loading.js

@@ -441,6 +441,7 @@ function loading(p5, fn){
         if (flipV) {
           model.flipV();
         }
+        model._makeTriangleEdges();
 
         if (successCallback) {
           return successCallback(model);
@@ -464,6 +465,7 @@ function loading(p5, fn){
         if (flipV) {
           model.flipV();
         }
+        model._makeTriangleEdges();
 
         if (successCallback) {
           return successCallback(model);
@@ -1087,19 +1089,7 @@ function loading(p5, fn){
   fn.model = function (model, count = 1) {
     this._assert3d('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._getOrMakeCachedBuffers(model);
-      }
-
-      this._renderer._drawGeometry(model, { count });
-    }
+    this._renderer.model(model, count);
   };
 }
 

src/webgl/p5.RendererGL.js

@@ -586,6 +586,21 @@ class RendererGL extends Renderer {
     this.updateShapeVertexProperties();
   }
 
+  model(model, count = 1) {
+    if (model.vertices.length > 0) {
+      if (this.geometryBuilder) {
+        this.geometryBuilder.addRetained(model);
+      } else {
+        if (!this.geometryInHash(model.gid)) {
+          model._edgesToVertices();
+          this._getOrMakeCachedBuffers(model);
+        }
+
+        this._drawGeometry(model, { count });
+      }
+    }
+  }
+
   //////////////////////////////////////////////
   // Rendering
   //////////////////////////////////////////////

test/unit/visual/cases/webgl.js

@@ -562,4 +562,24 @@ visualSuite('WebGL', function() {
       screenshot();
     });
   });
+
+  visualSuite('buildGeometry()', () => {
+    visualTest('can draw models', (p5, screenshot) => {
+      p5.createCanvas(50, 50, p5.WEBGL);
+
+      const sphere = p5.buildGeometry(() => {
+        p5.scale(0.25);
+        p5.sphere();
+      });
+
+      const geom = p5.buildGeometry(() => {
+        p5.model(sphere);
+      });
+
+      p5.background(255);
+      p5.lights();
+      p5.model(geom);
+      screenshot();
+    });
+  });
 });

test/unit/visual/screenshots/WebGL/buildGeometry()/can draw models/000.png

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