diff --git a/index.html b/index.html index 2a48be00d9f17b13e33259bae1ffa82b00fb0164..4b00a34b85f3442cbe6e4e58ef579dfd85f02805 100644 --- a/index.html +++ b/index.html @@ -164,9 +164,9 @@ </li> <li><a data-menu-id="about" class="menuHoverControls" target="_blank" href="http://dma.cba.mit.edu/">About</a></li> </ul> - <ul class="nav navbar-nav pull-right"> - <li><a id="showHideMenu" href="#">Hide Menu >></a></li> - </ul> + <!--<ul class="nav navbar-nav pull-right">--> + <!--<li><a id="showHideMenu" href="#">Hide Menu >></a></li>--> + <!--</ul>--> </div><!-- /.navbar-collapse --> <input id="jsonInput" type="file"> diff --git a/js/cells/supercells/GIKSuperCell.js b/js/cells/supercells/GIKSuperCell.js index 9dd68f014e4496a6c27201723670262c6f0d146d..62b476758c4c3f3db1301f487918ca3a874779b0 100644 --- a/js/cells/supercells/GIKSuperCell.js +++ b/js/cells/supercells/GIKSuperCell.js @@ -6,12 +6,29 @@ var allGIKMaterials = {}; var gikMaterialList = AppPList().allMaterialTypes.cube.gik; _.each(_.keys(gikMaterialList), function(material){ allGIKMaterials[material] = new THREE.MeshLambertMaterial({color:gikMaterialList[material].color}); + if (gikMaterialList[material].opacity){ + allGIKMaterials[material].transparent = true; + allGIKMaterials[material].opacity = gikMaterialList[material].opacity; + } else { + allGIKMaterials[material].transparent = false; + } }); function changeGikMaterials(){ _.each(_.keys(allGIKMaterials), function(material){ - if (globals.appState.get("realisticColorScheme")) allGIKMaterials[material].color = new THREE.Color(gikMaterialList[material].color); - else allGIKMaterials[material].color = new THREE.Color(gikMaterialList[material].altColor); + if (globals.appState.get("realisticColorScheme")) { + allGIKMaterials[material].color = new THREE.Color(gikMaterialList[material].color); + if (gikMaterialList[material].opacity){ + allGIKMaterials[material].transparent = true; + allGIKMaterials[material].opacity = gikMaterialList[material].opacity; + } else { + allGIKMaterials[material].transparent = false; + } + } + else { + allGIKMaterials[material].color = new THREE.Color(gikMaterialList[material].altColor); + allGIKMaterials[material].transparent = false; + } }); } diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js index 95f62eb8e7c98e58a86eec7631151e244a5387f8..06b66528a903d3b36b5bca0f525253e037879346 100644 --- a/js/menus/Navbar.js +++ b/js/menus/Navbar.js @@ -36,11 +36,9 @@ NavBar = Backbone.View.extend({ _.bindAll(this, "_setMenuVisibility", "_setNavSelection"); - this.listenTo(this.model, "change:menuIsVisible", this._updateShowHideButton); this.listenTo(this.model, "change:currentNav", this._updateNavSelectionUI); this._logo(); - this._updateShowHideButton(); this._updateNavSelectionUI(); }, @@ -51,16 +49,6 @@ NavBar = Backbone.View.extend({ $(e.target).blur(); }, - _updateShowHideButton: function(){ - var $button = $("#showHideMenu"); - var state = this.model.get("menuIsVisible"); - if(state){ - $button.html("Hide Menu >>"); - } else { - $button.html("<< Show Menu"); - } - }, - _setNavSelection: function(e){ var navSelection = $(e.target).data("menuId"); if (navSelection == "about") { diff --git a/js/models/AllAppPLists.js b/js/models/AllAppPLists.js index cdf797cedef0d5df2b1d98a3e291d0698e345358..7eaedfa7bfd018e26f58e2fb118d9b766e6a6cf7 100644 --- a/js/models/AllAppPLists.js +++ b/js/models/AllAppPLists.js @@ -88,23 +88,42 @@ function AppPList(){ brass:{ name: "Brass", color: "#b5a642", - altColor: "#e67e22" + altColor: "#857B64" }, fiberGlass: { name: "Fiberglass", color: "#fef1b5", +// opacity: "0.9", altColor: "#ecf0f1" }, - carbonFiber: { - name: "Carbon Fiber", + carbon: { + name: "Carbon Composite", color: "#222", altColor: "#000" }, - silicon: { - name: "Silicon", + nType: { + name: "Silicon N-Type", color: "#bcc6cc", - altColor: "#3498db" + altColor: "#9CC9CB" + }, + nTypePlus: { + name: "Silicon Heavily Doped N-Type (N+)", + color: "#c6ccbc", + altColor: "#8391AC" + }, + pType: { + name: "Silicon P-Type", + color: "#ccbcc6", + altColor: "#F5447B" + }, + pTypePlus: { + name: "Silicon Heavily Doped P-Type (P+)", + color: "#ccc2bc", + altColor: "#F99987" } + //857B64 + //FDE2D9 + //D77948 } }, truncatedCube: {face: null},