diff --git a/js/main.js b/js/main.js index 4c47bc9622b49782e6309c53b8bb29cd458c39a1..b917a5049a5ea3523940b19929d22378134e9a5a 100644 --- a/js/main.js +++ b/js/main.js @@ -22,7 +22,7 @@ require.config({ fillGeometry: 'three/FillGeometry', //models - globals: 'models/globals', + globals: 'models/Globals', plist: 'models/PList', appState: 'models/AppState', fileSaver: 'models/FileSaver', @@ -76,7 +76,7 @@ require.config({ kelvinCell: 'cells/KelvinCell', cubeCell: 'cells/CubeCell', gikCell: 'cells/GIKCell', - superCell: 'cells/supercells/DMASupercell', + superCell: 'cells/supercells/DMASuperCell', gikSuperCell: 'cells/supercells/GIKSuperCell', compositeCell: "cells/supercells/CompositeCell", @@ -141,15 +141,15 @@ require.config({ //assemblers crab: 'cam/assemblers/crab', - //stls - octaFaceTrianglePartSTL: '../assets/stls/parts/OctaFaceTrianglePart.stl', - octaEdgeVoxPartSTL: '../assets/stls/parts/OctaEdgeVoxPart.stl', - octaEdgeVoxPartLowPolySTL: '../assets/stls/parts/OctaEdgeVoxPartLowPoly.stl', - gikPartSTL: '../assets/stls/parts/GIKPart.stl', - gikEndPartSTL: '../assets/stls/parts/GIKEndPart.stl', - gikPartLowPolySTL: '../assets/stls/parts/GIKPartLowPoly.stl', - gikEndPartLowPolySTL: '../assets/stls/parts/GIKEndPartLowPoly.stl', - crabSTL: '../assets/stls/crab/crab.stl' + //stls (not sure why ../ is not working here?) + octaFaceTrianglePartSTL: 'assets/stls/parts/OctaFaceTrianglePart.stl', + octaEdgeVoxPartSTL: 'assets/stls/parts/OctaEdgeVoxPart.stl', + octaEdgeVoxPartLowPolySTL: 'assets/stls/parts/OctaEdgeVoxPartLowPoly.stl', + gikPartSTL: 'assets/stls/parts/GIKPart.stl', + gikEndPartSTL: 'assets/stls/parts/GIKEndPart.stl', + gikPartLowPolySTL: 'assets/stls/parts/GIKPartLowPoly.stl', + gikEndPartLowPolySTL: 'assets/stls/parts/GIKEndPartLowPoly.stl', + crabSTL: 'assets/stls/crab/crab.stl' }, diff --git a/js/menus/templates/CompositeMenuView.html b/js/menus/templates/CompositeMenuView.html index 4f18c256a6597afe1e0c3beab2c8ee8ad22b7394..200f89b65293c25cbb904179728039c50052a38d 100644 --- a/js/menus/templates/CompositeMenuView.html +++ b/js/menus/templates/CompositeMenuView.html @@ -14,7 +14,7 @@ Available Materials:<br/> </label> <% }); %> <% _.each(_.keys(materials), function(key){ - <!--if (key == id || key.substr(0,5) != "super") return;--> + if (key == id || key.substr(0,5) != "super") return; <!--if (checkForLoops(key)) return;--> <!--function checkForLoops(_key){--> <!--console.log(materials[_key].compositeChildren);--> diff --git a/push.sh b/push.sh index 6fcdd1e4392f37f67719768eea383073805c2e64..be9ab0534919e0ad17dbb30fcb837b686e46d5fd 100755 --- a/push.sh +++ b/push.sh @@ -1,6 +1,6 @@ #!/bin/sh -cp -R ~/Research/WebApps/DMDesign ~/Projects/dma/Web/ +rsync -r -v --exclude=".*" ~/Research/WebApps/DMDesign ~/Projects/dma/Web/ cd ~/Projects/dma hg addremove .