diff --git a/js/materials/DMAMaterials.js b/js/materials/DMAMaterials.js index 34ed4c23d1a3ff9794cfe168ff2ab173383d3080..801b8176c75c4b071311be24be8217f58f5cfed0 100644 --- a/js/materials/DMAMaterials.js +++ b/js/materials/DMAMaterials.js @@ -209,7 +209,6 @@ define(['underscore', 'three', 'appState', 'lattice', 'plist', 'threeModel'], fu } function makeMaterialObject(color, transparent){ -// return new THREE.MeshNormalMaterial({shading:THREE.FlatShading}); if (transparent) return new THREE.MeshLambertMaterial({color:color, shading:THREE.FlatShading, transparent: true, opacity:0.1}); return new THREE.MeshLambertMaterial({color:color, shading:THREE.FlatShading}); } @@ -225,7 +224,7 @@ define(['underscore', 'three', 'appState', 'lattice', 'plist', 'threeModel'], fu } return { - list:materialsList, + list: materialsList, setMaterial: setMaterial, getCompositeKeys: getCompositeKeys, getVaildAvailableCompositeKeys: getVaildAvailableCompositeKeys, diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 17f8b42d2e68d4ae3d0ccba64b55d3686a4665d5..7322e9cca7fae905aa270789a51dab821be0ac1e 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -185,7 +185,6 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex return; } if (key){ - console.log(this._getOwnerProperty(owner, property)); var propObject = this._getOwnerProperty(owner, property).clone(); propObject[key] = newVal; this._setOwnerProperty(owner, property, propObject); diff --git a/js/menus/templates/ESetupMenuView.html b/js/menus/templates/ESetupMenuView.html index 80aaea56b2cd7a8e0570d65a8e0ad0dc08a855e6..7bc4f4133c0bb581752f6463a2d1d4f3c986e589 100644 --- a/js/menus/templates/ESetupMenuView.html +++ b/js/menus/templates/ESetupMenuView.html @@ -13,7 +13,7 @@ Simulation Type: <% if(conductorGroups.length > 0){ %> <label class="radio"> <input type="radio" <% if (visibleConductorGroup < 0){ %>checked<% } %> name="visibleConductorGroup" value="-1" data-toggle="radio" class="custom-radio eSim"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span> - Show All + Show All Conducting Groups </label> <% _.each(conductorGroups, function(groupNum, index){ %> <label class="radio"> diff --git a/js/parts/DMAPart.js b/js/parts/DMAPart.js index de0a14a553445b65a0c67686d30ea31c50623fb8..9efd36d3122b7e82c19b2beac0e99f54c5025250 100644 --- a/js/parts/DMAPart.js +++ b/js/parts/DMAPart.js @@ -28,7 +28,6 @@ define(['underscore', 'three'], function(_, THREE){ }; DMAPart.prototype.getMaterial = function(returnTHREEObject){ -// return new THREE.MeshLambertMaterial({color:'#aaaaaa', shading:THREE.FlatShading}); return this.parentCell.getMaterial(returnTHREEObject); }; diff --git a/js/plists/PList.js b/js/plists/PList.js index 06c9a73a0d19236031680e9e6aba3f14944e2450..ce4a2f22a2165c9f8bade5cf6bdad42a950087c2 100644 --- a/js/plists/PList.js +++ b/js/plists/PList.js @@ -17,8 +17,7 @@ define(['three'], function(THREE){ electronicNavSim:{ eSetup:"Connectivity", eStatic:"Statics", - eDynamic:"Dynamics", - optimize:"Optimize" + eDynamic:"Dynamics" }, mechanicalNavSim:{ mSetup:"Setup",