diff --git a/app.js b/app.js index 8c08efea..27971eaf 100644 --- a/app.js +++ b/app.js @@ -230,7 +230,6 @@ const script = { "add/array", "add/three", "geo/base", - "geo/debug", "geo/render", "geo/point", "geo/points", @@ -289,7 +288,6 @@ const script = { "add/class", "geo/base", // "geo/wasm", - "geo/debug", "geo/point", "geo/points", "geo/slope", @@ -333,7 +331,6 @@ const script = { "add/array", "add/class", "geo/base", - "geo/debug", "geo/point", "geo/points", "geo/slope", @@ -358,7 +355,6 @@ const script = { "add/array", "add/three", "geo/base", - "geo/debug", "geo/render", "geo/point", "geo/points", @@ -389,7 +385,6 @@ const script = { "add/array", "add/three", "geo/base", - "geo/debug", "geo/render", "geo/point", "geo/slope", diff --git a/src/geo/debug.js b/src/geo/debug.js deleted file mode 100644 index bbb156c7..00000000 --- a/src/geo/debug.js +++ /dev/null @@ -1,219 +0,0 @@ -/** Copyright 2014-2019 Stewart Allen -- All Rights Reserved */ - -"use strict"; - -(function() { - - if (self.base.debug) return; - - const base = self.base, - flags = {}, - stash = [], - debug_colors = [0xff0000, 0x00ff00, 0x0000ff, 0x00ffff, 0xff00ff, 0xffff00]; - - let size = 20, - enabled = false, - next_debug_color = 0; - - /** ****************************************************************** - * Debug Functions - ******************************************************************* */ - - function log(o) { - console.log(o); - if (enabled) { - stash.push(o); - while (stash.length > size) stash.shift(); - } - } - - function enable(history) { - enabled = true; - if (history) size = Math.abs(history); - } - - function disable() { - enabled = false; - } - - function on() { - return enabled; - } - - function history() { - return stash; - } - - function last() { - return stash[stash.length-1]; - } - - function trace(msg) { - if (msg && typeof msg != 'string') msg = JSON.stringify(msg); - log(new Error(msg).stack); - } - - function view() { - return base.debug.view; - } - - function setView(view) { - base.debug.view = view; - } - - function get(f) { - return flags[f]; - } - - function set(f, value) { - if (Array.isArray(f)) { - for (let i=0; i 2) { p1.del = true; @@ -804,11 +798,9 @@ del = true; p1.del = true; p2.del = true; - if (debug) dbug.points([p1, p2], 0xffffff, 0.2, 1); } else { del = true; p1.del = true; - if (debug) dbug.points([p1], 0xffff00, 0.2, 0.85); } } return p1.dist - p2.dist; // sort on 'a' dist from ray origin @@ -839,7 +831,6 @@ // p1.del = true; // p2.del = true; // del = true; - // if (debug) dbug.points([p1, p2], 0xfff000, 0.2, 2); //} // check cull co-linear with group edge if (same && p1.mod && p2.mod) { @@ -848,7 +839,6 @@ p1.del = true; p2.del = true; del = true; - if (debug) dbug.points([p1, p2], 0xffffff, 0.2, 1.85); } } } diff --git a/src/kiri/export.js b/src/kiri/export.js index aba7fc57..d8c0884c 100644 --- a/src/kiri/export.js +++ b/src/kiri/export.js @@ -1,4 +1,4 @@ -/** Copyright Stewart Allen -- All Rights Reserved */ +console.log/** Copyright Stewart Allen -- All Rights Reserved */ "use strict"; @@ -203,7 +203,7 @@ function gridhost_tracker(host,key) { ajax(host+"/api/check?key="+key, function(data) { data = js2o(data); - DBUG.log(data); + console.log(data); if (!(data.done || data.error)) { setTimeout(function() { gridhost_tracker(host,key) }, 1000); } @@ -373,7 +373,7 @@ gridhost_tracker(host,json.key); API.ajax(host+"/api/wait?key="+json.key, function(data) { data = js2o(data); - DBUG.log(data); + console.log(data); API.show.alert("print to "+target+": "+data.status, 600); }); } else { diff --git a/src/kiri/main.js b/src/kiri/main.js index b83f6b7c..d282c8b4 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -1,4 +1,4 @@ -/** Copyright Stewart Allen -- All Rights Reserved */ +console.log/** Copyright Stewart Allen -- All Rights Reserved */ "use strict"; @@ -8,7 +8,6 @@ KIRI = self.kiri, BASE = self.base, UTIL = BASE.util, - DBUG = BASE.debug, LANG = KIRI.lang.current, WIN = self.window, DOC = self.document, @@ -56,8 +55,6 @@ saveTimer = null, noop = () => {}; - DBUG.enable(); - // add show() to catalog for API CATALOG.show = showCatalog; @@ -1134,7 +1131,7 @@ API.event.emit('slice.end', getMode()); // print stats segtimes.total = Date.now() - now; - DBUG.log(segtimes); + console.log(segtimes); if (callback && typeof callback === 'function') { callback(); } @@ -1231,7 +1228,7 @@ // print stats segtimes.total = Date.now() - now; - DBUG.log(segtimes); + console.log(segtimes); API.event.emit('print', pMode); API.event.emit('preview.end', pMode); @@ -2483,7 +2480,7 @@ function loadFile() { $('load-file').onchange = function(event) { - DBUG.log(event); + console.log(event); platformLoadFiles(event.target.files); }; $('load-file').click(); @@ -2908,7 +2905,7 @@ setWidgetVisibility(true); break; default: - DBUG.log("invalid view mode: "+mode); + console.log("invalid view mode: "+mode); return; } API.event.emit('view.set', mode); @@ -2933,7 +2930,7 @@ function setMode(mode, lock, then) { if (!MODES[mode]) { - DBUG.log("invalid mode: "+mode); + console.log("invalid mode: "+mode); mode = 'FDM'; } // change mode constants diff --git a/src/kiri/print.js b/src/kiri/print.js index 769b37a7..ed839a76 100644 --- a/src/kiri/print.js +++ b/src/kiri/print.js @@ -13,7 +13,6 @@ FDM = DRIVERS.FDM, BASE = self.base, UTIL = BASE.util, - DBUG = BASE.debug, POLY = BASE.polygons, SQRT = Math.sqrt, SQR = UTIL.sqr, diff --git a/src/kiri/slicer.js b/src/kiri/slicer.js index d79013cf..9c3ad609 100644 --- a/src/kiri/slicer.js +++ b/src/kiri/slicer.js @@ -516,8 +516,7 @@ */ function connectLines(input, z, debug) { // map points to all other points they're connected to - let DBUG = BASE.debug, - CONF = BASE.config, + let CONF = BASE.config, pmap = {}, points = [], output = [], @@ -532,6 +531,7 @@ if (cp) return cp; points.push(p); pmap[p.key] = p; + p.pos = 0; p.mod = nextMod++; // unique seq ID for points p.toString = function() { return this.mod }; // point array concat return p; @@ -559,7 +559,7 @@ function findPathsMinRecurse(point, path, paths, from) { let stack = [ ]; if (paths.length > 10000) { - DBUG.log(`indeterminate path @ ${z} from paths=${paths.length} input=${input.length}`); + console.log(`indeterminate path @ ${z} from paths=${paths.length} input=${input.length}`); input.excessive = paths.length; return; } diff --git a/src/kiri/widget.js b/src/kiri/widget.js index e5a07f78..a78d4d68 100644 --- a/src/kiri/widget.js +++ b/src/kiri/widget.js @@ -1,4 +1,4 @@ -/** Copyright Stewart Allen -- All Rights Reserved */ +console.log/** Copyright Stewart Allen -- All Rights Reserved */ "use strict"; @@ -10,7 +10,6 @@ DRIVERS = KIRI.driver, BASE = self.base, CONF = BASE.config, - DBUG = BASE.debug, UTIL = BASE.util, POLY = BASE.polygons, MATH = Math, @@ -721,7 +720,7 @@ if (driver) { driver.slice(settings, widget, catchupdate, catchdone); } else { - DBUG.log('invalid mode: '+settings.mode); + console.log('invalid mode: '+settings.mode); ondone('invalid mode: '+settings.mode); } } diff --git a/src/kiri/worker.js b/src/kiri/worker.js index f5e0b13d..45e5fb37 100644 --- a/src/kiri/worker.js +++ b/src/kiri/worker.js @@ -177,7 +177,6 @@ KIRI.minions = { }; console.log(`kiri | init work | ${KIRI.version || "rogue"}`); -BASE.debug.disable(); // code is running in the worker / server context const dispatch = diff --git a/src/mode/fdm/driver.js b/src/mode/fdm/driver.js index 652e4081..9940a80b 100644 --- a/src/mode/fdm/driver.js +++ b/src/mode/fdm/driver.js @@ -6,7 +6,6 @@ const KIRI = self.kiri, BASE = self.base, - DBUG = BASE.debug, UTIL = BASE.util, POLY = BASE.polygons, FDM = KIRI.driver.FDM = { diff --git a/src/mode/fdm/slice.js b/src/mode/fdm/slice.js index 93760953..82ed2660 100644 --- a/src/mode/fdm/slice.js +++ b/src/mode/fdm/slice.js @@ -6,7 +6,6 @@ const KIRI = self.kiri, BASE = self.base, - DBUG = BASE.debug, POLY = BASE.polygons, UTIL = BASE.util, CONF = BASE.config, @@ -173,8 +172,8 @@ Math.min(process.sliceMinHeight, sliceHeight) : 0; if (sliceHeightBase < sliceHeight) { - DBUG.log("invalid first layer height < slice height"); - DBUG.log("reverting to min valid slice height"); + console.log("invalid first layer height < slice height"); + console.log("reverting to min valid slice height"); sliceHeightBase = sliceMinHeight || sliceHeight; } diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index bbd1bd2d..6fa701ad 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -203,7 +203,7 @@ kiri.lang['en-us'] = { op_dang_s: "experimental", op_dang_l: "show experimental parameters", op_devl_s: "developer", - op_devl_l: "show developer options", + op_devl_l: ["show developer options","enable developer debugging"], op_hopo_s: "hover pop", op_hopo_l: ["enable menu hover","to activate"], op_dark_s: "dark mode",