From 9cc574f267f537e561cc6422c256c34cd160671c Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 23 Jun 2015 16:57:55 -0700
Subject: [PATCH] eod
---
js/main.js | 3 +++
js/models/Globals.js | 2 +-
js/models/PList.js | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/js/main.js b/js/main.js
index 08418e1f..7a68e979 100644
--- a/js/main.js
+++ b/js/main.js
@@ -133,6 +133,9 @@ require.config({
setupCommMenuTemplate: 'menus/templates/SetupCommMenuView.html',
discoveryMenuTemplate: 'menus/templates/DiscoveryMenuView.html',
+ //cam
+ cam: 'cam/cam.js',
+
//assemblers
crab: 'cam/assemblers/crab',
diff --git a/js/models/Globals.js b/js/models/Globals.js
index 4d0060a4..0ca692a5 100644
--- a/js/models/Globals.js
+++ b/js/models/Globals.js
@@ -8,6 +8,6 @@ define([], function(){
return {
baseplane: null,
- highlighter: null,
+ highlighter: null
};
});
\ No newline at end of file
diff --git a/js/models/PList.js b/js/models/PList.js
index 9259fb32..6ac5e700 100644
--- a/js/models/PList.js
+++ b/js/models/PList.js
@@ -100,7 +100,7 @@ define(['three'], function(THREE){
allMaterialClasses:{
mechanical: "Structural",
electronic: "Electronic",
- space: "Space Structures"
+// space: "Space Structures"
},
allMaterials:{
--
GitLab