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

fix line group control

Browse source
This commit is contained in:
Stewart Allen 2020-11-09 10:11:24 -05:00
commit 0c0046b1c5
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/stacks.js
View file

@ -137,7 +137,7 @@
group.add(new THREE.LineSegments(geo, mat)); group.add(new THREE.LineSegments(geo, mat));
} }
geo.setFromPoints(vert); geo.setFromPoints(vert);
ctrl.group.push(mat); ctrl.group.appendAll(mat);
} }
if (faces.length) { if (faces.length) {
const mat = newMat(data); const mat = newMat(data);

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

@ -420,13 +420,17 @@
return; return;
} }
if (lastOut) { if (lastOut) {
const op = out.point, lp = lastOut.point,
moved = (op.x !== lp.x) || (op.y !== lp.y) || (op.z !== lp.z);;
if (out.emit) { if (out.emit) {
// if (!moved) return;
if (!lastOut.emit || (ckspeed && out.speed !== lastOut.speed)) { if (!lastOut.emit || (ckspeed && out.speed !== lastOut.speed)) {
current = newPolygon().setOpen(); current = newPolygon().setOpen();
current.push(lastOut.point); current.push(lastOut.point);
current.color = hsv2rgb({h:out.speed/maxspd, s:1, v:1}, true); current.color = hsv2rgb({h:out.speed/maxspd, s:1, v:1}, true);
pushPrint(out.tool, current); pushPrint(out.tool, current);
} }
// current.color = hsv2rgb({h:out.speed/maxspd, s:1, v:1}, true);
current.push(out.point); current.push(out.point);
} else { } else {
if (lastOut.emit) { if (lastOut.emit) {