diff --git a/data/users/will.user b/data/users/will.user new file mode 100644 index 0000000000000000000000000000000000000000..35a8c66bb3b7698813dd29e066ff603b1e9cd6f7 --- /dev/null +++ b/data/users/will.user @@ -0,0 +1 @@ +{"lattice":{"units":"inches","scale":0.05,"cellSeparation":{"xy":0,"z":0},"cellType":"cube","connectionType":"gik", "partType":"lego"}} \ No newline at end of file diff --git a/index.html b/index.html index 5f6609a2058c31da8f05d95c23357a7f9cedd676..28ac011c379293bb54c41ad870a8152ce5570a46 100644 --- a/index.html +++ b/index.html @@ -121,6 +121,7 @@ <!--<li><a id="resetDefaultSettings" href="#">Reset Settings</a></li>--> <li><a data-file="ben.user" class="savedUserSettings" href="#">Ben</a></li> <li><a data-file="matt.user" class="savedUserSettings" href="#">Matt</a></li> + <li><a data-file="will.user" class="savedUserSettings" href="#">Will</a></li> <li><a class="importJSON" href="#">From File...</a></li> </ul> </li> diff --git a/js/fea/DMASuperCell.js b/js/fea/DMASuperCell.js index 8db6afc26fd5d8555abe63d6ab99569d38ae7566..2210bc15dd36dcb45e32b945b969f2a3afd21581 100644 --- a/js/fea/DMASuperCell.js +++ b/js/fea/DMASuperCell.js @@ -16,7 +16,6 @@ DMASuperCell = function(length, range, cells){ if (this.index.z %2 == 0) this.index.x -= cells.length/2.0-0.5; else this.index.y -= cells.length/2.0-0.5; } - this.cells = cells; this.setScale(); dmaGlobals.three.sceneAdd(this.mesh); diff --git a/js/models/ThreeModel.js b/js/models/ThreeModel.js index f416c2ee87ea64452d417bb6552d8373d5f43e02..9d6dd844dff3420bd9deb465bd0b451df15b16e1 100644 --- a/js/models/ThreeModel.js +++ b/js/models/ThreeModel.js @@ -5,7 +5,7 @@ function ThreeModel(){ - var camera = new THREE.PerspectiveCamera(60, window.innerWidth/window.innerHeight, 1, 10000); + var camera = new THREE.PerspectiveCamera(60, window.innerWidth/window.innerHeight, 0.001, 10000); var scene = new THREE.Scene(); var renderer = new THREE.WebGLRenderer({antialias:true});//antialiasing is not supported in ff and on mac+chrome