From 47903526b6752a9709312d9727ba8425ad63e697 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Mon, 21 Feb 2022 13:27:01 -0500
Subject: [PATCH] update fdm driver to use gapp.register()

---
 src/kiri-mode/fdm/client.js  | 13 ++++++++++---
 src/kiri-mode/fdm/driver.js  | 12 +++++++-----
 src/kiri-mode/fdm/export.js  | 10 +++++++---
 src/kiri-mode/fdm/fill.js    | 13 ++++++++-----
 src/kiri-mode/fdm/prepare.js | 16 +++++++++++++---
 src/kiri-mode/fdm/slice.js   | 15 ++++++++++++---
 6 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/kiri-mode/fdm/client.js b/src/kiri-mode/fdm/client.js
index d7991531..00806f40 100644
--- a/src/kiri-mode/fdm/client.js
+++ b/src/kiri-mode/fdm/client.js
@@ -2,11 +2,18 @@
 
 "use strict";
 
-(function() {
+// dep: add.three
+// dep: geo.base
+// dep: moto.space
+// dep: kiri.api
+// dep: kiri.lang
+// dep: kiri.consts
+// dep: kiri-mode.fdm.driver
+gapp.register("kiri-mode.fdm.client", [], (root, exports) => {
 
 const { Quaternion, Matrix4, Vector3, BufferAttribute, BufferGeometryUtils } = THREE;
 const { Mesh, BoxGeometry, MeshPhongMaterial, Raycaster, Euler } = THREE;
-const { base, kiri, moto } = self;
+const { base, kiri, moto } = root;
 const { util } = base;
 const { api, consts, lang } = kiri;
 const { FDM } = kiri.driver;
@@ -682,4 +689,4 @@ FDM.delbox = delbox;
 FDM.addbox = addbox;
 FDM.restoreSupports = restoreSupports;
 
-})();
+});
diff --git a/src/kiri-mode/fdm/driver.js b/src/kiri-mode/fdm/driver.js
index d248b63f..85c20118 100644
--- a/src/kiri-mode/fdm/driver.js
+++ b/src/kiri-mode/fdm/driver.js
@@ -2,10 +2,12 @@
 
 "use strict";
 
-(function() {
+// use: kiri.api
+gapp.register("kiri-mode.fdm.driver", [], (root, exports) => {
 
-const { kiri } = self;
-const FDM = kiri.driver.FDM = { getRangeParameters };
+const { kiri } = root;
+const { driver } = kiri;
+const FDM = driver.FDM = { getRangeParameters };
 
 // shared by client and worker contexts
 function getRangeParameters(process, index) {
@@ -29,7 +31,7 @@ function getRangeParameters(process, index) {
 }
 
 // defer loading until client and worker exist
-kiri.load(function(api) {
+kiri.load(api => {
 
     const { client, worker } = kiri;
 
@@ -66,4 +68,4 @@ kiri.load(function(api) {
 
 });
 
-})();
+});
diff --git a/src/kiri-mode/fdm/export.js b/src/kiri-mode/fdm/export.js
index ea75cb05..f3aa28ac 100644
--- a/src/kiri-mode/fdm/export.js
+++ b/src/kiri-mode/fdm/export.js
@@ -2,9 +2,13 @@
 
 "use strict";
 
-(function() {
+// dep: geo.base
+// dep: kiri.api
+// dep: kiri.util
+// dep: kiri-mode.fdm.driver
+gapp.register("kiri-mode.fdm.export", [], (root, exports) => {
 
-const { base, kiri } = self;
+const { base, kiri } = root;
 const { util, config } = base;
 const { FDM } = kiri.driver;
 const { getRangeParameters } = FDM;
@@ -935,4 +939,4 @@ FDM.export = function(print, online, ondone, ondebug) {
     }
 };
 
-})();
+});
diff --git a/src/kiri-mode/fdm/fill.js b/src/kiri-mode/fdm/fill.js
index 5176a338..b4949232 100644
--- a/src/kiri-mode/fdm/fill.js
+++ b/src/kiri-mode/fdm/fill.js
@@ -2,13 +2,16 @@
 
 "use strict";
 
-(function() {
+// dep: geo.base
+// dep: kiri.api
+// dep: kiri-mode.fdm.driver
+gapp.register("kiri-mode.fdm.fill", [], (root, exports) => {
 
-const { base, kiri } = self;
+const { base, kiri } = root;
 const { util } = base;
 
 const DEG2RAD = Math.PI / 180,
-    FILL = self.kiri.fill = {
+    FILL = kiri.fill = {
         hex: fillHexFull,
         grid: fillGrid,
         gyroid: fillGyroid,
@@ -16,7 +19,7 @@ const DEG2RAD = Math.PI / 180,
         linear: fillLinear,
         cubic: fillCubic
     },
-    CACHE = self.kiri.fill_fixed = {
+    CACHE = kiri.fill_fixed = {
         hex: fillHexFull,
         grid: fillGrid,
         triangle: fillTriangle
@@ -314,4 +317,4 @@ function fillTriangle(target) {
     }
 }
 
-})();
+});
diff --git a/src/kiri-mode/fdm/prepare.js b/src/kiri-mode/fdm/prepare.js
index 55b466c5..adf88dd4 100644
--- a/src/kiri-mode/fdm/prepare.js
+++ b/src/kiri-mode/fdm/prepare.js
@@ -2,9 +2,19 @@
 
 "use strict";
 
-(function() {
+// dep: geo.base
+// dep: geo.paths
+// dep: geo.point
+// dep: geo.polygons
+// dep: kiri.api
+// dep: kiri.utils
+// dep: kiri.slice
+// dep: kiri.consts
+// dep: kiri-mode.fdm.driver
+// use: kiri.worker
+gapp.register("kiri-mode.fdm.prepare", [], (root, exports) => {
 
-const { base, kiri, noop } = self;
+const { base, kiri, noop } = root;
 const { consts, driver, newSlice, utils } = kiri;
 const { config, polygons, paths, util, newPoint, newPolygon, Polygon } = base;
 const { poly2polyEmit, tip2tipEmit } = paths;
@@ -1742,4 +1752,4 @@ function color4(rgb, inc, seg) {
     }
 }
 
-})();
+});
diff --git a/src/kiri-mode/fdm/slice.js b/src/kiri-mode/fdm/slice.js
index c94e36af..80cd40b5 100644
--- a/src/kiri-mode/fdm/slice.js
+++ b/src/kiri-mode/fdm/slice.js
@@ -2,9 +2,18 @@
 
 "use strict";
 
-(function() {
+// dep: geo.base
+// dep: geo.polygons
+// dep: kiri.api
+// dep: kiri.fill
+// dep: kiri.utils
+// dep: kiri.consts
+// dep: kiri-mode.fdm.driver
+// use: add.clip2
+// use: add.three
+gapp.register("kiri-mode.fdm.slice", [], (root, exports) => {
 
-const { base, kiri, noop } = self;
+const { base, kiri, noop } = root;
 const { consts, driver, fill, fill_fixed, newSlice, utils } = kiri;
 const { config, polygons, util, newPoint } = base;
 const { fillArea } = polygons;
@@ -1897,4 +1906,4 @@ class Coplanars {
     }
 }
 
-})();
+});