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 previous ops overriding contour z plunge

Browse source
This commit is contained in:
Stewart Allen 2023-04-17 18:01:08 -04:00
commit b35d5440a1
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri-mode/cam/ops.js
View file

@ -817,7 +817,7 @@ class OpContour extends CamOp {
let depthFirst = process.camDepthFirst; let depthFirst = process.camDepthFirst;
let depthData = []; let depthData = [];
setTool(op.tool, op.rate, op.plunge); setTool(op.tool, op.rate, process.camFastFeedZ);
setSpindle(op.spindle); setSpindle(op.spindle);
setTolerance(this.tolerance); setTolerance(this.tolerance);

8
src/kiri-mode/fdm/slice.js
View file

@ -1685,6 +1685,7 @@ FDM.supports = function(settings, widget) {
let isBelt = settings.device.bedBelt; let isBelt = settings.device.bedBelt;
let process = settings.process; let process = settings.process;
let size = process.sliceSupportSize; let size = process.sliceSupportSize;
let s9 = size / 9;
let s4 = size / 4; let s4 = size / 4;
let s2 = size * 0.45; let s2 = size * 0.45;
let min = 0.01; let min = 0.01;
@ -1701,6 +1702,7 @@ FDM.supports = function(settings, widget) {
let platform = new THREE.Mesh( let platform = new THREE.Mesh(
new THREE.PlaneGeometry(10000,10000,1), mat new THREE.PlaneGeometry(10000,10000,1), mat
); );
const now = Date.now();
// test point // test point
function tp(point) { function tp(point) {
if (point.added) { if (point.added) {
@ -1728,6 +1730,10 @@ FDM.supports = function(settings, widget) {
let dca = c.distanceTo(a); let dca = c.distanceTo(a);
let max = Math.max(dab, dbc, dca); let max = Math.max(dab, dbc, dca);
if (max < size) { if (max < size) {
let min = Math.min(dab, dbc, dca);
if (min < s9 && Math.random() < 0.5) {
return;
}
// test midpoint of tri face // test midpoint of tri face
return tp(new THREE.Vector3().add(a).add(b).add(c).divideScalar(3)); return tp(new THREE.Vector3().add(a).add(b).add(c).divideScalar(3));
} }
@ -1770,7 +1776,7 @@ FDM.supports = function(settings, widget) {
// triangulate larger polys and test centers // triangulate larger polys and test centers
tf(a,b,c); tf(a,b,c);
} }
console.log(`support generated in ${Date.now() - now} ms`);
widget.supports = add; widget.supports = add;
return add.length > 0; return add.length > 0;
}; };