diff --git a/assets/stls/oneBitBot/backFootMount.stl b/assets/stls/oneBitBot/backFootMount.stl
deleted file mode 100644
index 95511276da016870ea4c8ffe79404478a4f652b1..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/backFootMount.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/backYAxis.stl b/assets/stls/oneBitBot/backYAxis.stl
new file mode 100644
index 0000000000000000000000000000000000000000..a70db4132bb987b1a7c4dfe74e6eb152ac72815e
Binary files /dev/null and b/assets/stls/oneBitBot/backYAxis.stl differ
diff --git a/assets/stls/oneBitBot/backYFeet.stl b/assets/stls/oneBitBot/backYFeet.stl
new file mode 100644
index 0000000000000000000000000000000000000000..bcbb053665d560b0be88a3351c1404734528a5d8
Binary files /dev/null and b/assets/stls/oneBitBot/backYFeet.stl differ
diff --git a/assets/stls/oneBitBot/base.stl b/assets/stls/oneBitBot/base.stl
new file mode 100644
index 0000000000000000000000000000000000000000..5dec39d5cccca2026341ca8b976e1312cceb2943
Binary files /dev/null and b/assets/stls/oneBitBot/base.stl differ
diff --git a/assets/stls/oneBitBot/basePlate.stl b/assets/stls/oneBitBot/basePlate.stl
deleted file mode 100644
index 9046958e1ff353758a7e19cb0e879ccc4a3f1c43..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/basePlate.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/basePlateTest.stl b/assets/stls/oneBitBot/basePlateTest.stl
deleted file mode 100644
index 343b8acdd3219e238fbe5928ef6b731e4c65bc36..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/basePlateTest.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/baseTest.stl b/assets/stls/oneBitBot/baseTest.stl
new file mode 100644
index 0000000000000000000000000000000000000000..a4ff6f5c54e4ac51d5a2aa6ec927d42cb43a5e7f
Binary files /dev/null and b/assets/stls/oneBitBot/baseTest.stl differ
diff --git a/assets/stls/oneBitBot/endEffector.stl b/assets/stls/oneBitBot/endEffector.stl
new file mode 100644
index 0000000000000000000000000000000000000000..9f086c797d6e2b72ff6a7b0b74fb5cc61e29137c
Binary files /dev/null and b/assets/stls/oneBitBot/endEffector.stl differ
diff --git a/assets/stls/oneBitBot/endEffectorPlate.stl b/assets/stls/oneBitBot/endEffectorPlate.stl
new file mode 100644
index 0000000000000000000000000000000000000000..d789e49921a4ab3873f33ea48147992ceba5edcf
Binary files /dev/null and b/assets/stls/oneBitBot/endEffectorPlate.stl differ
diff --git a/assets/stls/oneBitBot/foot1.stl b/assets/stls/oneBitBot/foot1.stl
deleted file mode 100644
index 731a86298bc1f00e8a1c8a82f51486da966b67ab..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/foot1.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/foot2.stl b/assets/stls/oneBitBot/foot2.stl
deleted file mode 100644
index ebf4febc7c243a973ff5a6465da0ac547e3185ef..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/foot2.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/footMount1.stl b/assets/stls/oneBitBot/footMount1.stl
deleted file mode 100644
index f9f4cf7ff318b4ca932c4e91b43864a3c074d647..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/footMount1.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/footMount2.stl b/assets/stls/oneBitBot/footMount2.stl
deleted file mode 100644
index 8757830177adc99c3c1ea93bfc192b719d8aa890..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/footMount2.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/frontFeet.stl b/assets/stls/oneBitBot/frontFeet.stl
new file mode 100644
index 0000000000000000000000000000000000000000..8a99b9da07a70bc8ae675ee2102cbf32dbd213fa
Binary files /dev/null and b/assets/stls/oneBitBot/frontFeet.stl differ
diff --git a/assets/stls/oneBitBot/xAxis.stl b/assets/stls/oneBitBot/xAxis.stl
new file mode 100644
index 0000000000000000000000000000000000000000..f17857b970ee188397f8cee9e96b5568d486ce5c
Binary files /dev/null and b/assets/stls/oneBitBot/xAxis.stl differ
diff --git a/assets/stls/oneBitBot/xAxisFeet.stl b/assets/stls/oneBitBot/xAxisFeet.stl
new file mode 100644
index 0000000000000000000000000000000000000000..5c568ef5b2f188a13f06f87ff8d267a22e5fdfd1
Binary files /dev/null and b/assets/stls/oneBitBot/xAxisFeet.stl differ
diff --git a/assets/stls/oneBitBot/yAxisMount.stl b/assets/stls/oneBitBot/yAxisMount.stl
deleted file mode 100644
index 88bfe671c96bfd03892a57bfd9fe19a028ca89b4..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/yAxisMount.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/zAxis.stl b/assets/stls/oneBitBot/zAxis.stl
deleted file mode 100644
index b5893fba0a62caf95e90c0807a5f939f0b673f49..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/zAxis.stl and /dev/null differ
diff --git a/assets/stls/oneBitBot/zDrive.stl b/assets/stls/oneBitBot/zDrive.stl
deleted file mode 100644
index 87e20ba249f038d9c26231d08b6abd14b3478934..0000000000000000000000000000000000000000
Binary files a/assets/stls/oneBitBot/zDrive.stl and /dev/null differ
diff --git a/js/cam/MachineOneBit.js b/js/cam/MachineOneBit.js
index fc5caebc19d8338ac4abdf1bc8f1b64274edce76..4ca9fc7daa553aced2f2c672643b66079048c933 100644
--- a/js/cam/MachineOneBit.js
+++ b/js/cam/MachineOneBit.js
@@ -31,14 +31,14 @@ OneBitBot.prototype.setMachinePosition = function(){
OneBitBot.prototype._buildMeshes = function(callback){
var meshes = [];
- var numMeshes = 14;
+ var numMeshes = 8;
function allLoaded(){
numMeshes -= 1;
return numMeshes <= 0;
}
function geometryScale(geometry){
- var unitScale = 1/2.78388;
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-2052.46, 62.8567, -23.3891));
+ var unitScale = 1/70.710552;
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-52132.4, 1596.56, -594.083));//-2052.46, 62.8567, -23.3891
geometry.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale));
return geometry;
}
@@ -48,57 +48,32 @@ OneBitBot.prototype._buildMeshes = function(callback){
if (allLoaded()) callback(meshes);
}
var loader = new THREE.STLLoader();
- loader.load("assets/stls/oneBitBot/basePlateTest.stl", function(geometry){
+ loader.load("assets/stls/oneBitBot/base.stl", function(geometry){
meshPrep(geometryScale(geometry), "basePlate");
});
- loader.load("assets/stls/oneBitBot/zAxis.stl", function(geometry){
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,-20.16,-85.37));
+ loader.load("assets/stls/oneBitBot/endEffector.stl", function(geometry){
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(140,150,-135.37));
meshPrep(geometryScale(geometry), "zAxis");
});
- loader.load("assets/stls/oneBitBot/zDrive.stl", function(geometry){
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(100,-20.16,-0));
+ loader.load("assets/stls/oneBitBot/endEffectorPlate.stl", function(geometry){
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(140,150,-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/xAxis.stl", function(geometry){
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(140,0,-0));
+ meshPrep(geometryScale(geometry), "xAxis");
});
- 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/backYAxis.stl", function(geometry){
+ meshPrep(geometryScale(geometry), "backYAxis");
});
- loader.load("assets/stls/oneBitBot/footMount2.stl", function(geometry){
- meshPrep(geometryScale(geometry), "footMount2");
+ loader.load("assets/stls/oneBitBot/backYFeet.stl", function(geometry){
+ meshPrep(geometryScale(geometry), "backYFeet");
});
- loader.load("assets/stls/oneBitBot/backFootMount.stl", function(geometry){
- meshPrep(geometryScale(geometry), "backFootMount");
+ loader.load("assets/stls/oneBitBot/frontFeet.stl", function(geometry){
+ meshPrep(geometryScale(geometry), "frontFeet");
});
- 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/xAxisFeet.stl", function(geometry){
+ meshPrep(geometryScale(geometry), "xAxisFeet");
});
};
@@ -121,7 +96,7 @@ OneBitBot.prototype._moveXAxis = function(startingPos, target, axis, speed, call
callback();
return;
}
- this._animateObjects([this.meshes["zAxis"], this.meshes["zDrive"], this.meshes["yAxisMount"], this.cell], axis, speed, startingPos, target, callback);
+ this._animateObjects([this.meshes["zAxis"], this.meshes["zDrive"], this.meshes["xAxis"], this.cell], axis, speed, startingPos, target, callback);
};
OneBitBot.prototype._moveYAxis = function(startingPos, target, axis, speed, callback){
if (target == null || target === undefined) {