cleaned up imports a little and removed default function names

Author: dominic

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

@@ -6,7 +6,7 @@ import updateSchema from './common/update-schema.js'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
-import closetData3d from '../../../scene/structure/parametric-objects/closet'
+import getClosetData3d from '../../../scene/structure/parametric-objects/closet'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -28,7 +28,7 @@ export default {
 
     attributes.materials = dataToMaterials(data)
 
-    closetData3d(attributes)
+    getClosetData3d(attributes)
     .then(data3d => {
 
       // create new one

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

@@ -6,7 +6,7 @@ import updateSchema from './common/update-schema.js'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
-import columnData3d from '../../../scene/structure/parametric-objects/column'
+import getColumnData3d from '../../../scene/structure/parametric-objects/column'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -28,10 +28,10 @@ export default {
     var attributes = cloneDeep(data)
 
     attributes.materials = dataToMaterials(data)
-    
+
     // construct data3d object
 
-    var data3d = columnData3d(attributes)
+    var data3d = getColumnData3d(attributes)
     .then(data3d => {
       // create new one
       this_.mesh = new THREE.Object3D()

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

@@ -5,7 +5,7 @@ import getMaterial from '../../../scene/structure/parametric-objects/common/get-
 import updateSchema from './common/update-schema.js'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import cloneDeep from 'lodash/cloneDeep'
-import doorData3d from '../../../scene/structure/parametric-objects/door'
+import getDoorData3d from '../../../scene/structure/parametric-objects/door'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -53,7 +53,7 @@ export default {
     attributes.materials = dataToMaterials(data)
 
     // construct data3d object
-    var data3d = await doorData3d(attributes)
+    var data3d = await getDoorData3d(attributes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

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

@@ -5,7 +5,7 @@
 import getSchema from './common/get-schema.js'
 import updateSchema from './common/update-schema.js'
 import cloneDeep from 'lodash/cloneDeep'
-import floorData3d from '../../../scene/structure/parametric-objects/floor'
+import getFloorData3d from '../../../scene/structure/parametric-objects/floor'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -29,7 +29,7 @@ export default {
     attributes.materials = dataToMaterials(data)
 
     // construct data3d object
-    var data3d = await floorData3d(attributes)
+    var data3d = await getFloorData3d(attributes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

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

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

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

@@ -7,7 +7,7 @@ import generatePolygonBuffer from '../../../utils/data3d/buffer/get-polygon'
 import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import cloneDeep from 'lodash/cloneDeep'
-import polyfloorData3d from '../../../scene/structure/parametric-objects/polyfloor'
+import getPolyfloorData3d from '../../../scene/structure/parametric-objects/polyfloor'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -31,7 +31,7 @@ export default {
     attributes.materials = dataToMaterials(data)
 
     // construct data3d object
-    var data3d = await polyfloorData3d(attributes)
+    var data3d = await getPolyfloorData3d(attributes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

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

@@ -5,7 +5,7 @@ import getMaterial from '../../../scene/structure/parametric-objects/common/get-
 import updateSchema from './common/update-schema.js'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import cloneDeep from 'lodash/cloneDeep'
-import wallRailing3d from '../../../scene/structure/parametric-objects/railing'
+import getRailingData3d from '../../../scene/structure/parametric-objects/railing'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -29,7 +29,7 @@ export default {
     attributes.materials = dataToMaterials(data)
 
     // construct data3d object
-    let data3d = await wallRailing3d(attributes)
+    let data3d = await getRailingData3d(attributes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

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

@@ -6,7 +6,7 @@ import updateSchema from './common/update-schema.js'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
-import stairsData3d from '../../../scene/structure/parametric-objects/stairs'
+import getStairsData3d from '../../../scene/structure/parametric-objects/stairs'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -29,7 +29,7 @@ export default {
 
     attributes.materials = dataToMaterials(data)
 
-    var data3d = await stairsData3d(attributes)
+    var data3d = await getStairsData3d(attributes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

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

@@ -5,7 +5,7 @@ import updateSchema from './common/update-schema.js'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
-import wallData3d from '../../../scene/structure/parametric-objects/wall'
+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'
 export default {
@@ -86,7 +86,7 @@ export default {
     attributes.materials = dataToMaterials(data)
 
     // get meshes and materials from el3d modules
-    let data3d = await wallData3d(attributes)
+    let data3d = await getWallData3d(attributes)
 
     // create new one
     this_.mesh = new THREE.Object3D()

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

@@ -4,7 +4,7 @@ import getSchema from './common/get-schema.js'
 import getMaterial from '../../../scene/structure/parametric-objects/common/get-material.js'
 import updateSchema from './common/update-schema.js'
 import cloneDeep from 'lodash/cloneDeep'
-import windowData3d from '../../../scene/structure/parametric-objects/window'
+import getWindowData3d from '../../../scene/structure/parametric-objects/window'
 import dataToMaterials from './common/data-to-materials'
 
 export default {
@@ -57,7 +57,7 @@ export default {
     attributes.materials = dataToMaterials(data);
 
     // construct data3d object
-    let data3d = await windowData3d(attributes, parentAttributes)
+    let data3d = await getWindowData3d(attributes, parentAttributes)
     if (deleteGlass) delete data3d.meshes.glass
 
     // create new one

src/scene/structure/apply-defaults.js

@@ -35,5 +35,6 @@ export default function applyDefaults(element3d) {
       else if (defaultVal !== undefined) element3d[key] = defaultVal
     }
   })
+
   return element3d
 }

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

@@ -7,7 +7,7 @@ import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
 
-export default function getData3d(attributes) {
+export default function(attributes) {
     return Promise.all([
       generateMeshes3d(attributes),
       getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -6,7 +6,7 @@ import generatePolygonBuffer from '../../../utils/data3d/buffer/get-polygon'
 import generateExtrusionBuffer from '../../../utils/data3d/buffer/get-extrusion'
 import getMaterials3d from './common/get-materials'
 
-export default function getData3d(attributes) {
+export default function(attributes) {
     return Promise.all([
       generateMeshes3d(attributes),
       getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -4,7 +4,7 @@ import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
 
-export default function getData3d(attributes) {
+export default function(attributes) {
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -6,7 +6,7 @@ import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import getMaterials3d from './common/get-materials'
 
-export default function getData3d(attributes) {
+export default function(attributes) {
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -8,7 +8,7 @@ import getMaterials3d from './common/get-materials'
 
 import loadData3d from '../../../utils/data3d/load'
 
-export default function getData3d(attributes) {
+export default function(attributes) {
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())
@@ -36,6 +36,7 @@ export function getDefaultMaterials(){
 }
 
 function generateMeshes3d (a) {
+  console.log('generateMeshes3d', a)
 
   // external meshes
 
@@ -56,7 +57,7 @@ function generateMeshes3d (a) {
     oven = a.ovenType !== 'none',
     cooktop = a.cooktopType !== 'none',
     microwave = a.microwave,
-    largeCooktop = cooktop && a.cooktopType.slice(-2) === '90',
+    largeCooktop = (cooktop!=='none') && (a.cooktopType.slice(-2) === '90'),
     cabinetType = a.cabinetType
 
   // config

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

@@ -8,7 +8,7 @@ import cloneDeep from 'lodash/cloneDeep'
 import getMaterials3d from './common/get-materials'
 
 
-export default function getData3d(attributes) {
+export default function(attributes) {
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -10,7 +10,7 @@ import sortBy from 'lodash/sortBy'
 import loadData3d from '../../../utils/data3d/load'
 
 
-export default async function getData3d(attributes) {
+export default function(attributes) {
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -6,7 +6,7 @@ import generateUvs from '../../../utils/data3d/buffer/get-uvs'
 import cloneDeep from 'lodash/cloneDeep'
 import getMaterials3d from './common/get-materials'
 
-export default function getData3d(attributes) {
+export default function(attributes) {
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -9,7 +9,7 @@ import getMaterials3d from './common/get-materials'
 import sortBy from 'lodash/sortBy'
 import loadData3d from '../../../utils/data3d/load'
 
-export default async function getData3d(attributes) {
+export default function(attributes) {
   return Promise.all([
     generateMeshes3d(attributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

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

@@ -4,7 +4,7 @@ import generatePolygonBuffer from '../../../utils/data3d/buffer/get-polygon'
 import generateNormals from '../../../utils/data3d/buffer/get-normals'
 import getMaterials3d from './common/get-materials'
 
-export default async function getData3d(attributes, parentAttributes) {
+export default function(attributes, parentAttributes) {
   return Promise.all([
     generateMeshes3d(attributes, parentAttributes),
     getMaterials3d(attributes.materials, getDefaultMaterials())

test/scene/structure/apply-defaults.js

@@ -9,4 +9,4 @@ test('applyDefaults', () => {
   expect(_el3d.h).toBe(2.4)
   expect(_el3d.x).toBe(0)
   expect(_el3d.children).toEqual([])
-});
+});