Feedback Cone shown to scale for Inch jobs

pull/110/head
openbuilds-engineer 2018-09-18 17:06:03 +02:00
rodzic b68704dddc
commit 91afae3d26
3 zmienionych plików z 14 dodań i 5 usunięć

Wyświetl plik

@ -19,7 +19,7 @@
<div class="pos-fixed pos-center" id="splash">
<img src="splashicon.png" style="display:block; margin:auto;">
<br> Starting OpenBuilds Machine Driver...
<br>Starting&nbsp;OpenBuilds&nbsp;Machine&nbsp;Driver...
</div>

Wyświetl plik

@ -86,7 +86,7 @@ $(document).ready(function() {
setTimeout(function() {
$('#splash').fadeOut(500);
}, 10)
}, 100)
});

Wyświetl plik

@ -241,9 +241,18 @@ function initSocket() {
if (webgl) {
if (!isJogWidget) {
if (!simRunning) {
cone.position.x = status.machine.position.work.x
cone.position.y = status.machine.position.work.y
cone.position.z = (parseFloat(status.machine.position.work.z) + 20)
if (object) {
if (object.userData.inch) {
cone.position.x = status.machine.position.work.x * 0.0393701
cone.position.y = status.machine.position.work.y * 0.0393701
cone.position.z = (parseFloat(status.machine.position.work.z * 0.0393701) + 20)
} else {
cone.position.x = status.machine.position.work.x
cone.position.y = status.machine.position.work.y
cone.position.z = (parseFloat(status.machine.position.work.z) + 20)
}
}
}
}
}