From 6699222b23239283d5bf8794cfba28dedcd0a9c8 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Mon, 20 Sep 2021 21:43:06 -0400
Subject: [PATCH] add optional vertex indexing on widget data load

---
 src/kiri/widget.js | 57 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/kiri/widget.js b/src/kiri/widget.js
index 7186666e..953e4bc4 100644
--- a/src/kiri/widget.js
+++ b/src/kiri/widget.js
@@ -275,7 +275,28 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
      * @param {Float32Array} vertices
      * @returns {Widget}
      */
-    PRO.loadVertices = function(vertices, autoscale) {
+    PRO.loadVertices = function(data, options = { index: false }) {
+        let vertices,
+            indices,
+            autoscale = false;
+        if (ArrayBuffer.isView(data) || typeof(data) != 'object') {
+            vertices = data;
+        } else {
+            vertices = data.vertices;
+            indices = data.indices;
+        }
+        switch (typeof(autoscale)) {
+            case 'boolean':
+                autoscale = options;
+                break;
+            case 'object':
+                autoscale = options.autoscale;
+                break;
+        }
+        if (!vertices) {
+            console.log('missing vertices', {data, options});
+            return;
+        }
         if (autoscale === true) {
             // onshape exports obj in meters by default :/
             let maxv = 0;
@@ -288,24 +309,35 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
                 }
             }
         }
+        if (options.index && !indices) {
+            let mesh = new BASE.Mesh({vertices});
+            vertices = mesh.vertices.toFloat32();
+            indices = Uint32Array.from(mesh.faces.map(v => v/3));
+        }
         if (this.mesh) {
             let geo = this.mesh.geometry;
+            if (indices) geo.setIndex(new THREE.BufferAttribute(indices, 1));
             geo.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
             geo.setAttribute('normal', undefined);
             geo.attributes.position.needsUpdate = true;
             geo.computeFaceNormals();
             geo.computeVertexNormals();
-            this.points = null;
             this.meta.vertices = vertices.length / 3;
+            this.points = null;
             return this;
         } else {
-            let geometry = new THREE.BufferGeometry();
-            geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
+            let geo = new THREE.BufferGeometry();
+            if (indices) geo.setIndex(new THREE.BufferAttribute(indices, 1));
+            geo.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
+            geo.setAttribute('normal', undefined);
             this.meta.vertices = vertices.length / 3;
-            return this.loadGeometry(geometry);
+            this.points = null;
+            return this.loadGeometry(geo);
         }
     };
 
+    PRO.loadData = PRO.loadVertices;
+
     PRO.heal = function(debug) {
         if (debug) {
             let mesh = this.debugMesh().heal();
@@ -679,6 +711,21 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
         }
     };
 
+    PRO.iterPoints = function() {
+        let verts = this.getGeoVertices();
+        let index = 0;
+        let count = verts.length;
+        return new class ITER {
+            [Symbol.iterator]() { return {
+                next: () => {
+                    let done = index >= count;
+                    return done ? { done } :
+                        { value: BASE.newPoint(verts[index++], verts[index++], verts[index++]) };
+                }
+            } }
+        };
+    };
+
     PRO.getPoints = function() {
         if (!this.points) {
             // convert and cache points from geometry vertices