diff --git a/js/cells/CubeCell.js b/js/cells/CubeCell.js index c73ca5c7f6cf520ba5a27777af33579604bb749b..f66b17bbf49eb605f2334069987cedffeaaa692e 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 661eb50773fa7409cd17d539fa4c3536e3594911..c233b4c52d0d7e174d5fda55e7852bc4f606b2d2 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 6af6054aa29fea44ae52573abebaec5f3d4ccab1..911043bf14775ae7b8355c2ea4cc975de38fac69 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 27d317edca55c18aeded21c2033f0845e8f41720..98278401711ebed6ec5d706b6def2997fbc26dcc 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 84e18e209f318da886acaba4c06cb4b0f06bc60b..245b5881c5757f27c9ec9c6351c8236f75403e3d 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 236d074cb0b4af4f369f54f85291f4fffbe18440..28aee99afcccd5e4ad922dac5f97d8f2bf1598e9 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 ba7c8d7b7e6b1924b1297386e085889869dd75b8..6231d0c68adf0c73ccd8a3aaa72e4701dfb54a95 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 fb26d2f026183b154393bc30a352d07130544fa5..597a2f8b61e7445d9dda9c2869a927c79d7b9cc5 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 ff86b89cb6469abac2fe0e266e1dbde44ca4f53e..bd04a9a09c48d6be0410740ad9dbf9fa9d73c58a 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 90986e716027c2219e1b84088c749c2761079ca9..c623bde0ee9d598c7b7e70fbc516def3a69a95db 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 9b60401461b3cbac782874a59cb1dd95aa702f76..c6fb5c7af06c86da7ad8fc06edf46f982ca2340c 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({