From 678316ac951e597bcd8f02ac5a0308194f38efd1 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 28 Dec 2021 16:38:05 -0500 Subject: [PATCH] package re-organization --- app.js | 80 +++++++++---------- src/{moto/idb.js => data/index.js} | 12 +-- src/{moto/kv.js => data/local.js} | 18 ++--- src/{dev => kiri-dev}/cam/Any.Generic.Grbl | 0 .../cam/Any.Generic.LinuxCNC | 0 src/{dev => kiri-dev}/cam/Any.Generic.TinyG | 0 .../cam/Carbide3D.Nomad.883Pro | 0 .../cam/Carbide3D.Shapeoko.3 | 0 .../cam/Carbide3D.Shapeoko.XL | 0 .../cam/Carbide3D.Shapeoko.XXL | 0 src/{dev => kiri-dev}/cam/Genmitsu.3018 | 0 .../cam/Genmitsu.PROVerXL.4030 | 0 .../cam/Inventables.Carvey.Any | 0 .../cam/Inventables.XCarve.1000mm | 0 .../cam/Inventables.XCarve.500mm | 0 src/{dev => kiri-dev}/cam/Roland.MDX-50 | 0 src/{dev => kiri-dev}/cam/Sienci.LongMill | 0 src/{dev => kiri-dev}/cam/Sienci.Mill.One | 0 src/{dev => kiri-dev}/cam/Techno.Davinci.CNC | 0 src/{dev => kiri-dev}/fdm/Any.Generic.Marlin | 0 .../fdm/Any.Generic.Sailfish | 0 src/{dev => kiri-dev}/fdm/Anycubic.Chiron | 0 src/{dev => kiri-dev}/fdm/Anycubic.Predator | 0 src/{dev => kiri-dev}/fdm/Anycubic.i3.Mega | 0 src/{dev => kiri-dev}/fdm/Atom.v2 | 0 src/{dev => kiri-dev}/fdm/Creality.CR-10S | 0 src/{dev => kiri-dev}/fdm/Creality.CR-10S-Pro | 0 src/{dev => kiri-dev}/fdm/Creality.CR-30 | 0 src/{dev => kiri-dev}/fdm/Creality.Ender.3 | 0 src/{dev => kiri-dev}/fdm/Creality.Ender.5 | 0 src/{dev => kiri-dev}/fdm/Creality.Ender.6 | 0 src/{dev => kiri-dev}/fdm/Creality.Sermoon.D1 | 0 src/{dev => kiri-dev}/fdm/Cubicon.Single+ | 0 src/{dev => kiri-dev}/fdm/Cubicon.Style | 0 src/{dev => kiri-dev}/fdm/DeltaMaker.2T | 0 src/{dev => kiri-dev}/fdm/DeltaMaker.Original | 0 src/{dev => kiri-dev}/fdm/FLSUN.QQ-S | 0 src/{dev => kiri-dev}/fdm/Flashforge.Finder | 0 .../fdm/Flashforge.Guider.II | 0 src/{dev => kiri-dev}/fdm/FolgerTech.FT5 | 0 src/{dev => kiri-dev}/fdm/GridBot.One | 0 src/{dev => kiri-dev}/fdm/GridBot.Two | 0 .../fdm/IMADE3D.JellyBOX.Original | 0 src/{dev => kiri-dev}/fdm/IMADE3D.JellyBOX2 | 0 src/{dev => kiri-dev}/fdm/Leapfrog.CreatrHS | 0 src/{dev => kiri-dev}/fdm/MakerGear.M2 | 0 .../fdm/Makerbot.Replicator2 | 0 src/{dev => kiri-dev}/fdm/Prusa.i3.MK2S | 0 src/{dev => kiri-dev}/fdm/Raise3D.N2 | 0 src/{dev => kiri-dev}/fdm/SainSmart.Infi-20 | 0 src/{dev => kiri-dev}/fdm/TypeA.Series1 | 0 src/{dev => kiri-dev}/fdm/TypeA.Series1Pro | 0 src/{dev => kiri-dev}/fdm/Ulio3D | 0 src/{dev => kiri-dev}/fdm/Ulio3D.Purge | 0 .../fdm/Ultimaker.Ultimaker2 | 0 .../fdm/Wanhao.Duplicator_4s | 0 .../fdm/Wanhao.Duplicator_5s | 0 src/{dev => kiri-dev}/fdm/Wanhao.Duplicator_6 | 0 .../fdm/Wanhao.Duplicator_i3 | 0 src/{dev => kiri-dev}/fdm/XYZ.daVinci.Jr.Pro | 0 src/{dev => kiri-dev}/fdm/XYZ.daVinci.Mini.w | 0 src/{dev => kiri-dev}/laser/Any.Generic.Laser | 0 src/{dev => kiri-dev}/laser/Glowforge | 0 src/{dev => kiri-dev}/sla/Anycubic.Photon | 0 src/{dev => kiri-dev}/sla/Anycubic.Photon.S | 0 src/{dev => kiri-dev}/sla/Creality.Halot.Max | 0 src/{dev => kiri-dev}/sla/Creality.Halot.One | 0 src/{dev => kiri-dev}/sla/Creality.Halot.Sky | 0 src/{ico => kiri-ico}/cam.svg | 0 src/{ico => kiri-ico}/fdm.svg | 0 src/{ico => kiri-ico}/laser.svg | 0 src/{ico => kiri-ico}/sla.svg | 0 src/{mode => kiri-mode}/cam/animate.js | 0 src/{mode => kiri-mode}/cam/client.js | 0 src/{mode => kiri-mode}/cam/driver.js | 0 src/{mode => kiri-mode}/cam/export.js | 0 src/{mode => kiri-mode}/cam/ops.js | 0 src/{mode => kiri-mode}/cam/prepare.js | 0 src/{mode => kiri-mode}/cam/slice.js | 0 src/{mode => kiri-mode}/cam/tool.js | 0 src/{mode => kiri-mode}/cam/topo.js | 0 src/{mode => kiri-mode}/fdm/client.js | 0 src/{mode => kiri-mode}/fdm/driver.js | 0 src/{mode => kiri-mode}/fdm/export.js | 0 src/{mode => kiri-mode}/fdm/fill.js | 0 src/{mode => kiri-mode}/fdm/prepare.js | 0 src/{mode => kiri-mode}/fdm/slice.js | 0 src/{mode => kiri-mode}/laser/driver.js | 0 src/{mode => kiri-mode}/sla/client.js | 0 src/{mode => kiri-mode}/sla/driver.js | 0 src/{mode => kiri-mode}/sla/export.js | 0 src/{mode => kiri-mode}/sla/slice.js | 0 src/{mode => kiri-mode}/sla/x_cxdlp.js | 0 src/{mode => kiri-mode}/sla/x_photon.js | 0 src/kiri/main.js | 7 +- src/moto/ajax.js | 2 +- src/moto/{ctrl.js => orbit.js} | 4 +- src/moto/space.js | 2 +- 98 files changed, 63 insertions(+), 62 deletions(-) rename src/{moto/idb.js => data/index.js} (97%) rename src/{moto/kv.js => data/local.js} (69%) rename src/{dev => kiri-dev}/cam/Any.Generic.Grbl (100%) rename src/{dev => kiri-dev}/cam/Any.Generic.LinuxCNC (100%) rename src/{dev => kiri-dev}/cam/Any.Generic.TinyG (100%) rename src/{dev => kiri-dev}/cam/Carbide3D.Nomad.883Pro (100%) rename src/{dev => kiri-dev}/cam/Carbide3D.Shapeoko.3 (100%) rename src/{dev => kiri-dev}/cam/Carbide3D.Shapeoko.XL (100%) rename src/{dev => kiri-dev}/cam/Carbide3D.Shapeoko.XXL (100%) rename src/{dev => kiri-dev}/cam/Genmitsu.3018 (100%) rename src/{dev => kiri-dev}/cam/Genmitsu.PROVerXL.4030 (100%) rename src/{dev => kiri-dev}/cam/Inventables.Carvey.Any (100%) rename src/{dev => kiri-dev}/cam/Inventables.XCarve.1000mm (100%) rename src/{dev => kiri-dev}/cam/Inventables.XCarve.500mm (100%) rename src/{dev => kiri-dev}/cam/Roland.MDX-50 (100%) rename src/{dev => kiri-dev}/cam/Sienci.LongMill (100%) rename src/{dev => kiri-dev}/cam/Sienci.Mill.One (100%) rename src/{dev => kiri-dev}/cam/Techno.Davinci.CNC (100%) rename src/{dev => kiri-dev}/fdm/Any.Generic.Marlin (100%) rename src/{dev => kiri-dev}/fdm/Any.Generic.Sailfish (100%) rename src/{dev => kiri-dev}/fdm/Anycubic.Chiron (100%) rename src/{dev => kiri-dev}/fdm/Anycubic.Predator (100%) rename src/{dev => kiri-dev}/fdm/Anycubic.i3.Mega (100%) rename src/{dev => kiri-dev}/fdm/Atom.v2 (100%) rename src/{dev => kiri-dev}/fdm/Creality.CR-10S (100%) rename src/{dev => kiri-dev}/fdm/Creality.CR-10S-Pro (100%) rename src/{dev => kiri-dev}/fdm/Creality.CR-30 (100%) rename src/{dev => kiri-dev}/fdm/Creality.Ender.3 (100%) rename src/{dev => kiri-dev}/fdm/Creality.Ender.5 (100%) rename src/{dev => kiri-dev}/fdm/Creality.Ender.6 (100%) rename src/{dev => kiri-dev}/fdm/Creality.Sermoon.D1 (100%) rename src/{dev => kiri-dev}/fdm/Cubicon.Single+ (100%) rename src/{dev => kiri-dev}/fdm/Cubicon.Style (100%) rename src/{dev => kiri-dev}/fdm/DeltaMaker.2T (100%) rename src/{dev => kiri-dev}/fdm/DeltaMaker.Original (100%) rename src/{dev => kiri-dev}/fdm/FLSUN.QQ-S (100%) rename src/{dev => kiri-dev}/fdm/Flashforge.Finder (100%) rename src/{dev => kiri-dev}/fdm/Flashforge.Guider.II (100%) rename src/{dev => kiri-dev}/fdm/FolgerTech.FT5 (100%) rename src/{dev => kiri-dev}/fdm/GridBot.One (100%) rename src/{dev => kiri-dev}/fdm/GridBot.Two (100%) rename src/{dev => kiri-dev}/fdm/IMADE3D.JellyBOX.Original (100%) rename src/{dev => kiri-dev}/fdm/IMADE3D.JellyBOX2 (100%) rename src/{dev => kiri-dev}/fdm/Leapfrog.CreatrHS (100%) rename src/{dev => kiri-dev}/fdm/MakerGear.M2 (100%) rename src/{dev => kiri-dev}/fdm/Makerbot.Replicator2 (100%) rename src/{dev => kiri-dev}/fdm/Prusa.i3.MK2S (100%) rename src/{dev => kiri-dev}/fdm/Raise3D.N2 (100%) rename src/{dev => kiri-dev}/fdm/SainSmart.Infi-20 (100%) rename src/{dev => kiri-dev}/fdm/TypeA.Series1 (100%) rename src/{dev => kiri-dev}/fdm/TypeA.Series1Pro (100%) rename src/{dev => kiri-dev}/fdm/Ulio3D (100%) rename src/{dev => kiri-dev}/fdm/Ulio3D.Purge (100%) rename src/{dev => kiri-dev}/fdm/Ultimaker.Ultimaker2 (100%) rename src/{dev => kiri-dev}/fdm/Wanhao.Duplicator_4s (100%) rename src/{dev => kiri-dev}/fdm/Wanhao.Duplicator_5s (100%) rename src/{dev => kiri-dev}/fdm/Wanhao.Duplicator_6 (100%) rename src/{dev => kiri-dev}/fdm/Wanhao.Duplicator_i3 (100%) rename src/{dev => kiri-dev}/fdm/XYZ.daVinci.Jr.Pro (100%) rename src/{dev => kiri-dev}/fdm/XYZ.daVinci.Mini.w (100%) rename src/{dev => kiri-dev}/laser/Any.Generic.Laser (100%) rename src/{dev => kiri-dev}/laser/Glowforge (100%) rename src/{dev => kiri-dev}/sla/Anycubic.Photon (100%) rename src/{dev => kiri-dev}/sla/Anycubic.Photon.S (100%) rename src/{dev => kiri-dev}/sla/Creality.Halot.Max (100%) rename src/{dev => kiri-dev}/sla/Creality.Halot.One (100%) rename src/{dev => kiri-dev}/sla/Creality.Halot.Sky (100%) rename src/{ico => kiri-ico}/cam.svg (100%) rename src/{ico => kiri-ico}/fdm.svg (100%) rename src/{ico => kiri-ico}/laser.svg (100%) rename src/{ico => kiri-ico}/sla.svg (100%) rename src/{mode => kiri-mode}/cam/animate.js (100%) rename src/{mode => kiri-mode}/cam/client.js (100%) rename src/{mode => kiri-mode}/cam/driver.js (100%) rename src/{mode => kiri-mode}/cam/export.js (100%) rename src/{mode => kiri-mode}/cam/ops.js (100%) rename src/{mode => kiri-mode}/cam/prepare.js (100%) rename src/{mode => kiri-mode}/cam/slice.js (100%) rename src/{mode => kiri-mode}/cam/tool.js (100%) rename src/{mode => kiri-mode}/cam/topo.js (100%) rename src/{mode => kiri-mode}/fdm/client.js (100%) rename src/{mode => kiri-mode}/fdm/driver.js (100%) rename src/{mode => kiri-mode}/fdm/export.js (100%) rename src/{mode => kiri-mode}/fdm/fill.js (100%) rename src/{mode => kiri-mode}/fdm/prepare.js (100%) rename src/{mode => kiri-mode}/fdm/slice.js (100%) rename src/{mode => kiri-mode}/laser/driver.js (100%) rename src/{mode => kiri-mode}/sla/client.js (100%) rename src/{mode => kiri-mode}/sla/driver.js (100%) rename src/{mode => kiri-mode}/sla/export.js (100%) rename src/{mode => kiri-mode}/sla/slice.js (100%) rename src/{mode => kiri-mode}/sla/x_cxdlp.js (100%) rename src/{mode => kiri-mode}/sla/x_photon.js (100%) rename src/moto/{ctrl.js => orbit.js} (99%) diff --git a/app.js b/app.js index cf13025e..431e2182 100644 --- a/app.js +++ b/app.js @@ -246,9 +246,10 @@ const script = { "geo/polygons", // "geo/gyroid", "geo/mesh", - "moto/kv", + "data/local", + "data/index", "moto/ajax", - "moto/ctrl", + "moto/orbit", "moto/space", "load/3mf", "load/obj", @@ -257,7 +258,6 @@ const script = { "load/url", "load/file", "moto/broker", - "moto/idb", "kiri/ui", "kiri/do", "kiri/pack", @@ -267,16 +267,16 @@ const script = { "kiri/slice", "kiri/layers", "kiri/client", - "mode/fdm/fill", - "mode/fdm/driver", - "mode/fdm/client", - "mode/sla/driver", - "mode/sla/client", - "mode/cam/driver", - "mode/cam/client", - "mode/cam/tool", - "mode/cam/animate", - "mode/laser/driver", + "kiri-mode/fdm/fill", + "kiri-mode/fdm/driver", + "kiri-mode/fdm/client", + "kiri-mode/sla/driver", + "kiri-mode/sla/client", + "kiri-mode/cam/driver", + "kiri-mode/cam/client", + "kiri-mode/cam/tool", + "kiri-mode/cam/animate", + "kiri-mode/laser/driver", "kiri/stack", "kiri/stacks", "kiri/widget", @@ -318,25 +318,25 @@ const script = { "kiri/slicer", "kiri/slicer2", "kiri/layers", - "mode/fdm/fill", - "mode/fdm/driver", - "mode/fdm/slice", - "mode/fdm/prepare", - "mode/fdm/export", - "mode/sla/driver", - "mode/sla/slice", - "mode/sla/export", - "mode/sla/x_cxdlp", - "mode/sla/x_photon", - "mode/cam/driver", - "mode/cam/ops", - "mode/cam/tool", - "mode/cam/topo", - "mode/cam/slice", - "mode/cam/prepare", - "mode/cam/export", - "mode/cam/animate", - "mode/laser/driver", + "kiri-mode/fdm/fill", + "kiri-mode/fdm/driver", + "kiri-mode/fdm/slice", + "kiri-mode/fdm/prepare", + "kiri-mode/fdm/export", + "kiri-mode/sla/driver", + "kiri-mode/sla/slice", + "kiri-mode/sla/export", + "kiri-mode/sla/x_cxdlp", + "kiri-mode/sla/x_photon", + "kiri-mode/cam/driver", + "kiri-mode/cam/ops", + "kiri-mode/cam/tool", + "kiri-mode/cam/topo", + "kiri-mode/cam/slice", + "kiri-mode/cam/prepare", + "kiri-mode/cam/export", + "kiri-mode/cam/animate", + "kiri-mode/laser/driver", "kiri/widget", "kiri/print", "kiri/codec", @@ -359,8 +359,8 @@ const script = { "geo/polygon", "geo/polygons", "geo/gyroid", - "mode/fdm/driver", - "mode/fdm/slice", + "kiri-mode/fdm/driver", + "kiri-mode/fdm/slice", "kiri/slice", "kiri/slicer", "kiri/layers", @@ -371,6 +371,7 @@ const script = { engine : [ "main/kiri", "moto/license", + "data/local", "ext/three", "add/array", "add/three", @@ -383,7 +384,6 @@ const script = { "geo/bounds", "geo/polygon", "geo/polygons", - "moto/kv", "moto/broker", "load/obj", "load/stl", @@ -406,6 +406,7 @@ const script = { "moto/client", "moto/license", "moto/broker", + "data/index", "ext/three", "ext/three-bgu", "ext/three-svg", @@ -413,7 +414,7 @@ const script = { "ext/fsave", "add/array", "add/three", - "moto/ctrl", + "moto/orbit", "moto/space", "load/3mf", "load/obj", @@ -421,13 +422,13 @@ const script = { "load/svg", "load/url", "load/file", - "moto/idb", "main/mesh" ], mesh_work : [ "moto/client", "moto/worker", "moto/license", + "data/index", "ext/jszip", "ext/clip2", "ext/earcut", @@ -445,7 +446,6 @@ const script = { "geo/polygons", "geo/mesh", "moto/broker", - "moto/idb", "mesh/work" ], mesh_pool : [ @@ -598,7 +598,7 @@ function serveCode(req, res, code) { } function generateIcons() { - let root = `${dir}/src/ico`; + let root = `${dir}/src/kiri-ico`; let icos = {}; fs.readdirSync(root).forEach(file => { let name = file.split(".")[0] ; @@ -608,7 +608,7 @@ function generateIcons() { } function generateDevices() { - let root = `${dir}/src/dev`; + let root = `${dir}/src/kiri-dev`; let devs = {}; fs.readdirSync(root).forEach(type => { let map = devs[type] = devs[type] || {}; diff --git a/src/moto/idb.js b/src/data/index.js similarity index 97% rename from src/moto/idb.js rename to src/data/index.js index 5df2dc49..78bf1e93 100644 --- a/src/moto/idb.js +++ b/src/data/index.js @@ -4,10 +4,10 @@ (function() { - let moto = self.moto = self.moto || {}; - if (moto.IDB) return; + let data = self.data = self.data || {}; + if (data.Index) return; - moto.IDB = moto.Storage = Storage; + data.Index = IDBStore; // https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API @@ -25,7 +25,7 @@ * @param {number} [version] * @constructor */ - function Storage(dbname, options = {}) { + function IDBStore(dbname, options = {}) { this.db = null; this.name = dbname; this.stores = options.stores || [ dbname ]; @@ -35,11 +35,11 @@ this.initCalled = false; } - Storage.delete = function(dbname) { + IDBStore.delete = function(dbname) { IDB.deleteDatabase(dbname); }; - let SP = Storage.prototype; + let SP = IDBStore.prototype; /** ****************************************************************** * indexedDB implementation diff --git a/src/moto/kv.js b/src/data/local.js similarity index 69% rename from src/moto/kv.js rename to src/data/local.js index f13cafab..a4e3c71c 100644 --- a/src/moto/kv.js +++ b/src/data/local.js @@ -4,15 +4,15 @@ (function() { - let moto = self.moto = self.moto || {}; - if (moto.KV) return; + let data = self.data = self.data || {}; + if (data.Local) return; - function KV() { + function Local() { this.__data__ = {}; this.__mem__ = true; } - var KP = KV.prototype; + var KP = Local.prototype; KP.getItem = function(key) { return this[key]; @@ -32,13 +32,13 @@ }; try { - let KV = moto.KV = self.localStorage, + let local = data.Local = self.localStorage, testkey = '__test'; - KV.setItem(testkey, 1); - KV.getItem(testkey); - KV.removeItem(testkey); + local.setItem(testkey, 1); + local.getItem(testkey); + local.removeItem(testkey); } catch (e) { - moto.KV = new KV(); + data.Local = new Local(); let msg = "in private or restricted browsing mode. local storage blocked. application may not function properly."; console.log(msg); alert(msg); diff --git a/src/dev/cam/Any.Generic.Grbl b/src/kiri-dev/cam/Any.Generic.Grbl similarity index 100% rename from src/dev/cam/Any.Generic.Grbl rename to src/kiri-dev/cam/Any.Generic.Grbl diff --git a/src/dev/cam/Any.Generic.LinuxCNC b/src/kiri-dev/cam/Any.Generic.LinuxCNC similarity index 100% rename from src/dev/cam/Any.Generic.LinuxCNC rename to src/kiri-dev/cam/Any.Generic.LinuxCNC diff --git a/src/dev/cam/Any.Generic.TinyG b/src/kiri-dev/cam/Any.Generic.TinyG similarity index 100% rename from src/dev/cam/Any.Generic.TinyG rename to src/kiri-dev/cam/Any.Generic.TinyG diff --git a/src/dev/cam/Carbide3D.Nomad.883Pro b/src/kiri-dev/cam/Carbide3D.Nomad.883Pro similarity index 100% rename from src/dev/cam/Carbide3D.Nomad.883Pro rename to src/kiri-dev/cam/Carbide3D.Nomad.883Pro diff --git a/src/dev/cam/Carbide3D.Shapeoko.3 b/src/kiri-dev/cam/Carbide3D.Shapeoko.3 similarity index 100% rename from src/dev/cam/Carbide3D.Shapeoko.3 rename to src/kiri-dev/cam/Carbide3D.Shapeoko.3 diff --git a/src/dev/cam/Carbide3D.Shapeoko.XL b/src/kiri-dev/cam/Carbide3D.Shapeoko.XL similarity index 100% rename from src/dev/cam/Carbide3D.Shapeoko.XL rename to src/kiri-dev/cam/Carbide3D.Shapeoko.XL diff --git a/src/dev/cam/Carbide3D.Shapeoko.XXL b/src/kiri-dev/cam/Carbide3D.Shapeoko.XXL similarity index 100% rename from src/dev/cam/Carbide3D.Shapeoko.XXL rename to src/kiri-dev/cam/Carbide3D.Shapeoko.XXL diff --git a/src/dev/cam/Genmitsu.3018 b/src/kiri-dev/cam/Genmitsu.3018 similarity index 100% rename from src/dev/cam/Genmitsu.3018 rename to src/kiri-dev/cam/Genmitsu.3018 diff --git a/src/dev/cam/Genmitsu.PROVerXL.4030 b/src/kiri-dev/cam/Genmitsu.PROVerXL.4030 similarity index 100% rename from src/dev/cam/Genmitsu.PROVerXL.4030 rename to src/kiri-dev/cam/Genmitsu.PROVerXL.4030 diff --git a/src/dev/cam/Inventables.Carvey.Any b/src/kiri-dev/cam/Inventables.Carvey.Any similarity index 100% rename from src/dev/cam/Inventables.Carvey.Any rename to src/kiri-dev/cam/Inventables.Carvey.Any diff --git a/src/dev/cam/Inventables.XCarve.1000mm b/src/kiri-dev/cam/Inventables.XCarve.1000mm similarity index 100% rename from src/dev/cam/Inventables.XCarve.1000mm rename to src/kiri-dev/cam/Inventables.XCarve.1000mm diff --git a/src/dev/cam/Inventables.XCarve.500mm b/src/kiri-dev/cam/Inventables.XCarve.500mm similarity index 100% rename from src/dev/cam/Inventables.XCarve.500mm rename to src/kiri-dev/cam/Inventables.XCarve.500mm diff --git a/src/dev/cam/Roland.MDX-50 b/src/kiri-dev/cam/Roland.MDX-50 similarity index 100% rename from src/dev/cam/Roland.MDX-50 rename to src/kiri-dev/cam/Roland.MDX-50 diff --git a/src/dev/cam/Sienci.LongMill b/src/kiri-dev/cam/Sienci.LongMill similarity index 100% rename from src/dev/cam/Sienci.LongMill rename to src/kiri-dev/cam/Sienci.LongMill diff --git a/src/dev/cam/Sienci.Mill.One b/src/kiri-dev/cam/Sienci.Mill.One similarity index 100% rename from src/dev/cam/Sienci.Mill.One rename to src/kiri-dev/cam/Sienci.Mill.One diff --git a/src/dev/cam/Techno.Davinci.CNC b/src/kiri-dev/cam/Techno.Davinci.CNC similarity index 100% rename from src/dev/cam/Techno.Davinci.CNC rename to src/kiri-dev/cam/Techno.Davinci.CNC diff --git a/src/dev/fdm/Any.Generic.Marlin b/src/kiri-dev/fdm/Any.Generic.Marlin similarity index 100% rename from src/dev/fdm/Any.Generic.Marlin rename to src/kiri-dev/fdm/Any.Generic.Marlin diff --git a/src/dev/fdm/Any.Generic.Sailfish b/src/kiri-dev/fdm/Any.Generic.Sailfish similarity index 100% rename from src/dev/fdm/Any.Generic.Sailfish rename to src/kiri-dev/fdm/Any.Generic.Sailfish diff --git a/src/dev/fdm/Anycubic.Chiron b/src/kiri-dev/fdm/Anycubic.Chiron similarity index 100% rename from src/dev/fdm/Anycubic.Chiron rename to src/kiri-dev/fdm/Anycubic.Chiron diff --git a/src/dev/fdm/Anycubic.Predator b/src/kiri-dev/fdm/Anycubic.Predator similarity index 100% rename from src/dev/fdm/Anycubic.Predator rename to src/kiri-dev/fdm/Anycubic.Predator diff --git a/src/dev/fdm/Anycubic.i3.Mega b/src/kiri-dev/fdm/Anycubic.i3.Mega similarity index 100% rename from src/dev/fdm/Anycubic.i3.Mega rename to src/kiri-dev/fdm/Anycubic.i3.Mega diff --git a/src/dev/fdm/Atom.v2 b/src/kiri-dev/fdm/Atom.v2 similarity index 100% rename from src/dev/fdm/Atom.v2 rename to src/kiri-dev/fdm/Atom.v2 diff --git a/src/dev/fdm/Creality.CR-10S b/src/kiri-dev/fdm/Creality.CR-10S similarity index 100% rename from src/dev/fdm/Creality.CR-10S rename to src/kiri-dev/fdm/Creality.CR-10S diff --git a/src/dev/fdm/Creality.CR-10S-Pro b/src/kiri-dev/fdm/Creality.CR-10S-Pro similarity index 100% rename from src/dev/fdm/Creality.CR-10S-Pro rename to src/kiri-dev/fdm/Creality.CR-10S-Pro diff --git a/src/dev/fdm/Creality.CR-30 b/src/kiri-dev/fdm/Creality.CR-30 similarity index 100% rename from src/dev/fdm/Creality.CR-30 rename to src/kiri-dev/fdm/Creality.CR-30 diff --git a/src/dev/fdm/Creality.Ender.3 b/src/kiri-dev/fdm/Creality.Ender.3 similarity index 100% rename from src/dev/fdm/Creality.Ender.3 rename to src/kiri-dev/fdm/Creality.Ender.3 diff --git a/src/dev/fdm/Creality.Ender.5 b/src/kiri-dev/fdm/Creality.Ender.5 similarity index 100% rename from src/dev/fdm/Creality.Ender.5 rename to src/kiri-dev/fdm/Creality.Ender.5 diff --git a/src/dev/fdm/Creality.Ender.6 b/src/kiri-dev/fdm/Creality.Ender.6 similarity index 100% rename from src/dev/fdm/Creality.Ender.6 rename to src/kiri-dev/fdm/Creality.Ender.6 diff --git a/src/dev/fdm/Creality.Sermoon.D1 b/src/kiri-dev/fdm/Creality.Sermoon.D1 similarity index 100% rename from src/dev/fdm/Creality.Sermoon.D1 rename to src/kiri-dev/fdm/Creality.Sermoon.D1 diff --git a/src/dev/fdm/Cubicon.Single+ b/src/kiri-dev/fdm/Cubicon.Single+ similarity index 100% rename from src/dev/fdm/Cubicon.Single+ rename to src/kiri-dev/fdm/Cubicon.Single+ diff --git a/src/dev/fdm/Cubicon.Style b/src/kiri-dev/fdm/Cubicon.Style similarity index 100% rename from src/dev/fdm/Cubicon.Style rename to src/kiri-dev/fdm/Cubicon.Style diff --git a/src/dev/fdm/DeltaMaker.2T b/src/kiri-dev/fdm/DeltaMaker.2T similarity index 100% rename from src/dev/fdm/DeltaMaker.2T rename to src/kiri-dev/fdm/DeltaMaker.2T diff --git a/src/dev/fdm/DeltaMaker.Original b/src/kiri-dev/fdm/DeltaMaker.Original similarity index 100% rename from src/dev/fdm/DeltaMaker.Original rename to src/kiri-dev/fdm/DeltaMaker.Original diff --git a/src/dev/fdm/FLSUN.QQ-S b/src/kiri-dev/fdm/FLSUN.QQ-S similarity index 100% rename from src/dev/fdm/FLSUN.QQ-S rename to src/kiri-dev/fdm/FLSUN.QQ-S diff --git a/src/dev/fdm/Flashforge.Finder b/src/kiri-dev/fdm/Flashforge.Finder similarity index 100% rename from src/dev/fdm/Flashforge.Finder rename to src/kiri-dev/fdm/Flashforge.Finder diff --git a/src/dev/fdm/Flashforge.Guider.II b/src/kiri-dev/fdm/Flashforge.Guider.II similarity index 100% rename from src/dev/fdm/Flashforge.Guider.II rename to src/kiri-dev/fdm/Flashforge.Guider.II diff --git a/src/dev/fdm/FolgerTech.FT5 b/src/kiri-dev/fdm/FolgerTech.FT5 similarity index 100% rename from src/dev/fdm/FolgerTech.FT5 rename to src/kiri-dev/fdm/FolgerTech.FT5 diff --git a/src/dev/fdm/GridBot.One b/src/kiri-dev/fdm/GridBot.One similarity index 100% rename from src/dev/fdm/GridBot.One rename to src/kiri-dev/fdm/GridBot.One diff --git a/src/dev/fdm/GridBot.Two b/src/kiri-dev/fdm/GridBot.Two similarity index 100% rename from src/dev/fdm/GridBot.Two rename to src/kiri-dev/fdm/GridBot.Two diff --git a/src/dev/fdm/IMADE3D.JellyBOX.Original b/src/kiri-dev/fdm/IMADE3D.JellyBOX.Original similarity index 100% rename from src/dev/fdm/IMADE3D.JellyBOX.Original rename to src/kiri-dev/fdm/IMADE3D.JellyBOX.Original diff --git a/src/dev/fdm/IMADE3D.JellyBOX2 b/src/kiri-dev/fdm/IMADE3D.JellyBOX2 similarity index 100% rename from src/dev/fdm/IMADE3D.JellyBOX2 rename to src/kiri-dev/fdm/IMADE3D.JellyBOX2 diff --git a/src/dev/fdm/Leapfrog.CreatrHS b/src/kiri-dev/fdm/Leapfrog.CreatrHS similarity index 100% rename from src/dev/fdm/Leapfrog.CreatrHS rename to src/kiri-dev/fdm/Leapfrog.CreatrHS diff --git a/src/dev/fdm/MakerGear.M2 b/src/kiri-dev/fdm/MakerGear.M2 similarity index 100% rename from src/dev/fdm/MakerGear.M2 rename to src/kiri-dev/fdm/MakerGear.M2 diff --git a/src/dev/fdm/Makerbot.Replicator2 b/src/kiri-dev/fdm/Makerbot.Replicator2 similarity index 100% rename from src/dev/fdm/Makerbot.Replicator2 rename to src/kiri-dev/fdm/Makerbot.Replicator2 diff --git a/src/dev/fdm/Prusa.i3.MK2S b/src/kiri-dev/fdm/Prusa.i3.MK2S similarity index 100% rename from src/dev/fdm/Prusa.i3.MK2S rename to src/kiri-dev/fdm/Prusa.i3.MK2S diff --git a/src/dev/fdm/Raise3D.N2 b/src/kiri-dev/fdm/Raise3D.N2 similarity index 100% rename from src/dev/fdm/Raise3D.N2 rename to src/kiri-dev/fdm/Raise3D.N2 diff --git a/src/dev/fdm/SainSmart.Infi-20 b/src/kiri-dev/fdm/SainSmart.Infi-20 similarity index 100% rename from src/dev/fdm/SainSmart.Infi-20 rename to src/kiri-dev/fdm/SainSmart.Infi-20 diff --git a/src/dev/fdm/TypeA.Series1 b/src/kiri-dev/fdm/TypeA.Series1 similarity index 100% rename from src/dev/fdm/TypeA.Series1 rename to src/kiri-dev/fdm/TypeA.Series1 diff --git a/src/dev/fdm/TypeA.Series1Pro b/src/kiri-dev/fdm/TypeA.Series1Pro similarity index 100% rename from src/dev/fdm/TypeA.Series1Pro rename to src/kiri-dev/fdm/TypeA.Series1Pro diff --git a/src/dev/fdm/Ulio3D b/src/kiri-dev/fdm/Ulio3D similarity index 100% rename from src/dev/fdm/Ulio3D rename to src/kiri-dev/fdm/Ulio3D diff --git a/src/dev/fdm/Ulio3D.Purge b/src/kiri-dev/fdm/Ulio3D.Purge similarity index 100% rename from src/dev/fdm/Ulio3D.Purge rename to src/kiri-dev/fdm/Ulio3D.Purge diff --git a/src/dev/fdm/Ultimaker.Ultimaker2 b/src/kiri-dev/fdm/Ultimaker.Ultimaker2 similarity index 100% rename from src/dev/fdm/Ultimaker.Ultimaker2 rename to src/kiri-dev/fdm/Ultimaker.Ultimaker2 diff --git a/src/dev/fdm/Wanhao.Duplicator_4s b/src/kiri-dev/fdm/Wanhao.Duplicator_4s similarity index 100% rename from src/dev/fdm/Wanhao.Duplicator_4s rename to src/kiri-dev/fdm/Wanhao.Duplicator_4s diff --git a/src/dev/fdm/Wanhao.Duplicator_5s b/src/kiri-dev/fdm/Wanhao.Duplicator_5s similarity index 100% rename from src/dev/fdm/Wanhao.Duplicator_5s rename to src/kiri-dev/fdm/Wanhao.Duplicator_5s diff --git a/src/dev/fdm/Wanhao.Duplicator_6 b/src/kiri-dev/fdm/Wanhao.Duplicator_6 similarity index 100% rename from src/dev/fdm/Wanhao.Duplicator_6 rename to src/kiri-dev/fdm/Wanhao.Duplicator_6 diff --git a/src/dev/fdm/Wanhao.Duplicator_i3 b/src/kiri-dev/fdm/Wanhao.Duplicator_i3 similarity index 100% rename from src/dev/fdm/Wanhao.Duplicator_i3 rename to src/kiri-dev/fdm/Wanhao.Duplicator_i3 diff --git a/src/dev/fdm/XYZ.daVinci.Jr.Pro b/src/kiri-dev/fdm/XYZ.daVinci.Jr.Pro similarity index 100% rename from src/dev/fdm/XYZ.daVinci.Jr.Pro rename to src/kiri-dev/fdm/XYZ.daVinci.Jr.Pro diff --git a/src/dev/fdm/XYZ.daVinci.Mini.w b/src/kiri-dev/fdm/XYZ.daVinci.Mini.w similarity index 100% rename from src/dev/fdm/XYZ.daVinci.Mini.w rename to src/kiri-dev/fdm/XYZ.daVinci.Mini.w diff --git a/src/dev/laser/Any.Generic.Laser b/src/kiri-dev/laser/Any.Generic.Laser similarity index 100% rename from src/dev/laser/Any.Generic.Laser rename to src/kiri-dev/laser/Any.Generic.Laser diff --git a/src/dev/laser/Glowforge b/src/kiri-dev/laser/Glowforge similarity index 100% rename from src/dev/laser/Glowforge rename to src/kiri-dev/laser/Glowforge diff --git a/src/dev/sla/Anycubic.Photon b/src/kiri-dev/sla/Anycubic.Photon similarity index 100% rename from src/dev/sla/Anycubic.Photon rename to src/kiri-dev/sla/Anycubic.Photon diff --git a/src/dev/sla/Anycubic.Photon.S b/src/kiri-dev/sla/Anycubic.Photon.S similarity index 100% rename from src/dev/sla/Anycubic.Photon.S rename to src/kiri-dev/sla/Anycubic.Photon.S diff --git a/src/dev/sla/Creality.Halot.Max b/src/kiri-dev/sla/Creality.Halot.Max similarity index 100% rename from src/dev/sla/Creality.Halot.Max rename to src/kiri-dev/sla/Creality.Halot.Max diff --git a/src/dev/sla/Creality.Halot.One b/src/kiri-dev/sla/Creality.Halot.One similarity index 100% rename from src/dev/sla/Creality.Halot.One rename to src/kiri-dev/sla/Creality.Halot.One diff --git a/src/dev/sla/Creality.Halot.Sky b/src/kiri-dev/sla/Creality.Halot.Sky similarity index 100% rename from src/dev/sla/Creality.Halot.Sky rename to src/kiri-dev/sla/Creality.Halot.Sky diff --git a/src/ico/cam.svg b/src/kiri-ico/cam.svg similarity index 100% rename from src/ico/cam.svg rename to src/kiri-ico/cam.svg diff --git a/src/ico/fdm.svg b/src/kiri-ico/fdm.svg similarity index 100% rename from src/ico/fdm.svg rename to src/kiri-ico/fdm.svg diff --git a/src/ico/laser.svg b/src/kiri-ico/laser.svg similarity index 100% rename from src/ico/laser.svg rename to src/kiri-ico/laser.svg diff --git a/src/ico/sla.svg b/src/kiri-ico/sla.svg similarity index 100% rename from src/ico/sla.svg rename to src/kiri-ico/sla.svg diff --git a/src/mode/cam/animate.js b/src/kiri-mode/cam/animate.js similarity index 100% rename from src/mode/cam/animate.js rename to src/kiri-mode/cam/animate.js diff --git a/src/mode/cam/client.js b/src/kiri-mode/cam/client.js similarity index 100% rename from src/mode/cam/client.js rename to src/kiri-mode/cam/client.js diff --git a/src/mode/cam/driver.js b/src/kiri-mode/cam/driver.js similarity index 100% rename from src/mode/cam/driver.js rename to src/kiri-mode/cam/driver.js diff --git a/src/mode/cam/export.js b/src/kiri-mode/cam/export.js similarity index 100% rename from src/mode/cam/export.js rename to src/kiri-mode/cam/export.js diff --git a/src/mode/cam/ops.js b/src/kiri-mode/cam/ops.js similarity index 100% rename from src/mode/cam/ops.js rename to src/kiri-mode/cam/ops.js diff --git a/src/mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js similarity index 100% rename from src/mode/cam/prepare.js rename to src/kiri-mode/cam/prepare.js diff --git a/src/mode/cam/slice.js b/src/kiri-mode/cam/slice.js similarity index 100% rename from src/mode/cam/slice.js rename to src/kiri-mode/cam/slice.js diff --git a/src/mode/cam/tool.js b/src/kiri-mode/cam/tool.js similarity index 100% rename from src/mode/cam/tool.js rename to src/kiri-mode/cam/tool.js diff --git a/src/mode/cam/topo.js b/src/kiri-mode/cam/topo.js similarity index 100% rename from src/mode/cam/topo.js rename to src/kiri-mode/cam/topo.js diff --git a/src/mode/fdm/client.js b/src/kiri-mode/fdm/client.js similarity index 100% rename from src/mode/fdm/client.js rename to src/kiri-mode/fdm/client.js diff --git a/src/mode/fdm/driver.js b/src/kiri-mode/fdm/driver.js similarity index 100% rename from src/mode/fdm/driver.js rename to src/kiri-mode/fdm/driver.js diff --git a/src/mode/fdm/export.js b/src/kiri-mode/fdm/export.js similarity index 100% rename from src/mode/fdm/export.js rename to src/kiri-mode/fdm/export.js diff --git a/src/mode/fdm/fill.js b/src/kiri-mode/fdm/fill.js similarity index 100% rename from src/mode/fdm/fill.js rename to src/kiri-mode/fdm/fill.js diff --git a/src/mode/fdm/prepare.js b/src/kiri-mode/fdm/prepare.js similarity index 100% rename from src/mode/fdm/prepare.js rename to src/kiri-mode/fdm/prepare.js diff --git a/src/mode/fdm/slice.js b/src/kiri-mode/fdm/slice.js similarity index 100% rename from src/mode/fdm/slice.js rename to src/kiri-mode/fdm/slice.js diff --git a/src/mode/laser/driver.js b/src/kiri-mode/laser/driver.js similarity index 100% rename from src/mode/laser/driver.js rename to src/kiri-mode/laser/driver.js diff --git a/src/mode/sla/client.js b/src/kiri-mode/sla/client.js similarity index 100% rename from src/mode/sla/client.js rename to src/kiri-mode/sla/client.js diff --git a/src/mode/sla/driver.js b/src/kiri-mode/sla/driver.js similarity index 100% rename from src/mode/sla/driver.js rename to src/kiri-mode/sla/driver.js diff --git a/src/mode/sla/export.js b/src/kiri-mode/sla/export.js similarity index 100% rename from src/mode/sla/export.js rename to src/kiri-mode/sla/export.js diff --git a/src/mode/sla/slice.js b/src/kiri-mode/sla/slice.js similarity index 100% rename from src/mode/sla/slice.js rename to src/kiri-mode/sla/slice.js diff --git a/src/mode/sla/x_cxdlp.js b/src/kiri-mode/sla/x_cxdlp.js similarity index 100% rename from src/mode/sla/x_cxdlp.js rename to src/kiri-mode/sla/x_cxdlp.js diff --git a/src/mode/sla/x_photon.js b/src/kiri-mode/sla/x_photon.js similarity index 100% rename from src/mode/sla/x_photon.js rename to src/kiri-mode/sla/x_photon.js diff --git a/src/kiri/main.js b/src/kiri/main.js index 9ab2775d..3b2c959c 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -5,6 +5,7 @@ (function () { let MOTO = self.moto, + DATA = self.data, KIRI = self.kiri, LOAD = self.load, BASE = self.base, @@ -18,9 +19,9 @@ SECURE = isSecure(LOC.protocol), LOCAL = self.debug && !SETUP.remote, EVENT = KIRI.broker, - SDB = MOTO.KV, - ODB = KIRI.odb = new MOTO.Storage(SETUP.d ? SETUP.d[0] : 'kiri'), - // K3DB = KIRI.wdb = new MOTO.Storage('kiri3', { stores:["file","work"] }).init(), + SDB = DATA.Local, + ODB = KIRI.odb = new DATA.Index(SETUP.d ? SETUP.d[0] : 'kiri'), + // K3DB = KIRI.wdb = new DATA.Index('kiri3', { stores:["file","work"] }).init(), SPACE = KIRI.space = MOTO.Space, WIDGETS = KIRI.widgets = [], CATALOG = KIRI.catalog = KIRI.openCatalog(ODB), diff --git a/src/moto/ajax.js b/src/moto/ajax.js index 1ecf7727..053dd9c1 100644 --- a/src/moto/ajax.js +++ b/src/moto/ajax.js @@ -14,7 +14,7 @@ }; const AP = Ajax.prototype, - KV = moto.KV, + KV = data.Local, KEY = "moto-ajax", TIME = function() { return new Date().getTime() }, MOKEY = moto.id = KV.getItem(KEY) || (TIME().toString(36)+rnd()+rnd()); diff --git a/src/moto/ctrl.js b/src/moto/orbit.js similarity index 99% rename from src/moto/ctrl.js rename to src/moto/orbit.js index 6cb216e0..bb04f045 100644 --- a/src/moto/ctrl.js +++ b/src/moto/orbit.js @@ -8,7 +8,7 @@ let MOTO = self.moto = self.moto || {}; * Adapted from THREE.OrbitControls */ -MOTO.CTRL = function (object, domElement, notify, slider) { +MOTO.Orbit = function (object, domElement, notify, slider) { this.object = object; this.domElement = ( domElement !== undefined ) ? domElement : document; @@ -620,4 +620,4 @@ MOTO.CTRL = function (object, domElement, notify, slider) { window.addEventListener('keydown', onKeyDown, false); }; -MOTO.CTRL.prototype = Object.create(THREE.EventDispatcher.prototype); +MOTO.Orbit.prototype = Object.create(THREE.EventDispatcher.prototype); diff --git a/src/moto/space.js b/src/moto/space.js index 6546ba50..d80f482b 100644 --- a/src/moto/space.js +++ b/src/moto/space.js @@ -1089,7 +1089,7 @@ raycaster = new THREE.Raycaster(); - viewControl = new MOTO.CTRL(camera, domelement, (position, moved) => { + viewControl = new MOTO.Orbit(camera, domelement, (position, moved) => { if (platform) { platform.visible = hidePlatformBelow ? initialized && position.y >= 0 && showPlatform : showPlatform;