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

remove legacy cam render code. fix artificial first point in gcode/cam render

Browse source
This commit is contained in:
Stewart Allen 2020-05-16 23:57:13 -04:00
commit 476a9bdb96
2 changed files with 4 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/kiri-print.js
View file

@ -332,18 +332,15 @@ let gs_kiri_print = exports;
process = settings.process,
origin = settings.origin,
mode = settings.mode,
driver = KIRI.driver[mode],
firstPoint;
driver = KIRI.driver[mode];
switch (mode) {
case 'SLA':
driver.printRender(scope);
break;
case 'CAM':
console.log(scope.settings);
firstPoint = newPoint(origin.x, origin.y, process.camOriginTop ? settings.stock.z : origin.z);
case 'FDM':
scope.renderMoves(true, 0x888888, firstPoint);
scope.renderMoves(true, 0x888888);
break;
case 'LASER':
scope.renderMoves(false, 0x0088aa);

30
js/kiri-slice.js
View file

@ -346,8 +346,7 @@ let gs_kiri_slice = exports;
groups = slice.groups ? slice.groups.sort(function(a,b) { return b.area() - a.area() }) : null,
tops = slice.tops,
pbuf = [],
coloridx = 0,
open = (slice.camMode === process.FINISH_X || slice.camMode === process.FINISH_Y);
coloridx = 0;
layer.clear();
// layer.setOpacity(0.05);
@ -385,7 +384,7 @@ let gs_kiri_slice = exports;
// all polygons in yellow
case 4:
tops.forEach(function(top) {
layer.poly(top.poly, outline_colors[color], true, open);
layer.poly(top.poly, outline_colors[color], true, false);
// layer.solid(top.poly, outline_solid_colors[color]);
if (top.inner) layer.poly(top.inner, 0xdddddd, true);
// if (top.thinner) layer.poly(top.thinner, 0x559999, true, null);
@ -553,27 +552,8 @@ let gs_kiri_slice = exports;
process = KIRI.driver.CAM.process;
layer.clear();
if (scope.camMode) {
layers.solid.clear(); // finish
layers.bridge.clear(); // finish x
layers.flat.clear(); // finish y
}
scope.tops.forEach(function(top) {
switch (scope.camMode) {
case process.FINISH:
layer = layers.solid;
break;
case process.FINISH_X:
layer = layers.bridge;
break;
case process.FINISH_Y:
layer = layers.flat;
break;
default:
layer = layers.trace;
break;
}
if (top.traces) {
layer.poly(top.traces, trace_color, true, null);
// layer.setTransparent(false);
@ -587,12 +567,6 @@ let gs_kiri_slice = exports;
// layer.renderSolid();
layer.render();
if (scope.camMode) {
layers.solid.render();
layers.bridge.render();
layers.flat.render();
}
};
/**