moved default material substitution before mesh generation

because kitchen is a special snowflake

Author: dominic

src/scene/structure/parametric-objects/closet.js

@@ -6,16 +6,18 @@
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 export default function(attributes) {
-    return Promise.all([
-      generateMeshes3d(attributes),
-      getMaterials3d(attributes.materials, getDefaultMaterials())
-    ]).then(results => ({
-      meshes: results[0],
-      materials: results[1]
-    }))
-  }
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
+  return Promise.all([
+    generateMeshes3d(attributes),
+    getMaterials3d(attributes.materials, getDefaultMaterials())
+  ]).then(results => ({
+    meshes: results[0],
+    materials: results[1]
+  }))
+}
 
 export function getDefaultMaterials(){
   return {

src/scene/structure/parametric-objects/column.js

@@ -5,16 +5,18 @@ import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import generatePolygonBuffer from '../../../utils/data3d/buffer/get-polygon'
 import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 export default function(attributes) {
-    return Promise.all([
-      generateMeshes3d(attributes),
-      getMaterials3d(attributes.materials, getDefaultMaterials())
-    ]).then(results => ({
-      meshes: results[0],
-      materials: results[1]
-    }))
-  }
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
+  return Promise.all([
+    generateMeshes3d(attributes),
+    getMaterials3d(attributes.materials, getDefaultMaterials())
+  ]).then(results => ({
+    meshes: results[0],
+    materials: results[1]
+  }))
+}
 
 export function getDefaultMaterials(){
   return {

src/scene/structure/parametric-objects/common/apply-default-materials.js

@@ -0,0 +1,20 @@
+'use strict';
+
+import cloneDeep from 'lodash/cloneDeep'
+
+// apply default material names to object in case material key is unset
+export default function(materials, defaults){
+
+  if (!defaults) {
+    console.error('No default materials set')
+    defaults={}
+  }
+
+  if (!materials) return Promise.resolve(cloneDeep(defaults))
+
+  Object.keys(defaults).forEach(function(d){
+    if (!materials[d]) materials[d]=defaults[d]
+  })
+
+  return materials
+}

src/scene/structure/parametric-objects/common/get-material.js

@@ -1,7 +1,9 @@
+'use strict';
+
 import cloneDeep from 'lodash/cloneDeep'
 import materialLibrary from './material-lib.js'
 
-export default function getMaterial(material) {
+export default function (material) {
   var STORAGE_URL = 'https://storage.3d.io/'
   var mat = materialLibrary[material]
 
@@ -18,4 +20,4 @@ export default function getMaterial(material) {
     }
   })
   return attr
-}
+}

src/scene/structure/parametric-objects/common/get-materials.js

@@ -1,15 +1,10 @@
+'use strict';
+
 import cloneDeep from 'lodash/cloneDeep'
 import materialLibrary from './material-lib.js'
 
-export default function getMaterials3d (materials, defaults) {
-  if (!defaults) {
-    console.error('No default materials set')
-    defaults={}
-  }
-  if (!materials) return Promise.resolve(cloneDeep(defaults))
-  Object.keys(defaults).forEach(function(d){
-    if (!materials[d]) materials[d]=defaults[d]
-  })
+// resolve standard materials if necessary
+export default function (materials, defaults) {
   Object.keys(materials).map(meshName => {
     if (typeof(materials[meshName])==="string") {
       materials[meshName]=getMaterial(materials[meshName])

src/scene/structure/parametric-objects/common/material-lib.js

@@ -1,3 +1,5 @@
+'use strict';
+
 export default {
   "basic-floor": {
     "meta": {

src/scene/structure/parametric-objects/door.js

@@ -3,8 +3,10 @@
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 export default function(attributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

src/scene/structure/parametric-objects/floor.js

@@ -5,8 +5,10 @@ import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 export default function(attributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

src/scene/structure/parametric-objects/kitchen.js

@@ -5,13 +5,15 @@ import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 import loadData3d from '../../../utils/data3d/load'
 
 export default function(attributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes),
-    getMaterials3d(attributes.materials, getDefaultMaterials())
+    getMaterials3d(attributes.materials)
   ]).then(results => ({
     meshes: results[0],
     materials: results[1]
@@ -35,11 +37,9 @@ export function getDefaultMaterials(){
   }
 }
 
-function generateMeshes3d (a) {
-  console.log('generateMeshes3d', a)
+export function generateMeshes3d (a) {
 
   // external meshes
-
   var externalMeshes = {
     singleSink: 'https://storage.3d.io/535e624259ee6b0200000484/170429-0355-60hukz/bf4e4a56-ed95-4b58-a214-4b1a0a84ae0e.gz.data3d.buffer',
     doubleSink: 'https://storage.3d.io/535e624259ee6b0200000484/170429-2156-7ufbnv/df481313-8fb4-48da-bc28-0369b08a2c6a.gz.data3d.buffer',

src/scene/structure/parametric-objects/polyfloor.js

@@ -6,9 +6,10 @@ import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import cloneDeep from 'lodash/cloneDeep'
 import getMaterials3d from './common/get-materials'
-
+import applyDefaultMaterials from './common/apply-default-materials'
 
 export default function(attributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

src/scene/structure/parametric-objects/railing.js

@@ -5,12 +5,13 @@ import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
-
 import sortBy from 'lodash/sortBy'
 import loadData3d from '../../../utils/data3d/load'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 
 export default function(attributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

src/scene/structure/parametric-objects/stairs.js

@@ -5,8 +5,10 @@ import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 export default function(attributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

src/scene/structure/parametric-objects/wall.js

@@ -5,11 +5,13 @@ import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 import sortBy from 'lodash/sortBy'
 import loadData3d from '../../../utils/data3d/load'
 
 export default function(attributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())
@@ -30,7 +32,7 @@ export function getDefaultMaterials(){
   }
 }
 
-function generateMeshes3d(a) {
+export function generateMeshes3d(a) {
   // get children
   var children = a.children
   children = sortBy(children, function (model) {

src/scene/structure/parametric-objects/window.js

@@ -3,8 +3,10 @@
 import generatePolygonBuffer from '../../../utils/data3d/buffer/get-polygon'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import getMaterials3d from './common/get-materials'
+import applyDefaultMaterials from './common/apply-default-materials'
 
 export default function(attributes, parentAttributes) {
+  attributes.materials = applyDefaultMaterials(attributes.materials, getDefaultMaterials());
   return Promise.all([
     generateMeshes3d(attributes, parentAttributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())