From 742e1af8f151489057c4309ce585468ecceaccba Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 9 Mar 2015 11:29:36 -0400
Subject: [PATCH] part type beam rotations set
---
js/menus/LatticeMenuView.js | 29 +++++++----------------------
js/models/AppState.js | 8 ++++----
2 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js
index dc629220..44ae8f2b 100644
--- a/js/menus/LatticeMenuView.js
+++ b/js/menus/LatticeMenuView.js
@@ -81,29 +81,14 @@ LatticeMenuView = Backbone.View.extend({
},
_setAppStateToDefaultsSilently: function(newCellType, newConnectionType){
- if (newCellType == "cube") {
- if (!newConnectionType){
- newConnectionType = "face";
- this.lattice.set("connectionType", newConnectionType, {silent:true});
- }
- this.model.set("connectionType", newConnectionType, {silent:true});
- if (newConnectionType == "face"){
- this.lattice.set("partType", null, {silent:true});
- }
- }
- else if (newCellType == "octa") {
- if (!newConnectionType){
- newConnectionType = "face";
- this.lattice.set("connectionType", newConnectionType, {silent:true});
- }
- if (newConnectionType == "face"){
- this.lattice.set("partType", "triangle", {silent:true});
- } else if (newConnectionType == "edge"){
- this.lattice.set("partType", "triangle", {silent:true});
- } else if (newConnectionType == "vertex"){
- this.lattice.set("partType", "square", {silent:true});
- }
+ if (!newConnectionType){
+ newConnectionType = "face";
+ this.lattice.set("connectionType", newConnectionType, {silent:true});
}
+ this.model.set("connectionType", newConnectionType, {silent:true});
+
+ var partType = _.keys(dmaGlobals.appState.get("allPartTypes")[newCellType][newConnectionType])[0];
+ this.lattice.set("partType", partType, {silent:true});
},
_changePreserveCells: function(e){
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 4af6c777..73a48e52 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -27,12 +27,12 @@ AppState = Backbone.Model.extend({
octa:{
face: {triangle:"Triangle", beam:"Beam"},
freeformFace: {triangle:"Triangle", beam:"Beam"},
- edge: {triangle:"Triangle", beam:"Beam"},
- edgeRot: {beam:"DmaBeam"},
- vertex: {square:"Square", xShape:"X", beam:"Beam"}
+ edge: {beam:"Beam", triangle:"Triangle"},
+ edgeRot: {beam:"Beam"},
+ vertex: {beam:"Beam", square:"Square", xShape:"X"}
},
cube:{
- face: null
+ face: {beam:"Beam"}
}
},
--
GitLab