From 3c7fe43f24730bcdd70a8a523aa75352f9583fdf Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Mon, 16 Nov 2020 22:19:14 -0500 Subject: [PATCH] add beta warning, discord server link --- app.js | 6 +++--- notes.md | 2 -- src/kiri/init.js | 9 ++++++++- src/mode/cam/slice.js | 2 +- web/kiri/lang/en-help.html | 19 ++++++++++--------- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/app.js b/app.js index 8fe0841c..d86aafc0 100644 --- a/app.js +++ b/app.js @@ -232,10 +232,10 @@ const script = { "kiri", "ext/three", "license", - "ext/clip2", + // "ext/clip2", "ext/tween", "ext/fsave", - "ext/earcut", + // "ext/earcut", "add/array", "add/three", "geo/base", @@ -248,7 +248,7 @@ const script = { "geo/bounds", "geo/polygon", "geo/polygons", - "geo/gyroid", + // "geo/gyroid", "moto/kv", "moto/ajax", "moto/ctrl", diff --git a/notes.md b/notes.md index 643d118f..1030a5c4 100644 --- a/notes.md +++ b/notes.md @@ -30,7 +30,6 @@ * `F` speculative background preview generation * `F` control for size of purge block (with 0=disabled) * `F` add separate fill speed control -* `F` show retract/engage in preview * `F` manual support addition / control * `F` polishing and other non-planar work * `F` gradient infill https://www.youtube.com/watch?v=hq53gsYREHU&feature=emb_logo @@ -54,7 +53,6 @@ # CAM -* `B` contouring should extend beyond part boundaries by tool radius * `B` outside cutting direction in roughing mode inverted * `B` clear voids has double interior pass because wrong offset shadow used * `B` fix contour up and over thru holes by adding (union) tabs to shadow diff --git a/src/kiri/init.js b/src/kiri/init.js index ea5d488d..5792bec4 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -44,7 +44,8 @@ js2o = API.js2o, o2js = API.o2js, platform = API.platform, - selection = API.selection; + selection = API.selection, + beta = 2311; let deviceLock = false, selectedTool = null, @@ -2138,6 +2139,12 @@ $('app-info').innerText = KIRI.version; // show topline separator when iframed // try { if (WIN.self !== WIN.top) $('top-sep').style.display = 'flex' } catch (e) { } + + // warn users they are running a beta release + if (beta && beta > 0 && SDB.kiri_beta != beta) { + API.show.alert("this is a beta / development release"); + SDB.kiri_beta = beta; + } } // if a language needs to load, the script is injected and loaded diff --git a/src/mode/cam/slice.js b/src/mode/cam/slice.js index d2f07704..1ed44638 100644 --- a/src/mode/cam/slice.js +++ b/src/mode/cam/slice.js @@ -188,7 +188,7 @@ const curr = indices[i]; const next = indices[i+1]; if (!flats.contains(curr) && flats.contains(next)) { - console.log('move',curr,'up toward',prev,'b/c next',next,'is flat'); + // console.log('move',curr,'up toward',prev,'b/c next',next,'is flat'); indices[i] = next + ((prev - next) / 2); } } diff --git a/web/kiri/lang/en-help.html b/web/kiri/lang/en-help.html index 9fe75f32..cda78254 100644 --- a/web/kiri/lang/en-help.html +++ b/web/kiri/lang/en-help.html @@ -50,15 +50,15 @@ Quick Start Guide

-

  • Use the Setup menu to select a machine
    • -
  • Clone the machine if you want to customize it
    • -
  • Drag and drop an STL file onto the grid (turns green)
    • +
  • use the Setup menu to select a machine
    • +
  • clone the machine if you want to customize it
    • +
  • drag and drop an STL file onto the grid (turns green)
  • or use files import from your computer
  • use the settings menus (right) to customize slicing parameters
  • slice objects to see the effect of the parameters
  • preview calculates path data from slice objects
  • export converts paths to files like GCode and SVG
    • -
  • Explore Setup preferences for app customization
    • +
  • explore setup preferences for app customization

    • @@ -126,11 +126,12 @@