vis-core 0.18.4 → 0.18.6

package/dist/index.module.js

@@ -43587,7 +43587,7 @@ function sa(i) {
   const t = new Dt();
   return t.color.setScalar(i), t;
 }
-const yf = "0.18.4";
+const yf = "0.18.6";
 class Rz {
   constructor() {
     A(this, "event", new TX());
@@ -44310,19 +44310,35 @@ class wz {
         s.type.endsWith("Command") && (s.type = s.type.replace("Command", ""));
         const l = new Jz[s.type](this.editor);
         l.json = s, l.id = s.id, l.name = s.name, this.undos.push(l), this.idCounter = s.id > this.idCounter ? s.id : this.idCounter;
+        const a = n + 1, o = t.u.length;
+        this.editor.emit("progress", {
+          type: "解压文件",
+          value: a / o * 100 | 0
+        });
       }
       this.editor.emit("historyChanged", this.undos[this.undos.length - 1]);
     }
   }
   executeUndos() {
     return bt(this, null, function* () {
-      for (const t of this.undos) {
-        t.fromJSON(t.json);
+      let t = 0;
+      for (const e of this.undos) {
+        e.fromJSON(e.json);
         try {
-          (!t.json.objectUuid || t.object) && (yield t.execute());
-        } catch (e) {
-          console.error(e, t);
+          (!e.json.objectUuid || e.object) && (yield e.execute(), yield new Promise((s) => {
+            requestAnimationFrame(() => {
+              s();
+            });
+          }));
+        } catch (s) {
+          console.error(s, e);
         }
+        t += 1;
+        const n = this.undos.length;
+        this.editor.emit("progress", {
+          type: "还原场景",
+          value: t / n * 100 | 0
+        });
       }
     });
   }
@@ -44367,22 +44383,27 @@ class Kz {
   }
   setVis(n) {
     return bt(this, arguments, function* (t, e = {}) {
-      var l, a;
+      var a, o;
       if (!this.options.visFactories && (this.editor.setViewportVis(t), !this.options.visFactories)) {
         console.error("visFactories is not defined");
         return;
       }
       if (this.vis = this.options.visFactories, this.vis.visName !== t)
         throw new Error(`visName is not match, import {${t}}`);
-      this.vis.setOptions(Jt(Jt({}, e), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis.on("progress", (o, c, d) => {
-        d === 1 && this.editor.emit("loaderProgress", o / c * 100 | 0);
+      this.vis.setOptions(Jt(Jt({}, e), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing;
+      let s = 1;
+      this.vis.on("loaderProgress", (c, d) => {
+        s === 1 && (this.editor.emit("progress", {
+          type: "下载资源",
+          value: c / d * 100 | 0
+        }), c === d && (s = 0));
       }), this.vis.on("show", () => {
         this.editor.emit("visShow");
       }), yield this.vis.init();
-      const { pencil: s } = this.vis;
-      s.userData.EditorEnv = !this.editor.playing, this.editor.pencil = s, this.editor.changeSelectOption(), this.editor.playing || (this.initEvent(), this.editor.emit("visChanged", this.vis)), (l = this.vis) == null || l.pencil.event.on("materialListChange", () => {
+      const { pencil: l } = this.vis;
+      l.userData.EditorEnv = !this.editor.playing, this.editor.pencil = l, this.editor.changeSelectOption(), this.editor.playing || (this.initEvent(), this.editor.emit("visChanged", this.vis)), (a = this.vis) == null || a.pencil.event.on("materialListChange", () => {
         this.editor.changeSelectOption();
-      }), (a = this.vis) == null || a.pencil.event.on("object3dListChange", () => {
+      }), (o = this.vis) == null || o.pencil.event.on("object3dListChange", () => {
         this.editor.changeSelectOption();
       });
     });
@@ -44551,17 +44572,18 @@ const aa = (i, t) => {
     n === 35e4 && (i.h.u[0].visOptions.drillDownHideParent = !0);
   }
   return aa(i.c.version, "0.18.1") === -1 && i.h.u[0] && i.h.u[0].visType === "earth3" && (i.h.u[0].visType = "earth", i.h.u[0].visOptions.style = "countryPlate"), i;
-}, g2 = (i) => {
-  const t = R2(!0);
-  return fetch(i).then((e) => {
-    if (e.ok)
-      return e.json();
+}, g2 = (i, t) => {
+  const e = R2(!0);
+  return fetch(i).then((n) => {
+    let s = n;
+    if (s.ok)
+      return s.json();
     throw new Error("Network response was not ok.");
-  }).then((e) => {
-    t.resolve(e);
-  }).catch((e) => {
-    t.reject(e);
-  }), t.promise;
+  }).then((n) => {
+    e.resolve(n);
+  }).catch((n) => {
+    e.reject(n);
+  }), e.promise;
 };
 class zz {
   constructor(t) {
@@ -44702,7 +44724,7 @@ class zz {
           "json:" + a.c.version,
           "sdk:" + this.sdkVersion
         ), this.setConfig(a.c), this.history.fromJSON(a.h, e), this.viewport.fromJSON(a.v), yield this.history.executeUndos(), (n = a.v.bg) != null && n.texture && this.viewport.vis) {
-          const o = W2(a.bg.texture);
+          const o = W2(a.v.bg.texture);
           o.colorSpace = ye, this.viewport.vis.pencil.scene.background = o;
         }
         return (s = this.viewport.vis) == null || s.show(), (l = this.pencil.cameraControls) == null || l.saveState(), this.select(null), a;
@@ -44907,7 +44929,7 @@ class sd extends Rz {
       dbName: this.visName,
       cacheVersion: yf
     }), this.delLoadArr && (this.loader.delLoadArr = this.delLoadArr), this.loader.on("progress", (...e) => {
-      this.emit("progress", ...e);
+      this.emit("loaderProgress", ...e);
     });
   }
   addCSS3DRenderer() {

package/dist/utils/jsonFetch.d.ts

@@ -1,2 +1,7 @@
-declare const _default: (url: string) => Promise<any>;
+type DownloadProgress = {
+    percent: number;
+    transferredBytes: number;
+    totalBytes: number;
+};
+declare const _default: (url: string, onDownloadProgress?: (progress: DownloadProgress) => void) => Promise<any>;
 export default _default;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.18.4";
+declare const _default: "0.18.6";
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.18.4",
+  "version": "0.18.6",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",