diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js index e7c82256..67799611 100644 --- a/src/kiri-mode/cam/ops.js +++ b/src/kiri-mode/cam/ops.js @@ -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); } diff --git a/src/kiri-mode/fdm/client.js b/src/kiri-mode/fdm/client.js index 87637320..c04f5e0a 100644 --- a/src/kiri-mode/fdm/client.js +++ b/src/kiri-mode/fdm/client.js @@ -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) { diff --git a/src/kiri-mode/fdm/export.js b/src/kiri-mode/fdm/export.js index 1d80ca06..8526289c 100644 --- a/src/kiri-mode/fdm/export.js +++ b/src/kiri-mode/fdm/export.js @@ -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, diff --git a/src/kiri-mode/fdm/post.js b/src/kiri-mode/fdm/post.js index 6b613628..07b87e12 100644 --- a/src/kiri-mode/fdm/post.js +++ b/src/kiri-mode/fdm/post.js @@ -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) { diff --git a/src/kiri-mode/fdm/prepare.js b/src/kiri-mode/fdm/prepare.js index 19494254..62189bcd 100644 --- a/src/kiri-mode/fdm/prepare.js +++ b/src/kiri-mode/fdm/prepare.js @@ -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, diff --git a/src/kiri-mode/fdm/slice.js b/src/kiri-mode/fdm/slice.js index 1ba6622a..e647f7e0 100644 --- a/src/kiri-mode/fdm/slice.js +++ b/src/kiri-mode/fdm/slice.js @@ -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); diff --git a/src/kiri/conf.js b/src/kiri/conf.js index f5698947..2b43ee00 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -764,7 +764,6 @@ const conf = exports({ dark: false, shiny: false, decals: false, - danger: false, zoomSpeed: 1.0, lineType: "path", autoSave: true, diff --git a/src/kiri/init.js b/src/kiri/init.js index 484a6216..7664619d 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -180,7 +180,6 @@ gapp.register("kiri.init", [], (root, exports) => { } control.shiny = ui.shiny.checked; control.decals = ui.decals.checked; - control.danger = ui.danger.checked; control.showOrigin = ui.showOrigin.checked; control.showRulers = ui.showRulers.checked; control.autoLayout = ui.autoLayout.checked; @@ -1531,10 +1530,6 @@ gapp.register("kiri.init", [], (root, exports) => { return !isBelt(); } - function isDanger() { - return ui.danger.checked; - } - // MAIN INITIALIZATION FUNCTION 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}), 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}), - danger: uc.newBoolean(LANG.op_dang_s, booleanSave, {title:LANG.op_dang_l}), lprefs: uc.newGroup(LANG.op_disp, $('prefs-gen2'), {inline: true}), 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}), 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}), - 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}), 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}), diff --git a/web/kiri/index.css b/web/kiri/index.css index ea53c1b2..433db87a 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -10,7 +10,9 @@ --main-color-hover: rgb(96, 127, 164); --top: rgba(255,255,255,0.75); --menu: #f0f0f0; + --menu-text: #222; --menu-border: #555; + --dark-menu-text: #111; } @font-face { font-family: 'Russo One'; @@ -57,6 +59,9 @@ a, a:hover, a:visited { .top-menu label { color: #444; } +.dark .top-menu label { + color: var(--dark-menu-text) +} .top-menu svg { color: var(--main-color); } @@ -67,7 +72,10 @@ a, a:hover, a:visited { align-items: center; } .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 { color: var(--main-color-hover); diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index bffb0705..b7c75f3d 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -246,8 +246,6 @@ self.kiri.lang['en-us'] = { op_decl_l: "show device decals and logos", 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_dang_s: "experimental", - op_dang_l: "show experimental parameters", op_devl_s: "developer", op_devl_l: ["show developer options","enable developer debugging"], op_hopo_s: "hover pop",