a few fixes and cleanup

Author: elalish

bindings/wasm/examples/gltf-io.ts

@@ -47,38 +47,6 @@ export function setupIO(io: WebIO) {
   return io.registerExtensions([EXTManifold]);
 }
 
-function readPrimitive(
-    primitive: Primitive, numProp: number, attributes: Attribute[]) {
-  const position = primitive.getAttribute('POSITION')!;
-  const numVert = position.getCount();
-  const vertProperties = [];
-  let offset = 0;
-  for (const attribute of attributes) {
-    const size = attributeDefs[attribute].components;
-    if (attributeDefs[attribute].type == null) {
-      offset += size;
-      continue;
-    }
-    const accessor = primitive.getAttribute(attribute);
-    if (accessor) {
-      const array = accessor.getArray()!;
-      for (let i = 0; i < numVert; ++i) {
-        for (let j = 0; j < size; ++j) {
-          vertProperties[numProp * i + offset + j] = array[i * size + j];
-        }
-      }
-    } else {
-      for (let i = 0; i < numVert; ++i) {
-        for (let j = 0; j < size; ++j) {
-          vertProperties[numProp * i + offset + j] = 0;
-        }
-      }
-    }
-    offset += size;
-  }
-  return vertProperties;
-}
-
 /**
  * Read an input mesh into Manifold-compatible data structures, whether it
  * contains the EXT_manifold extension or not.
@@ -167,14 +135,8 @@ export function readMesh(mesh: Mesh, attributes: Attribute[] = []):
           if (attributeIn === attributeOut) {
             foundAttribute[idx] = true;
             const accessor = primitive.getAttribute(attributeIn)!;
-            const array = accessor.getArray()!;
-            const size = attributeDefs[attributeIn].components;
-            for (let i = 0; i < numVert; ++i) {
-              for (let j = 0; j < size; ++j) {
-                vertPropArray[numProp * i + attributeOffsets[idx] + j] =
-                    array[i * size + j];
-              }
-            }
+            writeProperties(
+                vertPropArray, accessor, numProp, attributeOffsets[idx]);
           }
         }
       });
@@ -428,3 +390,35 @@ export async function loadTexture(texture: Texture, uri: string) {
   texture.setMimeType(blob.type);
   texture.setImage(new Uint8Array(await blob.arrayBuffer()));
 }
+
+function writeProperties(
+    vertProperties: number[], accessor: Accessor, numProp: number,
+    offset: number) {
+  const array = accessor.getArray()!;
+  const size = accessor.getElementSize();
+  const numVert = accessor.getCount();
+  for (let i = 0; i < numVert; ++i) {
+    for (let j = 0; j < size; ++j) {
+      vertProperties[numProp * i + offset + j] = array[i * size + j];
+    }
+  }
+}
+
+function readPrimitive(
+    primitive: Primitive, numProp: number, attributes: Attribute[]) {
+  const vertProperties: number[] = [];
+  let offset = 0;
+  for (const attribute of attributes) {
+    const size = attributeDefs[attribute].components;
+    if (attributeDefs[attribute].type == null) {
+      offset += size;
+      continue;
+    }
+    const accessor = primitive.getAttribute(attribute);
+    if (accessor) {
+      writeProperties(vertProperties, accessor, numProp, offset);
+    }
+    offset += size;
+  }
+  return vertProperties;
+}

bindings/wasm/examples/public/editor.d.ts

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {Attribute} from '../gltf-io';
-
 import {Manifold, Mat4, Vec2, Vec3} from './manifold';
 
 declare class GLTFNode {
@@ -27,6 +25,9 @@ declare class GLTFNode {
   clone(parent?: GLTFNode): GLTFNode;
 }
 
+type Attribute = 'POSITION'|'NORMAL'|'TANGENT'|'TEXCOORD_0'|'TEXCOORD_1'|
+    'COLOR_0'|'JOINTS_0'|'WEIGHTS_0'|'SKIP_1'|'SKIP_2'|'SKIP_3'|'SKIP_4';
+
 declare class GLTFMaterial {
   attributes?: Attribute[];
   roughness?: number;

bindings/wasm/examples/public/examples.js

@@ -350,12 +350,12 @@ export const examples = {
 
         const hole = Manifold.compose(holes);
 
-        result = Manifold.difference(
-            result,
-            hole,
-            hole.rotate([90, 0, 0]),
-            hole.rotate([0, 90, 0]),
-        );
+        result = Manifold.difference([
+          result,
+          hole,
+          hole.rotate([90, 0, 0]),
+          hole.rotate([0, 90, 0]),
+        ]);
         return result;
       }
 

bindings/wasm/examples/worker.ts

@@ -399,18 +399,15 @@ function addMesh(
       {vertices, indices: manifoldMesh.triVerts, id: `${nextGlobalID++}`});
 
   for (const [run, id] of manifoldMesh.runOriginalID!.entries()) {
-    let inMesh = shown.get(id);
-    let single = false;
-    if (inMesh == null) {
-      single = true;
-      inMesh = singles.get(id);
-    }
+    const show = shown.has(id);
+    const inMesh = show ? shown.get(id) : singles.get(id);
     if (inMesh == null) {
       continue;
     }
-    if (single) {
-      id2properties.get(id)!.material = getCachedMaterial(doc, SHOW);
-    }
+
+    id2properties.get(id)!.material = getCachedMaterial(
+        doc, show ? SHOW : (id2material.get(id) || backupMaterial));
+
     const debugNode = doc.createNode('debug')
                           .setMesh(writeMesh(doc, inMesh, id2properties))
                           .setMatrix(manifoldMesh.transform(run));