Skip to content
Snippets Groups Projects
Commit 01306f69 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

will user settings

parent f5b9cd26
Branches
No related tags found
No related merge requests found
{"lattice":{"units":"inches","scale":0.05,"cellSeparation":{"xy":0,"z":0},"cellType":"cube","connectionType":"gik", "partType":"lego"}}
\ No newline at end of file
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
<!--<li><a id="resetDefaultSettings" href="#">Reset Settings</a></li>--> <!--<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="ben.user" class="savedUserSettings" href="#">Ben</a></li>
<li><a data-file="matt.user" class="savedUserSettings" href="#">Matt</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> <li><a class="importJSON" href="#">From File...</a></li>
</ul> </ul>
</li> </li>
......
...@@ -16,7 +16,6 @@ DMASuperCell = function(length, range, cells){ ...@@ -16,7 +16,6 @@ DMASuperCell = function(length, range, cells){
if (this.index.z %2 == 0) this.index.x -= cells.length/2.0-0.5; 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; else this.index.y -= cells.length/2.0-0.5;
} }
this.cells = cells; this.cells = cells;
this.setScale(); this.setScale();
dmaGlobals.three.sceneAdd(this.mesh); dmaGlobals.three.sceneAdd(this.mesh);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
function ThreeModel(){ 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 scene = new THREE.Scene();
var renderer = new THREE.WebGLRenderer({antialias:true});//antialiasing is not supported in ff and on mac+chrome var renderer = new THREE.WebGLRenderer({antialias:true});//antialiasing is not supported in ff and on mac+chrome
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment