Commit 00f618bb authored by Amanda Ghassaei's avatar Amanda Ghassaei

sim won't crash

parent 9a17158e
......@@ -144,6 +144,7 @@ require.config({
mSetupMenu: 'menus/MSetupMenuView',
mStaticMenu: 'menus/MStaticMenuView',
mDynamicMenu: 'menus/MDynamicMenuView',
dnaSetupMenu: 'menus/DNASimSetupMenuView',
assemblerSetupMenu: 'menus/AssemblerSetupMenuView',
editComponentMenu: 'menus/EditComponentMenuView',
commParentMenu: 'menus/CommParentMenu',
......
/**
* Created by aghassaei on 9/14/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!menus/templates/DNASimSetupMenuView.html'],
function($, _, MenuParentView, plist, lattice, template){
return MenuParentView.extend({
events: {
},
_initialize: function(){
},
_makeTemplateJSON: function(){
return {};
},
template: _.template(template)
});
});
\ No newline at end of file
nothing here yet
\ No newline at end of file
......@@ -199,7 +199,7 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'], fu
} else this.downKeys[e.keyCode] = false;
// console.log(e);
console.log(e.keyCode);
// console.log(e.keyCode);
switch(e.keyCode){
case 8://delete key - causes back nav in chrome, super annoying
e.preventDefault();
......
......@@ -46,6 +46,13 @@ define(['three'], function(THREE){
eDynamic:"Dynamics"
}
},
dnaNavSim:{
name: "DNA Simulation",
parent: "navSim",
tabs:{
dnaSetup: "Setup"
}
},
mechanicalNavSim:{
name: "Mechanical Simulation",
parent: "navSim",
......@@ -315,7 +322,7 @@ define(['three'], function(THREE){
}
},
hex: {
name: "Hexagonal",
name: "Honeycomb",
connection: {
face: {
name: "Face",
......@@ -368,13 +375,13 @@ define(['three'], function(THREE){
tension:{
name: "Tension",
color: "#aaa",
altColor: "#666",
altColor: "#70eee8",
properties:{}
},
compression: {
name: "Compression",
color: "#aaa",
altColor: "#8391AC",
altColor: "#f0c437",
properties:{}
}
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment