bump rev 4.0.17, 1.4.9

package.json

@@ -1,6 +1,6 @@
 {
     "name": "grid-apps",
-    "version": "4.0.16",
+    "version": "4.0.17",
     "description": "grid.space 3d slice & modeling tools",
     "author": "Stewart Allen <sa@grid.space>",
     "license": "MIT",

src/geo/point.js

@@ -10,10 +10,10 @@ const { util, config, key } = base;
 const { round } = util;
 
 class Point {
-    constructor(x, y, z, key) {
+    constructor(x = 0, y = 0, z = 0, key) {
         this.x = x;
         this.y = y;
-        this.z = z || 0;
+        this.z = z;
         if (key) {
             this._key = key;
         }
@@ -81,7 +81,7 @@ class Point {
         return this;
     }
 
-    scale(x = 1,y = 1,z = 1) {
+    scale(x = 1, y = 1, z = 1) {
         this.x *= x;
         this.y *= y;
         this.z *= z;

src/main/mesh.js

@@ -22,7 +22,7 @@ const { broker } = gapp;
 const { mesh, moto } = root;
 const { space } = moto;
 
-const version = mesh.version = '1.4.8';
+const version = mesh.version = '1.4.9';
 const call = broker.send;
 const dbindex = [ "admin", "space" ];
 

src/mesh/split.js

@@ -12,8 +12,9 @@
 gapp.register("mesh.split", [], (root, exports) => {
 
 const { Mesh, MeshPhongMaterial, PlaneGeometry, DoubleSide, Vector3 } = THREE;
-const { moto } = root;
+const { mesh, moto } = root;
 const { space } = moto;
+const { api } = mesh;
 
 let isActive;
 
@@ -59,7 +60,7 @@ let split = {
             let { point, face, object } = int;
             let { x, y, z } = point;
             // set appearance of split plane
-            mat.color.set(0x5555aa);
+            mat.color.set(api.prefs.map.space.dark ? 0x0059bb : 0x0079ff);
             obj.visible = true;
             if (event.shiftKey) {
                 y = split.closestZ(y, object, face).y;

src/mesh/work.js

@@ -24,7 +24,7 @@ const { Matrix4, Vector3, BufferGeometry, BufferAttribute, computeFaceNormal } =
 const { base, mesh, moto } = root;
 const { client, worker } = moto;
 const { util } = mesh;
-const { CSG, newPolygon } = base;
+const { CSG, newPoint, newPolygon, sliceConnect } = base;
 const cache = {};
 
 // add scoped access to cache
@@ -191,6 +191,7 @@ let model = {
         let on = [];
         let over = [];
         let under = [];
+        let edges = [];
         function sort(v) {
             if (v.z < z) return under.push(v);
             if (v.z > z) return over.push(v);
@@ -265,6 +266,7 @@ let model = {
                     g1.appendAll([ ...p2, ...m2, ...m1 ]);
                     g2.appendAll([ ...m1, ...m2, ...p3 ]);
                 }
+                edges.push({ p1: newPoint().move(m1), p2: newPoint().move(m2) });
             }
             on.length = over.length = under.length = 0;
         }
@@ -273,6 +275,7 @@ let model = {
         let b2 = new BufferAttribute(o2.toFloat32(), 3);
         o1 = b1.applyMatrix4(mi4).array;
         o2 = b2.applyMatrix4(mi4).array;
+        console.log({ edges, split_face: sliceConnect(edges, z), o1, o2 });
         return { o1, o2 };
     },
 

src/moto/license.js

@@ -5,7 +5,7 @@
     let terms = {
         COPYRIGHT: "Copyright (C) Stewart Allen <sa@grid.space> - All Rights Reserved",
         LICENSE: "See the license.md file included with the source distribution",
-        VERSION: (is_self ? self : this).debug_version || "4.0.16"
+        VERSION: (is_self ? self : this).debug_version || "4.0.17"
     };
 
     if (typeof(module) === 'object') {

web/kiri/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name": "Kiri:Moto 4.0.16",
+    "name": "Kiri:Moto 4.0.17",
     "short_name": "Kiri:Moto",
     "description": "Slicer for 3D printers, CNC mills, laser cutters and more",
     "start_url": "/kiri/",