z spacing

js/menus/LatticeMenuView.js

@@ -171,7 +171,7 @@ LatticeMenuView = Backbone.View.extend({
         <% } %>\
         <% if (connectionType == "gik") { %>\
         GIK Length:&nbsp;&nbsp;<input id="gikLength" value="<%= gikLength %>" placeholder="GIK length" class="form-control numberInput" type="text"><br/>\
-        <% } %>\
+        <br/><% } %>\
         <br/>\
         Scale:&nbsp;&nbsp;<input id="latticeScale" value="<%= scale %>" placeholder="enter scale" class="form-control numberInput" type="text"><br/>\
         <input id="scaleSlider" data-slider-id="ex1Slider" type="text" data-slider-min="1" data-slider-max="100" data-slider-step="0.1" data-slider-value="<%= scale %>"/>\

js/models/AppState.js

@@ -90,6 +90,29 @@ AppState = Backbone.Model.extend({
             kelvin: {face: null}
         },
 
+        allMaterialTypes:{
+            octa:{
+                face: null,
+                freeformFace: null,
+                edge: null,
+                edgeRot: null,
+                vertex: null//{
+                    //beam:"Beam",
+//                    square:"Square",
+//                    xShape:"X"
+//                }
+            },
+            tetra: {vertex: null},
+            cube: {face: null,
+                gik: {
+                    brass:"Brass",
+                    fiberGlass: "Fiberglass"
+                }
+            },
+            truncatedCube: {face: null},
+            kelvin: {face: null}
+        },
+
         allMachineTypes:{
             octa:{
                 face: {handOfGod: "Hand of God"},

js/models/LatticeOther.js

@@ -80,7 +80,7 @@ OtherLatticeSubclasses = {
 
         zScale: function(scale){
             if (!scale) scale = this.get("scale");
-            return scale*(1+2*this.get("cellSeparation").z);
+            return 1.28*scale*(1+2*this.get("cellSeparation").z);
         },
 
         makeCellForLatticeType: function(indices, scale){

js/threeViews/Highlighter.js

@@ -236,6 +236,7 @@ GIKHighlighter = Highlighter.extend({
 
     updateGikLength: function(scale){
         this.updateScale(scale);
+        if (!this.direction) return;
         this._setPosition(this.position, this.direction);//position of center point
         this._setRotation(this.direction, this.index);
         dmaGlobals.three.render();