From daf5c8caa45a09834fac4b72c17ba410bd104ffb Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Wed, 3 Jun 2015 15:00:18 -0700 Subject: [PATCH] more dependencies --- js/cells/CubeCell.js | 3 ++- js/cells/DMACell.js | 3 ++- js/cells/KelvinCell.js | 3 ++- js/cells/OctaEdgeCell.js | 3 ++- js/cells/OctaFaceCell.js | 3 ++- js/cells/OctaRotEdgeCell.js | 3 ++- js/cells/OctaVertexCell.js | 3 ++- js/cells/TetraEdgeCell.js | 3 ++- js/cells/TetraFaceCell.js | 3 ++- js/cells/TruncatedCubeCell.js | 3 ++- js/three/ThreeView.js | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/js/cells/CubeCell.js b/js/cells/CubeCell.js index c73ca5c7..f66b17bb 100644 --- a/js/cells/CubeCell.js +++ b/js/cells/CubeCell.js @@ -3,7 +3,8 @@ */ -define(['cell'], function(DMACell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], + function(_, THREE, three, lattice, appState, DMACell){ var unitCellGeo = new THREE.BoxGeometry(1,1,1); diff --git a/js/cells/DMACell.js b/js/cells/DMACell.js index 661eb507..c233b4c5 100644 --- a/js/cells/DMACell.js +++ b/js/cells/DMACell.js @@ -3,7 +3,8 @@ */ -define(['three', 'threeModel', 'lattice', 'appState'], function(THREE, three, lattice, appState){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState'], + function(_, THREE, three, lattice, appState){ var cellMaterial = new THREE.MeshNormalMaterial(); var wireframeMaterial = new THREE.MeshBasicMaterial({color:0x000000, wireframe:true}); diff --git a/js/cells/KelvinCell.js b/js/cells/KelvinCell.js index 6af6054a..911043bf 100644 --- a/js/cells/KelvinCell.js +++ b/js/cells/KelvinCell.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['truncatedCubeCell'], function(TruncatedCubeCell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'truncatedCubeCell'], + function(_, THREE, three, lattice, appState, TruncatedCubeCell){ var truncOctaRad = Math.sqrt(2); var pyrRad = 1/Math.sqrt(2); diff --git a/js/cells/OctaEdgeCell.js b/js/cells/OctaEdgeCell.js index 27d317ed..98278401 100644 --- a/js/cells/OctaEdgeCell.js +++ b/js/cells/OctaEdgeCell.js @@ -3,7 +3,8 @@ */ -define(['octaFaceCell'], function(OctaFaceCell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'octaFaceCell'], + function(_, THREE, three, lattice, appState, OctaFaceCell){ function OctaEdgeCell(index, superCell){ OctaFaceCell.call(this, index, superCell); diff --git a/js/cells/OctaFaceCell.js b/js/cells/OctaFaceCell.js index 84e18e20..245b5881 100644 --- a/js/cells/OctaFaceCell.js +++ b/js/cells/OctaFaceCell.js @@ -3,7 +3,8 @@ */ -define(['cell'], function(DMACell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], + function(_, THREE, three, lattice, appState, DMACell){ var unitGeo = new THREE.OctahedronGeometry(1/Math.sqrt(2)); unitGeo.applyMatrix(new THREE.Matrix4().makeRotationZ(-3*Math.PI/12)); diff --git a/js/cells/OctaRotEdgeCell.js b/js/cells/OctaRotEdgeCell.js index 236d074c..28aee99a 100644 --- a/js/cells/OctaRotEdgeCell.js +++ b/js/cells/OctaRotEdgeCell.js @@ -3,7 +3,8 @@ */ -define(['cell'], function(DMACell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], + function(_, THREE, three, lattice, appState, DMACell){ var unitGeo = new THREE.OctahedronGeometry(1/Math.sqrt(2)); diff --git a/js/cells/OctaVertexCell.js b/js/cells/OctaVertexCell.js index ba7c8d7b..6231d0c6 100644 --- a/js/cells/OctaVertexCell.js +++ b/js/cells/OctaVertexCell.js @@ -3,7 +3,8 @@ */ -define(['cell'], function(DMACell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], + function(_, THREE, three, lattice, appState, DMACell){ function OctaVertexCell(index, superCell){ DMACell.call(this, index, superCell); diff --git a/js/cells/TetraEdgeCell.js b/js/cells/TetraEdgeCell.js index fb26d2f0..597a2f8b 100644 --- a/js/cells/TetraEdgeCell.js +++ b/js/cells/TetraEdgeCell.js @@ -3,7 +3,8 @@ */ -define(['tetraFaceCell'], function(TetraFaceCell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'tetraFaceCell'], + function(_, THREE, three, lattice, appState, TetraFaceCell){ function TetraEdgeCell(index, superCell){ TetraFaceCell.call(this, index, superCell); diff --git a/js/cells/TetraFaceCell.js b/js/cells/TetraFaceCell.js index ff86b89c..bd04a9a0 100644 --- a/js/cells/TetraFaceCell.js +++ b/js/cells/TetraFaceCell.js @@ -3,7 +3,8 @@ */ -define(['cell'], function(DMACell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], + function(_, THREE, three, lattice, appState, DMACell){ var unitGeo = new THREE.TetrahedronGeometry(Math.sqrt(3/8)); unitGeo.applyMatrix(new THREE.Matrix4().makeRotationZ(Math.PI/4)); diff --git a/js/cells/TruncatedCubeCell.js b/js/cells/TruncatedCubeCell.js index 90986e71..c623bde0 100644 --- a/js/cells/TruncatedCubeCell.js +++ b/js/cells/TruncatedCubeCell.js @@ -3,7 +3,8 @@ */ -define(['cell'], function(DMACell){ +define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], + function(_, THREE, three, lattice, appState, DMACell){ var truncCubeRad = Math.sqrt(2)/2; var unitGeo = new THREE.Geometry(); diff --git a/js/three/ThreeView.js b/js/three/ThreeView.js index 9b604014..c6fb5c7a 100644 --- a/js/three/ThreeView.js +++ b/js/three/ThreeView.js @@ -2,7 +2,8 @@ * Created by aghassaei on 1/16/15. */ -define(['underscore', 'backbone', 'three', 'appState', 'globals', 'orbitControls'], function(_, Backbone, THREE, appState, globals){ +define(['underscore', 'backbone', 'three', 'appState', 'globals', 'orbitControls'], + function(_, Backbone, THREE, appState, globals){ return Backbone.View.extend({ -- GitLab