From 63046fe63587b0ed1f1e54a0857c827688171e2d Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 15 Jun 2015 19:51:01 -0700
Subject: [PATCH] removing ui that is more confusing than useful
---
js/lattice/LatticeBase.js | 1 -
js/menus/MaterialMenuView.js | 4 ++++
js/models/PList.js | 22 +++++++++++-----------
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/js/lattice/LatticeBase.js b/js/lattice/LatticeBase.js
index 632e4384..ae3f3395 100644
--- a/js/lattice/LatticeBase.js
+++ b/js/lattice/LatticeBase.js
@@ -125,7 +125,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
},
addCellAtIndex: function(index, noRender, noCheck, material){//no render no check from fill/load
- console.log(this.sparseCells);
if (!noCheck || noCheck === undefined) this.checkForMatrixExpansion(this.sparseCells, index, index);
diff --git a/js/menus/MaterialMenuView.js b/js/menus/MaterialMenuView.js
index eee16c25..936da934 100644
--- a/js/menus/MaterialMenuView.js
+++ b/js/menus/MaterialMenuView.js
@@ -68,6 +68,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals'], fu
<% } %>\
<br/>\
Composite Materials:<br/>\
+ <% if ((cellType == "octa" && connectionType != "vertex") || cellType == "tetra"){ %>\
+ not available for this lattice type\
+ <% } else { %> \
<% _.each(_.keys(materials.compositeMaterials), function(key){ %>\
<label class="radio colorSwatches">\
<input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio lattice"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>\
@@ -78,6 +81,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals'], fu
<% }); %><br/>\
<a id="navToCompositeMenu" href="#" class="btn btn-block btn-lg btn-default">+ Create New Composite Material</a><br/>\
<a id="compositeFromLattice" href="#" class="btn btn-block btn-lg btn-default">New Composite From Current Assembly</a><br/>\
+ <% } %>\
')
});
diff --git a/js/models/PList.js b/js/models/PList.js
index 680bbeb3..b67c7f75 100644
--- a/js/models/PList.js
+++ b/js/models/PList.js
@@ -38,7 +38,7 @@ define(['three'], function(THREE){
kelvin:"Kelvin"
},
allConnectionTypes: {
- octa: {face:"Face", edge:"Edge", edgeRot:"Edge (Rotated)", vertex:"Vertex"},// freeformFace:"Freeform Face"
+ octa: {face:"Face", edgeRot:"Edge", vertex:"Vertex"},// freeformFace:"Freeform Face" edge:"Edge", (Rotated)
tetra: {stacked: "Stacked"},//vertex: "Vertex"
cube: {face:"Face", gik: "GIK"},
truncatedCube: {face:"Face"},
@@ -52,25 +52,25 @@ define(['three'], function(THREE){
edge: null,
edgeRot: {
vox: "Snap Voxel (high res)",
- voxLowPoly: "Snap Voxel (low res)"
+ voxLowPoly: "Snap Voxel (low res)"
},
- vertex: {
- square:"Square",
- xShape:"X"
- }
+ vertex: null,//{
+// square:"Square",
+// xShape:"X"
+// }
},
tetra: {vertex: null},
cube: {face: null,
gik: {
lego: "Micro LEGO (high res)",
- legoLowPoly: "Micro LEGO (low res)"
+ legoLowPoly: "Micro LEGO (low res)"
}
},
truncatedCube: {
- face: {
- square:"Square",
- xShape:"X"
- }
+ face: null,//{
+// square:"Square",
+// xShape:"X"
+// }
},
kelvin: {face: null}
},
--
GitLab