remove 'experimental' preference
This commit is contained in:
parent
25c1959e57
commit
8967a3bd76
10 changed files with 19 additions and 26 deletions
|
|
@ -434,7 +434,6 @@ class OpRough extends CamOp {
|
|||
let { settings, widget } = state;
|
||||
let { process, controller } = settings;
|
||||
|
||||
let danger = controller.danger;
|
||||
let easeDown = process.camEaseDown;
|
||||
let cutdir = process.camConventional;
|
||||
let depthFirst = process.camDepthFirst && !state.isIndexed;
|
||||
|
|
@ -498,7 +497,7 @@ class OpRough extends CamOp {
|
|||
}
|
||||
|
||||
if (depthFirst) {
|
||||
let ease = danger && op.down && easeDown ? op.down : 0;
|
||||
let ease = op.down && easeDown ? op.down : 0;
|
||||
let ins = depthData.map(a => a.filter(p => !isNeg(p.depth)));
|
||||
let itops = ins.map(level => {
|
||||
return POLY.nest(level.filter(poly => poly.depth === 0).clone());
|
||||
|
|
@ -718,7 +717,6 @@ class OpOutline extends CamOp {
|
|||
let { settings, widget } = state;
|
||||
let { process, controller } = settings;
|
||||
|
||||
let danger = controller.danger;
|
||||
let easeDown = process.camEaseDown;
|
||||
let toolDiam = this.toolDiam;
|
||||
let cutdir = process.camConventional;
|
||||
|
|
@ -769,7 +767,7 @@ class OpOutline extends CamOp {
|
|||
.sort((a,b) => { return a.area() - b.area() })[0]
|
||||
.average();
|
||||
// experimental start of ease down
|
||||
let ease = danger && op.down && easeDown ? op.down : 0;
|
||||
let ease = op.down && easeDown ? op.down : 0;
|
||||
printPoint = depthOutlinePath(printPoint, 0, flatLevels, toolDiam, polyEmit, false, ease);
|
||||
printPoint = depthOutlinePath(printPoint, 0, flatLevels, toolDiam, polyEmit, true, ease);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,9 +137,9 @@ FDM.init = function(kiri, api) {
|
|||
if (!isFdmMode) {
|
||||
return;
|
||||
}
|
||||
if (!api.conf.get().controller.danger) {
|
||||
// if (!api.conf.get().controller.danger) {
|
||||
return;
|
||||
}
|
||||
// }
|
||||
let pct = 0;
|
||||
let int = setInterval(() => {
|
||||
if (pct <= 1) {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const debug = false;
|
|||
FDM.export = function(print, online, ondone, ondebug) {
|
||||
const { settings, belty, tools } = print;
|
||||
const { bounds, controller, device, process, filter, mode } = settings;
|
||||
const { danger, extruders, fwRetract } = device;
|
||||
const { extruders, fwRetract } = device;
|
||||
const { bedWidth, bedDepth, bedRound, bedBelt, maxHeight } = device;
|
||||
const { gcodeFan, gcodeLayer, gcodeTrack, gcodePause, gcodeFeature } = device;
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ FDM.export = function(print, online, ondone, ondebug) {
|
|||
retSpeed = process.outputRetractSpeed * 60 || 1, // range
|
||||
retDwell = process.outputRetractDwell || 0, // range
|
||||
timeDwell = retDwell / 1000,
|
||||
arcDist = isBelt || !danger ? 0 : (process.arcTolerance || 0),
|
||||
arcDist = isBelt ? 0 : (process.arcTolerance || 0),
|
||||
arcMin = 1,
|
||||
arcRes = 20,
|
||||
arcDev = 0.5,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ const POLY = polygons;
|
|||
base.slicePost.FDM = function(data, options) {
|
||||
const { z, lines, groups } = data;
|
||||
const { useAssembly, post_args, zIndexes } = options;
|
||||
const { process, isSynth, isDanger, vaseMode } = post_args;
|
||||
const { process, isSynth, vaseMode } = post_args;
|
||||
const { shellOffset, fillOffset, clipOffset } = post_args;
|
||||
data.tops = POLY.nest(groups);
|
||||
if (isSynth) {
|
||||
|
|
|
|||
|
|
@ -38,14 +38,13 @@ FDM.prepare = async function(widgets, settings, update) {
|
|||
{ sliceHeight, firstSliceHeight, firstLayerRate, sliceSupportOutline } = process,
|
||||
{ outputSeekrate, outputDraftShield, outputPurgeTower } = process,
|
||||
{ bedWidth, bedDepth, filamentSource } = device,
|
||||
{ lineType, danger } = controller,
|
||||
{ lineType } = controller,
|
||||
printPoint = newPoint(0,0,0),
|
||||
print = self.worker.print = kiri.newPrint(settings, widgets),
|
||||
nozzle = process.sliceLineWidth || device.extruders[0].extNozzle,
|
||||
isBelt = device.bedBelt,
|
||||
isThin = lineType === "line",
|
||||
isFlat = lineType === "flat",
|
||||
isDanger = danger || false,
|
||||
isPalette = filamentSource === 'palette3',
|
||||
useRaft = process.outputRaft || false,
|
||||
firstLayerHeight = isBelt ? sliceHeight : firstSliceHeight || sliceHeight,
|
||||
|
|
@ -561,7 +560,6 @@ FDM.prepare = async function(widgets, settings, update) {
|
|||
{
|
||||
routeAround: process.outputAvoidGaps,
|
||||
seedPoint: printPoint.sub(offset),
|
||||
danger: isDanger,
|
||||
params, // range parameters
|
||||
first: slice.index === 0,
|
||||
support: slice.widget.support,
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
|
|||
isBelt = device.bedBelt,
|
||||
isSynth = widget.track.synth,
|
||||
isSupport = widget.track.support,
|
||||
isDanger = controller.danger,
|
||||
useAssembly = controller.assembly,
|
||||
isConcurrent = controller.threaded && kiri.minions.concurrent,
|
||||
topLayers = process.sliceTopLayers || 0,
|
||||
|
|
@ -220,7 +219,6 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
|
|||
vaseMode,
|
||||
isSynth,
|
||||
process,
|
||||
isDanger,
|
||||
},
|
||||
// z index generator
|
||||
zGen(zopt) {
|
||||
|
|
@ -823,7 +821,7 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
|
|||
profileStart("support");
|
||||
let promises = [];
|
||||
forSlices(0.7, 0.75, slice => {
|
||||
promises.push(doSupport(slice, process, widget.shadow, { exp: isDanger }));
|
||||
promises.push(doSupport(slice, process, widget.shadow, { }));
|
||||
}, "support");
|
||||
await tracker(promises, (i, t) => {
|
||||
trackupdate(i / t, 0.75, 0.8);
|
||||
|
|
|
|||
Loading…
Reference in a new issue