diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js index dcac5a1f139e517c441413557399cd586cc1c42d..fe1afb70f7ed689b10e70a872e0ec174d9cfa2c0 100644 --- a/js/menus/AssemblerMenuView.js +++ b/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; }, diff --git a/js/menus/templates/AssemblerMenuView.html b/js/menus/templates/AssemblerMenuView.html index cc872c16a1e5cfa8835162276fe774cd2900443c..bcb06f5451bfb25aa65686af3c27f63e20b2ca09 100644 --- a/js/menus/templates/AssemblerMenuView.html +++ b/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: <div class="btn-group"> <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allAssemblyStrategies[camStrategy] %><span class="caret"></span></button> diff --git a/js/three/ThreeModel.js b/js/three/ThreeModel.js index 23e4ae2f71bd2f7d3caab2d3cb00adc7b2e930cb..4c5bf8c661bbd6648d4058c01c29420ca25d82e2 100644 --- a/js/three/ThreeModel.js +++ b/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"