diff --git a/js/main.js b/js/main.js index 08418e1fabf98c5257e5f113dbf1afbff4543f1d..7a68e979d35c2e296b034ea4765672dce63d24f9 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 4d0060a466dd9fa089c72fe035a7bad2f692c476..0ca692a552aa6bb3893bb5a8ccd5cac866c4cfb8 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 9259fb3293a06c4e0175063072af16820962f64f..6ac5e700d3f687c88d3378e4dfc562ade18ee45d 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:{