remove 'experimental' preference

This commit is contained in:
Stewart Allen 2024-05-19 23:39:12 -04:00
commit 8967a3bd76
10 changed files with 19 additions and 26 deletions

View file

@ -434,7 +434,6 @@ class OpRough extends CamOp {
let { settings, widget } = state; let { settings, widget } = state;
let { process, controller } = settings; let { process, controller } = settings;
let danger = controller.danger;
let easeDown = process.camEaseDown; let easeDown = process.camEaseDown;
let cutdir = process.camConventional; let cutdir = process.camConventional;
let depthFirst = process.camDepthFirst && !state.isIndexed; let depthFirst = process.camDepthFirst && !state.isIndexed;
@ -498,7 +497,7 @@ class OpRough extends CamOp {
} }
if (depthFirst) { 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 ins = depthData.map(a => a.filter(p => !isNeg(p.depth)));
let itops = ins.map(level => { let itops = ins.map(level => {
return POLY.nest(level.filter(poly => poly.depth === 0).clone()); return POLY.nest(level.filter(poly => poly.depth === 0).clone());
@ -718,7 +717,6 @@ class OpOutline extends CamOp {
let { settings, widget } = state; let { settings, widget } = state;
let { process, controller } = settings; let { process, controller } = settings;
let danger = controller.danger;
let easeDown = process.camEaseDown; let easeDown = process.camEaseDown;
let toolDiam = this.toolDiam; let toolDiam = this.toolDiam;
let cutdir = process.camConventional; let cutdir = process.camConventional;
@ -769,7 +767,7 @@ class OpOutline extends CamOp {
.sort((a,b) => { return a.area() - b.area() })[0] .sort((a,b) => { return a.area() - b.area() })[0]
.average(); .average();
// experimental start of ease down // 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, false, ease);
printPoint = depthOutlinePath(printPoint, 0, flatLevels, toolDiam, polyEmit, true, ease); printPoint = depthOutlinePath(printPoint, 0, flatLevels, toolDiam, polyEmit, true, ease);
} }

View file

@ -137,9 +137,9 @@ FDM.init = function(kiri, api) {
if (!isFdmMode) { if (!isFdmMode) {
return; return;
} }
if (!api.conf.get().controller.danger) { // if (!api.conf.get().controller.danger) {
return; return;
} // }
let pct = 0; let pct = 0;
let int = setInterval(() => { let int = setInterval(() => {
if (pct <= 1) { if (pct <= 1) {

View file

@ -16,7 +16,7 @@ const debug = false;
FDM.export = function(print, online, ondone, ondebug) { FDM.export = function(print, online, ondone, ondebug) {
const { settings, belty, tools } = print; const { settings, belty, tools } = print;
const { bounds, controller, device, process, filter, mode } = settings; 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 { bedWidth, bedDepth, bedRound, bedBelt, maxHeight } = device;
const { gcodeFan, gcodeLayer, gcodeTrack, gcodePause, gcodeFeature } = 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 retSpeed = process.outputRetractSpeed * 60 || 1, // range
retDwell = process.outputRetractDwell || 0, // range retDwell = process.outputRetractDwell || 0, // range
timeDwell = retDwell / 1000, timeDwell = retDwell / 1000,
arcDist = isBelt || !danger ? 0 : (process.arcTolerance || 0), arcDist = isBelt ? 0 : (process.arcTolerance || 0),
arcMin = 1, arcMin = 1,
arcRes = 20, arcRes = 20,
arcDev = 0.5, arcDev = 0.5,

View file

@ -23,7 +23,7 @@ const POLY = polygons;
base.slicePost.FDM = function(data, options) { base.slicePost.FDM = function(data, options) {
const { z, lines, groups } = data; const { z, lines, groups } = data;
const { useAssembly, post_args, zIndexes } = options; 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; const { shellOffset, fillOffset, clipOffset } = post_args;
data.tops = POLY.nest(groups); data.tops = POLY.nest(groups);
if (isSynth) { if (isSynth) {

View file

@ -38,14 +38,13 @@ FDM.prepare = async function(widgets, settings, update) {
{ sliceHeight, firstSliceHeight, firstLayerRate, sliceSupportOutline } = process, { sliceHeight, firstSliceHeight, firstLayerRate, sliceSupportOutline } = process,
{ outputSeekrate, outputDraftShield, outputPurgeTower } = process, { outputSeekrate, outputDraftShield, outputPurgeTower } = process,
{ bedWidth, bedDepth, filamentSource } = device, { bedWidth, bedDepth, filamentSource } = device,
{ lineType, danger } = controller, { lineType } = controller,
printPoint = newPoint(0,0,0), printPoint = newPoint(0,0,0),
print = self.worker.print = kiri.newPrint(settings, widgets), print = self.worker.print = kiri.newPrint(settings, widgets),
nozzle = process.sliceLineWidth || device.extruders[0].extNozzle, nozzle = process.sliceLineWidth || device.extruders[0].extNozzle,
isBelt = device.bedBelt, isBelt = device.bedBelt,
isThin = lineType === "line", isThin = lineType === "line",
isFlat = lineType === "flat", isFlat = lineType === "flat",
isDanger = danger || false,
isPalette = filamentSource === 'palette3', isPalette = filamentSource === 'palette3',
useRaft = process.outputRaft || false, useRaft = process.outputRaft || false,
firstLayerHeight = isBelt ? sliceHeight : firstSliceHeight || sliceHeight, firstLayerHeight = isBelt ? sliceHeight : firstSliceHeight || sliceHeight,
@ -561,7 +560,6 @@ FDM.prepare = async function(widgets, settings, update) {
{ {
routeAround: process.outputAvoidGaps, routeAround: process.outputAvoidGaps,
seedPoint: printPoint.sub(offset), seedPoint: printPoint.sub(offset),
danger: isDanger,
params, // range parameters params, // range parameters
first: slice.index === 0, first: slice.index === 0,
support: slice.widget.support, support: slice.widget.support,

View file

@ -106,7 +106,6 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
isBelt = device.bedBelt, isBelt = device.bedBelt,
isSynth = widget.track.synth, isSynth = widget.track.synth,
isSupport = widget.track.support, isSupport = widget.track.support,
isDanger = controller.danger,
useAssembly = controller.assembly, useAssembly = controller.assembly,
isConcurrent = controller.threaded && kiri.minions.concurrent, isConcurrent = controller.threaded && kiri.minions.concurrent,
topLayers = process.sliceTopLayers || 0, topLayers = process.sliceTopLayers || 0,
@ -220,7 +219,6 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
vaseMode, vaseMode,
isSynth, isSynth,
process, process,
isDanger,
}, },
// z index generator // z index generator
zGen(zopt) { zGen(zopt) {
@ -823,7 +821,7 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
profileStart("support"); profileStart("support");
let promises = []; let promises = [];
forSlices(0.7, 0.75, slice => { forSlices(0.7, 0.75, slice => {
promises.push(doSupport(slice, process, widget.shadow, { exp: isDanger })); promises.push(doSupport(slice, process, widget.shadow, { }));
}, "support"); }, "support");
await tracker(promises, (i, t) => { await tracker(promises, (i, t) => {
trackupdate(i / t, 0.75, 0.8); trackupdate(i / t, 0.75, 0.8);

View file

@ -764,7 +764,6 @@ const conf = exports({
dark: false, dark: false,
shiny: false, shiny: false,
decals: false, decals: false,
danger: false,
zoomSpeed: 1.0, zoomSpeed: 1.0,
lineType: "path", lineType: "path",
autoSave: true, autoSave: true,

View file

@ -180,7 +180,6 @@ gapp.register("kiri.init", [], (root, exports) => {
} }
control.shiny = ui.shiny.checked; control.shiny = ui.shiny.checked;
control.decals = ui.decals.checked; control.decals = ui.decals.checked;
control.danger = ui.danger.checked;
control.showOrigin = ui.showOrigin.checked; control.showOrigin = ui.showOrigin.checked;
control.showRulers = ui.showRulers.checked; control.showRulers = ui.showRulers.checked;
control.autoLayout = ui.autoLayout.checked; control.autoLayout = ui.autoLayout.checked;
@ -1531,10 +1530,6 @@ gapp.register("kiri.init", [], (root, exports) => {
return !isBelt(); return !isBelt();
} }
function isDanger() {
return ui.danger.checked;
}
// MAIN INITIALIZATION FUNCTION // MAIN INITIALIZATION FUNCTION
function init_one() { function init_one() {
@ -1813,7 +1808,6 @@ gapp.register("kiri.init", [], (root, exports) => {
ortho: uc.newBoolean(LANG.op_orth_s, booleanSave, {title:LANG.op_orth_l}), ortho: uc.newBoolean(LANG.op_orth_s, booleanSave, {title:LANG.op_orth_l}),
dark: uc.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l}), dark: uc.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l}),
devel: uc.newBoolean(LANG.op_devl_s, booleanSave, {title:LANG.op_devl_l}), devel: uc.newBoolean(LANG.op_devl_s, booleanSave, {title:LANG.op_devl_l}),
danger: uc.newBoolean(LANG.op_dang_s, booleanSave, {title:LANG.op_dang_l}),
lprefs: uc.newGroup(LANG.op_disp, $('prefs-gen2'), {inline: true}), lprefs: uc.newGroup(LANG.op_disp, $('prefs-gen2'), {inline: true}),
showOrigin: uc.newBoolean(LANG.op_shor_s, booleanSave, {title:LANG.op_shor_l}), showOrigin: uc.newBoolean(LANG.op_shor_s, booleanSave, {title:LANG.op_shor_l}),
@ -2046,7 +2040,7 @@ gapp.register("kiri.init", [], (root, exports) => {
outputCoastDist: uc.newInput(LANG.ad_scst_s, {title:LANG.ad_scst_l, bound:uc.bound(0.0,10), convert:uc.toFloat, modes:FDM}), outputCoastDist: uc.newInput(LANG.ad_scst_s, {title:LANG.ad_scst_l, bound:uc.bound(0.0,10), convert:uc.toFloat, modes:FDM}),
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}), fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}),
zHopDistance: uc.newInput(LANG.ad_zhop_s, {title:LANG.ad_zhop_l, bound:uc.bound(0,3.0), convert:uc.toFloat, modes:FDM}), zHopDistance: uc.newInput(LANG.ad_zhop_s, {title:LANG.ad_zhop_l, bound:uc.bound(0,3.0), convert:uc.toFloat, modes:FDM}),
arcTolerance: uc.newInput(LANG.ad_arct_s, {title:LANG.ad_arct_l, bound:uc.bound(0,1.0), convert:uc.toFloat, modes:FDM, show:() => { return isDanger() && isNotBelt() }}), arcTolerance: uc.newInput(LANG.ad_arct_s, {title:LANG.ad_arct_l, bound:uc.bound(0,1.0), convert:uc.toFloat, modes:FDM, show:() => { return isNotBelt() }}),
antiBacklash: uc.newInput(LANG.ad_abkl_s, {title:LANG.ad_abkl_l, bound:uc.bound(0,3), convert:uc.toInt, modes:FDM}), antiBacklash: uc.newInput(LANG.ad_abkl_s, {title:LANG.ad_abkl_l, bound:uc.bound(0,3), convert:uc.toInt, modes:FDM}),
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}), fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}),
outputLoops: uc.newInput(LANG.ag_loop_s, {title:LANG.ag_loop_l, convert:uc.toInt, bound:uc.bound(-1,1000), modes:FDM, show:isBelt}), outputLoops: uc.newInput(LANG.ag_loop_s, {title:LANG.ag_loop_l, convert:uc.toInt, bound:uc.bound(-1,1000), modes:FDM, show:isBelt}),

View file

@ -10,7 +10,9 @@
--main-color-hover: rgb(96, 127, 164); --main-color-hover: rgb(96, 127, 164);
--top: rgba(255,255,255,0.75); --top: rgba(255,255,255,0.75);
--menu: #f0f0f0; --menu: #f0f0f0;
--menu-text: #222;
--menu-border: #555; --menu-border: #555;
--dark-menu-text: #111;
} }
@font-face { @font-face {
font-family: 'Russo One'; font-family: 'Russo One';
@ -57,6 +59,9 @@ a, a:hover, a:visited {
.top-menu label { .top-menu label {
color: #444; color: #444;
} }
.dark .top-menu label {
color: var(--dark-menu-text)
}
.top-menu svg { .top-menu svg {
color: var(--main-color); color: var(--main-color);
} }
@ -67,7 +72,10 @@ a, a:hover, a:visited {
align-items: center; align-items: center;
} }
.top-menu > span:hover label { .top-menu > span:hover label {
color: #222; color: var(--menu-text);
}
.dark .top-menu > span:hover label {
color: var(--dark-menu-text) !important;
} }
.top-menu > span:hover > svg { .top-menu > span:hover > svg {
color: var(--main-color-hover); color: var(--main-color-hover);

View file

@ -246,8 +246,6 @@ self.kiri.lang['en-us'] = {
op_decl_l: "show device decals and logos", op_decl_l: "show device decals and logos",
op_shny_s: "detail render", op_shny_s: "detail render",
op_shny_l: "choose a slice render method that is slower and uses specular highlighting. this makes it easier to see detail in some models at the expense of render speed", op_shny_l: "choose a slice render method that is slower and uses specular highlighting. this makes it easier to see detail in some models at the expense of render speed",
op_dang_s: "experimental",
op_dang_l: "show experimental parameters",
op_devl_s: "developer", op_devl_s: "developer",
op_devl_l: ["show developer options","enable developer debugging"], op_devl_l: ["show developer options","enable developer debugging"],
op_hopo_s: "hover pop", op_hopo_s: "hover pop",