diff --git a/assets/stls/oneBitBot/basePlateTest.stl b/assets/stls/oneBitBot/basePlateTest.stl
new file mode 100644
index 0000000000000000000000000000000000000000..343b8acdd3219e238fbe5928ef6b731e4c65bc36
Binary files /dev/null and b/assets/stls/oneBitBot/basePlateTest.stl differ
diff --git a/js/cam/MachineOneBit.js b/js/cam/MachineOneBit.js
index 98ff1f01050f4e825624fc98d0e73cb3e2d91632..7dcceb1783d00d525c147ffc4de945a11bf1127e 100644
--- a/js/cam/MachineOneBit.js
+++ b/js/cam/MachineOneBit.js
@@ -11,7 +11,7 @@ OneBitBot.prototype._setDefaults = function(){
Machine.prototype._setDefaults.call(this);
dmaGlobals.assembler.set("stockFixed", true);
var scale = dmaGlobals.lattice.get("scale");
- dmaGlobals.assembler.set("stockPosition", {x:1.8*scale,y:0,z:1.1*scale});
+ dmaGlobals.assembler.set("stockPosition", {x:1.11*scale,y:0,z:1.14*scale});
dmaGlobals.assembler.set("rapidHeight", 2*scale);
};
@@ -31,14 +31,14 @@ OneBitBot.prototype.setMachinePosition = function(){
OneBitBot.prototype._buildMeshes = function(callback){
var meshes = [];
- var numMeshes = 13;
+ var numMeshes = 1;
function allLoaded(){
numMeshes -= 1;
return numMeshes <= 0;
}
function geometryScale(geometry){
- var unitScale = 0.05/2.78388;
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-200,-283.84,30));
+ var unitScale = 1/2.78388;
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-2052.46, 62.8567, -23.3891));
geometry.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale));
return geometry;
}
@@ -48,55 +48,58 @@ OneBitBot.prototype._buildMeshes = function(callback){
if (allLoaded()) callback(meshes);
}
var loader = new THREE.STLLoader();
- loader.load("assets/stls/oneBitBot/zAxis.stl", function(geometry){
- 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));
- meshPrep(geometryScale(geometry), "zDrive");
- });
- loader.load("assets/stls/oneBitBot/yAxisMount.stl", function(geometry){
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,0,0));
- meshPrep(geometryScale(geometry), "yAxisMount");
- });
- loader.load("assets/stls/oneBitBot/basePlate.stl", function(geometry){
+ loader.load("assets/stls/oneBitBot/basePlateTest.stl", function(geometry){
meshPrep(geometryScale(geometry), "basePlate");
});
- loader.load("assets/stls/oneBitBot/footMount1.stl", function(geometry){
- meshPrep(geometryScale(geometry), "footMount1");
- });
- loader.load("assets/stls/oneBitBot/footMount2.stl", function(geometry){
- meshPrep(geometryScale(geometry), "footMount2");
- });
- loader.load("assets/stls/oneBitBot/backFootMount.stl", function(geometry){
- meshPrep(geometryScale(geometry), "backFootMount");
- });
- loader.load("assets/stls/oneBitBot/foot1.stl", function(geometry){
- var height = 70;
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(406.45,301.77,height));
- var geometry2 = geometry.clone();
- geometry2.applyMatrix(new THREE.Matrix4().makeTranslation(0,-141.42,0));
- meshPrep(geometryScale(geometry), "foot1A");
- meshPrep(geometryScale(geometry2), "foot1B");
- });
- loader.load("assets/stls/oneBitBot/foot2.stl", function(geometry){
- var geometry1 = geometry.clone();
- geometry1.applyMatrix(new THREE.Matrix4().makeRotationZ(Math.PI));
- var height = 70;
- geometry1.applyMatrix(new THREE.Matrix4().makeTranslation(22.5,2,height));
- var geometry2 = geometry1.clone();
- geometry2.applyMatrix(new THREE.Matrix4().makeTranslation(142,0,0));
-
- var geometry3 = geometry.clone();
- geometry3.applyMatrix(new THREE.Matrix4().makeTranslation(35,450,height));
- var geometry4 = geometry3.clone();
- geometry4.applyMatrix(new THREE.Matrix4().makeTranslation(142,0,0));
- meshPrep(geometryScale(geometry1), "foot2A");
- meshPrep(geometryScale(geometry2), "foot2B");
- meshPrep(geometryScale(geometry3), "foot2C");
- meshPrep(geometryScale(geometry4), "foot2D");
- });
+// loader.load("assets/stls/oneBitBot/zAxis.stl", function(geometry){
+// 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));
+// meshPrep(geometryScale(geometry), "zDrive");
+// });
+// loader.load("assets/stls/oneBitBot/yAxisMount.stl", function(geometry){
+// geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,0,0));
+// meshPrep(geometryScale(geometry), "yAxisMount");
+// });
+// loader.load("assets/stls/oneBitBot/basePlate.stl", function(geometry){
+// meshPrep(geometryScale(geometry), "basePlate");
+// });
+// loader.load("assets/stls/oneBitBot/footMount1.stl", function(geometry){
+// meshPrep(geometryScale(geometry), "footMount1");
+// });
+// loader.load("assets/stls/oneBitBot/footMount2.stl", function(geometry){
+// meshPrep(geometryScale(geometry), "footMount2");
+// });
+// loader.load("assets/stls/oneBitBot/backFootMount.stl", function(geometry){
+// meshPrep(geometryScale(geometry), "backFootMount");
+// });
+// loader.load("assets/stls/oneBitBot/foot1.stl", function(geometry){
+// var height = 70;
+// geometry.applyMatrix(new THREE.Matrix4().makeTranslation(406.45,301.77,height));
+// var geometry2 = geometry.clone();
+// geometry2.applyMatrix(new THREE.Matrix4().makeTranslation(0,-141.42,0));
+// meshPrep(geometryScale(geometry), "foot1A");
+// meshPrep(geometryScale(geometry2), "foot1B");
+// });
+// loader.load("assets/stls/oneBitBot/foot2.stl", function(geometry){
+// var geometry1 = geometry.clone();
+// geometry1.applyMatrix(new THREE.Matrix4().makeRotationZ(Math.PI));
+// var height = 70;
+// geometry1.applyMatrix(new THREE.Matrix4().makeTranslation(22.5,2,height));
+// var geometry2 = geometry1.clone();
+// geometry2.applyMatrix(new THREE.Matrix4().makeTranslation(142,0,0));
+//
+// var geometry3 = geometry.clone();
+// geometry3.applyMatrix(new THREE.Matrix4().makeTranslation(35,450,height));
+// var geometry4 = geometry3.clone();
+// geometry4.applyMatrix(new THREE.Matrix4().makeTranslation(142,0,0));
+// meshPrep(geometryScale(geometry1), "foot2A");
+// meshPrep(geometryScale(geometry2), "foot2B");
+// meshPrep(geometryScale(geometry3), "foot2C");
+// meshPrep(geometryScale(geometry4), "foot2D");
+// });
};
OneBitBot.prototype._moveTo = function(x, y, z, speed, wcs, callback){
diff --git a/js/models/FillGeometry.js b/js/models/FillGeometry.js
index dd959eb24b21bbf006fd4bf9bf4ae4f3d7e4062c..c60123faebb62d84296b24150f6f26b00e09541b 100644
--- a/js/models/FillGeometry.js
+++ b/js/models/FillGeometry.js
@@ -42,7 +42,7 @@ FillGeometry = Backbone.Model.extend({
box.material.opacity = 0.4;
box.material.transparent = true;
this.set("boundingBox", box);
- dmaGlobals.three.sceneAdd(box);
+// dmaGlobals.three.sceneAdd(box);
},
fillGeo: function(){