machine type flags

js/menus/AssemblerMenuView.js

@@ -18,6 +18,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice', 'text!a
 
         getPropertyOwner: function($target){
             if ($target.hasClass("assembler")) return cam;
+            if ($target.hasClass("machine")) return plist.allMachines[cam.get("machineName")];
             return null;
         },
     

js/menus/templates/AssemblerMenuView.html

@@ -6,7 +6,15 @@ Machine:   
                 <li><a class="assembler dropdownSelector" data-property="machineName" data-value="<%= machine %>" href="#"><%= allMachines[machine].name %></a></li>
             <% }); %>
         </ul>
-    </div><br/><br/>
+    </div><br/>
+    <label class="checkbox" for="relativeAssembler">
+        <input id="relativeAssembler" data-property="relative" type="checkbox" <% if (allMachines[machineName].relative){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="machine custom-checkbox">
+        <span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
+        Relative Assembler</label>
+    <label class="checkbox" for="stockAttached">
+        <input id="stockAttached" data-property="shouldPickUpStock" type="checkbox" <% if (allMachines[machineName].shouldPickUpStock){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="machine custom-checkbox">
+        <span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
+        Separate Stock Position</label><br/>
 Strategy: &nbsp;&nbsp;
     <div class="btn-group">
         <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allAssemblyStrategies[camStrategy] %><span class="caret"></span></button>

js/three/ThreeModel.js

@@ -24,8 +24,8 @@ define(['underscore', 'three'], function(_, THREE){
 
     function initialize(){
 
-        camera.position.x = 15;
-        camera.position.y = 12;
+        camera.position.x = -15;
+        camera.position.y = -12;
         camera.position.z = 12;
         camera.up.set(0,0,1);//set z axis as "up"