rm dead code. clean up slicing path marginally. bug fix belt support render

src/kiri-mode/fdm/client.js

@@ -132,6 +132,7 @@ FDM.init = function(kiri, api) {
             };
           }
     }
+
     api.event.on("function.animate", (mode) => {
         if (!(isFdmMode && lastView === VIEWS.PREVIEW)) {
             return;
@@ -145,6 +146,7 @@ FDM.init = function(kiri, api) {
         $('anim-slider').value = 500;
         api.const.STACKS.setFraction(0.5);
     });
+
     api.event.on("mode.set", mode => {
         isFdmMode = mode === 'FDM';
         lastMode = mode;
@@ -152,12 +154,13 @@ FDM.init = function(kiri, api) {
         for (let el of [...document.getElementsByClassName('mode-fdm')]) {
             api.uc.setClass(el, 'hide', !isFdmMode);
         }
-        updateVisiblity();
+        updateSupportVisiblity();
     });
+
     api.event.on("view.set", view => {
         $('top-slider').style.display = 'none';
         lastView = view;
-        updateVisiblity();
+        updateSupportVisiblity();
         filterSynth();
         func.sdone();
         // let ranges = api.conf.get().process.ranges;
@@ -175,27 +178,28 @@ FDM.init = function(kiri, api) {
             }
         }
     });
+
     api.event.on("range.updates", updateRanges);
+
     api.event.on("settings.load", (settings) => {
         if (settings.mode !== 'FDM') return;
         restoreSupports(api.widgets.all());
         updateRanges(settings.process.ranges);
     });
+
     api.event.on("settings.saved", (settings) => {
         updateRanges(settings.process.ranges);
     });
+
     api.event.on("button.click", target => {
         switch (target) {
             case api.ui.ssaGen: return func.sgen();
             case api.ui.ssmAdd: return func.sadd();
             case api.ui.ssmDun: return func.sdone();
-            case api.ui.ssmClr:
+            case api.ui.ssmClr: return func.sclear();
-                // return api.uc.confirm("clear supports?").then(ok => {
-                //     if (ok) func.sclear();
-                // });
-                func.sclear();
         }
     });
+
     api.event.on("fdm.supports.detect", func.sgen = () => {
         let alerts = [];
         let { process, device } = api.conf.get();
@@ -232,10 +236,12 @@ FDM.init = function(kiri, api) {
             api.event.emit("fdm.supports.detected");
         });
     });
+
     api.event.on("fdm.supports.add", func.sadd = () => {
         alert = api.show.alert("[esc] key cancels support editing");
         api.feature.hover = addingSupports = true;
     });
+
     api.event.on("fdm.supports.done", func.sdone = () => {
         delbox('intZ');
         delbox('intW');
@@ -244,22 +250,22 @@ FDM.init = function(kiri, api) {
         api.feature.hover = addingSupports = false;
         fromPillar = undefined;
     });
+
     api.event.on("fdm.supports.clear", func.sclear = () => {
         func.sdone();
         if (clearAllWidgetSupports()) {
             api.conf.save();
         }
     });
+
     api.event.on("slice.begin", () => {
         if (!isFdmMode) {
             return;
         }
         func.sdone();
-        updateVisiblity();
+        updateSupportVisiblity();
-
         // synth support widget for each widget group
         // iow, create support meshes based on support widget annotation
-        let synth = [];
         for (let group of kiri.Widget.Groups.list()) {
             let merge = group.filter(w => w.sups).map(w => Object.values(w.sups)).flat();
             if (!merge.length) {
@@ -285,27 +291,32 @@ FDM.init = function(kiri, api) {
             kiri.space.world.add(sw.mesh);
         }
     });
+
     api.event.on("slice.end", () => {
         if (!isFdmMode) {
             return;
         }
     });
+
     api.event.on("key.esc", () => {
         if (isFdmMode) {
             func.sdone()
         }
     });
+
     api.event.on("selection.scale", () => {
         if (isFdmMode) {
             clearRanges();
             func.sclear();
         }
     });
+
     api.event.on("widget.delete", widget => {
         if (isFdmMode) {
             clearRanges();
         }
     });
+
     api.event.on("widget.duplicate", (widget, oldwidget) => {
         if (!isFdmMode) {
             return;
@@ -318,6 +329,7 @@ FDM.init = function(kiri, api) {
             restoreSupports([widget]);
         }
     });
+
     api.event.on("widget.mirror", widget => {
         if (!isFdmMode) {
             return;
@@ -329,6 +341,7 @@ FDM.init = function(kiri, api) {
             wsup.box.position.x = wsup.x = sup.x = -sup.x;
         });
     });
+
     api.event.on("widget.rotate", rot => {
         if (!isFdmMode) {
             return;
@@ -351,6 +364,7 @@ FDM.init = function(kiri, api) {
             });
         }
     });
+
     api.event.on("mouse.hover.up", func.hoverup = (on = {}) => {
         let { event } = on;
         if (!isFdmMode) {
@@ -405,6 +419,7 @@ FDM.init = function(kiri, api) {
         fromPillar = addWidgetSupport(iw, rec);
         api.conf.save();
     });
+
     function addSupportAtPoint(targets, point, ip, angle, id) {
         let up = new Vector3(0,1,0)
         let dn = new Vector3(0,-1,0)
@@ -432,6 +447,7 @@ FDM.init = function(kiri, api) {
             }
         }
     }
+
     api.event.on("mouse.hover", data => {
         if (!isFdmMode) {
             return;
@@ -489,6 +505,7 @@ FDM.init = function(kiri, api) {
             return func.hoverup();
         }
     });
+
     api.event.on("export.debug", msg => {
         if (msg.arcQ && msg.arcQ.length > 2) {
             if (xpdebug) {
@@ -539,17 +556,6 @@ function scheduleSupportSave(widget) {
     }, 50);
 }
 
-function activeSupports() {
-    const active = [];
-    api.widgets.all().forEach(widget => {
-        Object.values(widget.sups || {}).forEach(support => {
-            active.push(support.box);
-            support.box.support = true;
-        });
-    });
-    return active;
-}
-
 function restoreSupports(widgets) {
     widgets.forEach(widget => {
         const supports = api.widgets.annotate(widget.id).support || [];
@@ -594,10 +600,11 @@ function removeWidgetSupport(widget, rec) {
     fromPillar = undefined;
 }
 
-function updateVisiblity() {
+function updateSupportVisiblity() {
-    api.widgets.all().forEach(w => {
+    const visible = (lastMode === 'FDM' && lastView === VIEWS.ARRANGE);
-        setSupportVisiblity(w, lastMode === 'FDM' && lastView === VIEWS.ARRANGE);
+    for (let w of api.widgets.all()) {
-    });
+        setSupportVisiblity(w, visible);
+    }
 }
 
 function setSupportVisiblity(widget, bool) {

src/kiri-run/worker.js

@@ -302,21 +302,7 @@ kiri.worker = {
 
     // widget sync
     sync(data, send) {
-        if (data.valid) {
+        // ensure each widget belongs to at least one group
-            // remove widgets not present in valid list
-            for (let key in wcache) {
-                if (data.valid.indexOf(key) < 0) {
-                    delete wcache[key];
-                    for (let [id,group] of Object.entries(wgroup)) {
-                        wgroup[id] = group = group.filter(v => v.id !== key);
-                        group.id = id;
-                    }
-                }
-            }
-            send.done(data.id);
-            return;
-        }
-
         let group = wgroup[data.group];
         if (!group) {
             group = [];
@@ -380,13 +366,14 @@ kiri.worker = {
             for (let w of group) {
                 w.moveMesh(0, miny, 0);
             }
+            // rotating the root of the group rotates all widgets in the group
             widget.rotate(rotation, 0, 0, true, false);
-            let minr = gmin(group);
             widget.belt = {
                 angle: 45,
+                // used during prepare
                 xpos,
                 ypos,
-                yadd: minr.maxy - minr.miny,
+                // used during slice
                 dy: - miny - yoff,
                 dz: 0
             };

src/kiri/client.js

@@ -155,12 +155,10 @@ const client = exports({
     },
 
     // widget sync
-    sync(widgets, copy) {
+    sync(widgets) {
         if (!widgets) {
             widgets = kiri.api.widgets.all();
         }
-        // send list of currently valid widgets
-        send("sync", { valid: widgets.map(w => w.id) }, () =>  {});
         // sync any widget that has changed
         for (let widget of widgets.filter(w => w.modified || !syncd[w.id])) {
             syncd[widget.id] = true;
@@ -170,7 +168,7 @@ const client = exports({
                 meta: widget.meta,
                 group: widget.group.id,
                 track: widget.track,
-                vertices: copy ? vertices.slice() : vertices,
+                vertices,
                 position: widget.mesh.position,
             }, done => {
                 widget.modified = false;

src/kiri/function.js

@@ -72,7 +72,6 @@ function prepareSlices(callback, scale = 1, offset = 0) {
 
     // refresh widget list because 'slice.begin' may generate support widgets
     const slicing = api.widgets.all()
-        .slice()
         .filter(w => !w.track.ignore && !w.meta.disabled);
 
     if (slicing.length === 0) {
@@ -117,17 +116,13 @@ function prepareSlices(callback, scale = 1, offset = 0) {
         process.beltAnchor = process.firstLayerBeltLead;
     }
 
-    stacks.clear();
+    stacks.clear(); // clear rendered stacks
+    client.clear(); // clear worker cache
+    client.sync(); // send fresh widget data to worker
+
     if (isBelt) {
-        // clearing cache causes data to be re-sent to worker
-        client.clear();
-        // we send copies of vertices in belt mode only (possibly obsolete?)
-        client.sync(undefined, true);
         // belt op required to rotate meshes for slicing
         client.rotate(settings);
-    } else {
-        // send updated vertices if widget has been rotated/scaled
-        client.sync();
     }
 
     function sliceNext() {
@@ -141,12 +136,9 @@ function prepareSlices(callback, scale = 1, offset = 0) {
     }
 
     function sliceWidget(widget) {
-        widget.stack = stacks.create(widget.id, widget.mesh);
+        // weight each widget progress % by their # vertices
         let factor = (widget.getVertices().count / defvert);
 
-        // compensate for zcut (widget moved through floor)
-        widget.stack.obj.view.position.z = widget.track.zcut || 0;
-
         widget.slice(settings, (sliced, error) => {
             let mark = Date.now();
             // update UI info
@@ -229,8 +221,6 @@ function prepareSlices(callback, scale = 1, offset = 0) {
         if (scale === 1) {
             show.progress(0);
         }
-        // cause visuals to update
-        space.scene.active();
         // mark slicing complete for prep/preview
         complete.slice = true;
         event.emit('slice.end', settings.mode);
@@ -240,9 +230,16 @@ function prepareSlices(callback, scale = 1, offset = 0) {
         if (callback && typeof callback === 'function') {
             callback();
         }
+        if (isBelt) {
+            // required to render supports properly (in belt mode)
+            // because this updates widget top z which is affected by rotation
+            api.platform.update_top_z();
+        }
+        // refresh / repaint workspace
+        space.refresh();
     }
 
-    // kick of slicing chain
+    // kick off slicing chain
     sliceNext();
 }
 

src/kiri/widget.js

@@ -742,6 +742,10 @@ class Widget {
         onupdate(0.0001, "slicing");
 
         if (kiri.client && !widget.inWorker) {
+            // store slicing visuals
+            widget.stack = kiri.stacks.create(widget.id, widget.mesh);
+            // compensate for zcut (widget moved through floor)
+            widget.stack.obj.view.position.z = widget.track.zcut || 0;
             // in case result of slice is nothing, do not preserve previous
             widget.slices = []
 

src/moto/space.js

@@ -1433,26 +1433,27 @@ gapp.register("moto.space", [], (root, exports) => {
 
             let animates = 0;
             let rateStart = Date.now();
-
-            let renders = [];
             let renderStart;
+            let renders = [];
 
             function animate() {
                 animates++;
                 const now = Date.now();
                 if (now - rateStart > 1000) {
+                    // compute stats roughly every second
                     const delta = now - rateStart;
                     fps = 1000 * animates / delta;
                     animates = 0;
                     rateStart = now;
+                    // look for slowest rendered frame
                     renderTime = Math.max(0, ...renders);
                     renders.length = 0;
                 }
-
                 requestAnimationFrame(animate);
                 if (docVisible && !freeze && Date.now() - lastAction < 1500) {
                     renderStart = Date.now();
                     renderer.render(SCENE, camera);
+                    // track frame render times
                     renders.push(Date.now() - renderStart);
                 } else {
                     fps = 0;