diff --git a/css/main.css b/css/main.css index 4bb5b8061e7cadaf79b63b3975fa9039c79e1896..e63ed42279f29d82093d9a2bd03721520ffa6e72 100644 --- a/css/main.css +++ b/css/main.css @@ -82,13 +82,13 @@ nav .btn { /*menus*/ #menuWrapper { - width: 420px; + width: 430px; height: 100%; z-index: 1; position: absolute; display: block; background-color: rgba(255,255,255,0.8); - right: -420px;/*initially hidden*/ + right: -430px;/*initially hidden*/ overflow:hidden; } diff --git a/js/cam/MachineOneBit.js b/js/cam/MachineOneBit.js index b698abcbcc9ae1d01be381f9ac7c13311c138f47..e3d160acadc8cfa3f8279f812a1e0b704f8a03cd 100644 --- a/js/cam/MachineOneBit.js +++ b/js/cam/MachineOneBit.js @@ -30,7 +30,7 @@ OneBitBot.prototype._buildMeshes = function(callback){ } function geometryScale(geometry){ var unitScale = 0.05/2.78388; - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-200,-283.84,0)); + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-200,-283.84,30)); geometry.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale)); return geometry; } @@ -41,11 +41,11 @@ OneBitBot.prototype._buildMeshes = function(callback){ } var loader = new THREE.STLLoader(); loader.load("assets/stls/oneBitBot/zAxis.stl", function(geometry){ - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,-20.16,-55.37)); + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,-20.16,-85.37)); meshPrep(geometryScale(geometry), "zAxis"); }); loader.load("assets/stls/oneBitBot/zDrive.stl", function(geometry){ - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,-20.16,0)); + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,-20.16,-0)); meshPrep(geometryScale(geometry), "zDrive"); }); loader.load("assets/stls/oneBitBot/yAxisMount.stl", function(geometry){ diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 0212c9d2a8c847838cf5de790df382c8576291d3..eb10c2933c1357d9b73ff0cdda424be3df3c90ac 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -111,7 +111,7 @@ MenuWrapper = Backbone.View.extend({ }, _hide: function(callback, suppressModelUpdate){ - this.$el.parent().animate({right: "-420"}, {done: callback}); + this.$el.parent().animate({right: "-430"}, {done: callback}); if (!suppressModelUpdate) this.model.set("menuIsVisible", false); },