AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

track xpos for belt widgets

Browse source
This commit is contained in:
Stewart Allen 2021-01-09 12:56:11 -05:00
commit d89674f1d5
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri/worker.js
View file

@ -66,6 +66,7 @@ KIRI.worker = {
let widget = cache[data.id], let widget = cache[data.id],
last = time(), last = time(),
xpos,
ypos, ypos,
now; now;
@ -74,6 +75,7 @@ KIRI.worker = {
let rotation = (Math.PI/180) * (settings.device.bedBelt ? 45 : 0); let rotation = (Math.PI/180) * (settings.device.bedBelt ? 45 : 0);
if (rotation) { if (rotation) {
let track = widget.track; let track = widget.track;
xpos = track.pos.x;
ypos = track.pos.y + settings.device.bedDepth / 2 - track.box.h / 2; ypos = track.pos.y + settings.device.bedDepth / 2 - track.box.h / 2;
widget.mesh = null; widget.mesh = null;
widget.points = null; widget.points = null;
@ -106,7 +108,7 @@ KIRI.worker = {
let wbb = widget.getBoundingBox(true); let wbb = widget.getBoundingBox(true);
let dy = (wbb.max.y + wbb.min.y)/2; let dy = (wbb.max.y + wbb.min.y)/2;
let dz = wbb.min.z; let dz = wbb.min.z;
widget.rotinfo = { angle: 45, dy, dz, ypos }; widget.rotinfo = { angle: 45, dy, dz, xpos, ypos };
send.data({ rotinfo: widget.rotinfo }); send.data({ rotinfo: widget.rotinfo });
} }
} }

2
src/mode/fdm/prepare.js
View file

@ -301,6 +301,7 @@
let offset = Object.clone(mesh.position || center); let offset = Object.clone(mesh.position || center);
if (isBelt) { if (isBelt) {
offset = center; offset = center;
offset.x = widget.rotinfo.xpos;
offset.y = widget.rotinfo.dz; offset.y = widget.rotinfo.dz;
offset.z = widget.rotinfo.ypos; offset.z = widget.rotinfo.ypos;
} else { } else {
@ -363,7 +364,6 @@
} }
layerout.height = layerout.height || closest.slice.height; layerout.height = layerout.height || closest.slice.height;
slices[minidx] = null; slices[minidx] = null;
// if (!isBelt) closest.offset.z = zoff;
// detect extruder change and print purge block // detect extruder change and print purge block
if (!lastOut || lastOut.extruder !== closest.slice.extruder) { if (!lastOut || lastOut.extruder !== closest.slice.extruder) {
printPoint = purge(closest.slice.extruder, track, layerout, printPoint, closest.slice.z); printPoint = purge(closest.slice.extruder, track, layerout, printPoint, closest.slice.z);