From 01306f690dd2081e364a58f050ac002be58e7cc2 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 18 May 2015 22:05:07 -0400
Subject: [PATCH] will user settings
---
data/users/will.user | 1 +
index.html | 1 +
js/fea/DMASuperCell.js | 1 -
js/models/ThreeModel.js | 2 +-
4 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 data/users/will.user
diff --git a/data/users/will.user b/data/users/will.user
new file mode 100644
index 00000000..35a8c66b
--- /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 5f6609a2..28ac011c 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 8db6afc2..2210bc15 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 f416c2ee..9d6dd844 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
--
GitLab