re-added empty mesh removal

Author: dominic

src/aframe/component/architecture-toolkit/closet.js

@@ -8,6 +8,7 @@ import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
 import getClosetData3d from '../../../scene/structure/parametric-objects/closet'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -17,7 +18,7 @@ export default {
 
   updateSchema: updateSchema,
 
-  update: function (oldData) {
+  update: async function (oldData) {
     var this_ = this
     var data = this_.data
     // remove old mesh
@@ -28,19 +29,18 @@ export default {
 
     attributes.materials = dataToMaterials(data)
 
-    getClosetData3d(attributes)
-    .then(data3d => {
+    let data3d = await getClosetData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
-      // create new one
-      this_.mesh = new THREE.Object3D()
-      this_.data3dView = new io3d.aFrame.three.Data3dView({parent: this_.mesh})
+    // create new one
+    this_.mesh = new THREE.Object3D()
+    this_.data3dView = new io3d.aFrame.three.Data3dView({parent: this_.mesh})
 
-      // update view
-      this_.data3dView.set(data3d)
-      this_.el.setObject3D('mesh', this_.mesh)
-      // emit event
-      this_.el.emit('mesh-updated');
-    })
+    // update view
+    this_.data3dView.set(data3d)
+    this_.el.setObject3D('mesh', this_.mesh)
+    // emit event
+    this_.el.emit('mesh-updated');
   },
 
   remove: function () {

src/aframe/component/architecture-toolkit/column.js

@@ -8,6 +8,7 @@ import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
 import getColumnData3d from '../../../scene/structure/parametric-objects/column'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -17,7 +18,7 @@ export default {
 
   updateSchema: updateSchema,
 
-  update: function (oldData) {
+  update: async function (oldData) {
     var this_ = this
     var data = this_.data
 
@@ -31,19 +32,18 @@ export default {
 
     // construct data3d object
 
-    var data3d = getColumnData3d(attributes)
-    .then(data3d => {
-      // create new one
-      this_.mesh = new THREE.Object3D()
-      this_.data3dView = new io3d.aFrame.three.Data3dView({parent: this_.mesh})
+    let data3d = await getColumnData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
-      // update view
-      this_.data3dView.set(data3d)
-      this_.el.setObject3D('mesh', this_.mesh)
-      // emit event
-      this_.el.emit('mesh-updated');
-    })
+    // create new one
+    this_.mesh = new THREE.Object3D()
+    this_.data3dView = new io3d.aFrame.three.Data3dView({parent: this_.mesh})
 
+    // update view
+    this_.data3dView.set(data3d)
+    this_.el.setObject3D('mesh', this_.mesh)
+    // emit event
+    this_.el.emit('mesh-updated');
   },
 
   remove: function () {

src/aframe/component/architecture-toolkit/common/remove-empty-meshes.js

@@ -0,0 +1,9 @@
+// clean up empty meshes to prevent errors on material update
+export default function (meshes) {
+  Object.keys(meshes).forEach(key => {
+    if (!meshes[key].positions || !meshes[key].positions.length) {
+      //console.warn('no vertices for mesh', key)
+      delete meshes[key]
+    }
+  })
+}

src/aframe/component/architecture-toolkit/door.js

@@ -7,6 +7,7 @@ import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import cloneDeep from 'lodash/cloneDeep'
 import getDoorData3d from '../../../scene/structure/parametric-objects/door'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -54,6 +55,7 @@ export default {
 
     // construct data3d object
     var data3d = await getDoorData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

src/aframe/component/architecture-toolkit/floor.js

@@ -7,6 +7,7 @@ import updateSchema from './common/update-schema.js'
 import cloneDeep from 'lodash/cloneDeep'
 import getFloorData3d from '../../../scene/structure/parametric-objects/floor'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -30,6 +31,7 @@ export default {
 
     // construct data3d object
     var data3d = await getFloorData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

src/aframe/component/architecture-toolkit/kitchen.js

@@ -6,6 +6,7 @@ import updateSchema from './common/update-schema.js'
 import cloneDeep from 'lodash/cloneDeep'
 import getKitchenData3d from '../../../scene/structure/parametric-objects/kitchen'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -29,6 +30,7 @@ export default {
     // get meshes and materials
     // promise base because it loads external meshes
     var data3d = await getKitchenData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

src/aframe/component/architecture-toolkit/polyfloor.js

@@ -9,6 +9,7 @@ import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import cloneDeep from 'lodash/cloneDeep'
 import getPolyfloorData3d from '../../../scene/structure/parametric-objects/polyfloor'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -32,6 +33,7 @@ export default {
 
     // construct data3d object
     var data3d = await getPolyfloorData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

src/aframe/component/architecture-toolkit/railing.js

@@ -7,6 +7,7 @@ import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import cloneDeep from 'lodash/cloneDeep'
 import getRailingData3d from '../../../scene/structure/parametric-objects/railing'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -30,6 +31,7 @@ export default {
 
     // construct data3d object
     let data3d = await getRailingData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

src/aframe/component/architecture-toolkit/stairs.js

@@ -8,6 +8,7 @@ import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
 import getStairsData3d from '../../../scene/structure/parametric-objects/stairs'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -30,6 +31,7 @@ export default {
     attributes.materials = dataToMaterials(data)
 
     var data3d = await getStairsData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

src/aframe/component/architecture-toolkit/wall.js

@@ -8,6 +8,8 @@ import cloneDeep from 'lodash/cloneDeep'
 import getWallData3d from '../../../scene/structure/parametric-objects/wall'
 import getMaterial from '../../../scene/structure/parametric-objects/common/get-material.js'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
+
 export default {
 
   schema: getSchema('wall'),
@@ -87,6 +89,7 @@ export default {
 
     // get meshes and materials from el3d modules
     let data3d = await getWallData3d(attributes)
+    removeEmptyMeshes(data3d.meshes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

src/aframe/component/architecture-toolkit/window.js

@@ -6,6 +6,7 @@ import updateSchema from './common/update-schema.js'
 import cloneDeep from 'lodash/cloneDeep'
 import getWindowData3d from '../../../scene/structure/parametric-objects/window'
 import dataToMaterials from './common/data-to-materials'
+import removeEmptyMeshes from './common/remove-empty-meshes'
 
 export default {
 
@@ -58,6 +59,8 @@ export default {
 
     // construct data3d object
     let data3d = await getWindowData3d(attributes, parentAttributes)
+    removeEmptyMeshes(data3d.meshes)
+
     if (deleteGlass) delete data3d.meshes.glass
 
     // create new one

src/utils/data3d/buffer/get-normals.js

@@ -1,4 +1,4 @@
-var DEBUG = true
+var DEBUG = false
 
 // methods
 
@@ -124,4 +124,4 @@ var getNormalsBuffer = {
   smooth: smooth,
 }
 
-export default getNormalsBuffer
+export default getNormalsBuffer