@soonspacejs/plugin-soonmanager2-sync 2.15.19 → 2.16.1

package/dist/index.esm.js

@@ -1,8 +1,9 @@
-const I = "/SceneMetadata.json", Y = "/db/sign", w = "/db/tree_models.json", x = "/db/topology_paths.json", j = "/db/properties.json", O = "/db/animations.json", b = "/db/model_visions.json", S = "properties";
-class X {
+const w = "/SceneMetadata.json", Y = "/db/sign", I = "/db/tree_models.json", x = "/db/topology_paths.json", S = "/db/properties.json", b = "/db/animations.json", j = "/db/model_visions.json", O = "properties";
+class V {
   constructor(t) {
     this.ssp = t;
   }
+  ssp;
   _path = "";
   get path() {
     return this._path;
@@ -38,21 +39,21 @@ class X {
     return `${this._path}${t}`;
   }
   async _fetchData(t) {
-    const { utils: i } = this.ssp;
-    return i.fetchFile(this._resolvePath(t), "json");
+    const { utils: o } = this.ssp;
+    return o.fetchFile(this._resolvePath(t), "json");
   }
   /**
    * 获取场景元数据
    */
   async fetchMetaData() {
-    return this._fetchData(I);
+    return this._fetchData(w);
   }
   /**
    * 获取场景树
    * @returns 
    */
   async fetchTreeData() {
-    return this._fetchData(w);
+    return this._fetchData(I);
   }
   /**
    * 获取拓扑路径
@@ -60,14 +61,14 @@ class X {
    */
   async fetchTopologyData() {
     return this._fetchData(x).then((t) => {
-      const i = {
+      const o = {
         linkWidth: 0.1,
         linkColor: ["#00ff00"],
         nodeRadius: 0.05,
         nodeColor: "#0000ff"
       };
-      return t.map((n) => {
-        const e = { ...i, ...n };
+      return t.map((i) => {
+        const e = { ...o, ...i };
         return e.imgUrl && (e.imgUrl = `${this.path}${e.imgUrl}`), e;
       });
     });
@@ -77,21 +78,21 @@ class X {
    * @returns 
    */
   async fetchPropertiesData() {
-    return this._fetchData(j).then((t) => A(t, "modelId"));
+    return this._fetchData(S).then((t) => A(t, "modelId"));
   }
   /**
    * 获取动画
    * @returns 
    */
   async fetchAnimationsData() {
-    return this._fetchData(O).then((t) => A(t, "modelId"));
+    return this._fetchData(b).then((t) => A(t, "modelId"));
   }
   /**
    * 获取模型视角
    * @returns 
    */
   async fetchModelVisionsData() {
-    return this._fetchData(b).then((t) => new Map(Object.entries(t)));
+    return this._fetchData(j).then((t) => new Map(Object.entries(t)));
   }
   /**
    * 加载场景树中的对象
@@ -101,16 +102,16 @@ class X {
       console.error("treeData is null");
       return;
     }
-    const { syncProperties: i } = t, n = async (e, h) => {
-      const { ssp: r } = this, { THREE: { Matrix4: f } } = r, { id: d, name: l, renderType: y, path: c, matrix: p } = e, D = new f().fromArray(p);
-      let o = null;
-      if (y === "3D")
+    const { syncProperties: o } = t, i = async (e, h) => {
+      const { ssp: r } = this, { THREE: { Matrix4: y } } = r, { id: d, name: l, renderType: f, path: c, matrix: p } = e, D = new y().fromArray(p);
+      let n = null;
+      if (f === "3D")
         if (c)
           try {
             const s = { ...e };
             Reflect.deleteProperty(s, "children");
             const m = c.replaceAll(/#/g, "%23");
-            o = await r.loadModel({
+            n = await r.loadModel({
               id: d,
               name: l,
               url: this._resolvePath(m),
@@ -121,18 +122,18 @@ class X {
           }
         else
           r.utils.warn(`id: ${d} path 为空`);
-      else (y === "GROUP" || y === "STUB") && (o = r.createGroup({
+      else (f === "GROUP" || f === "STUB") && (n = r.createGroup({
         id: d,
         name: l,
         userData: { ...e }
       }));
-      if (o && (D.decompose(o.position, o.quaternion, o.scale), h && r.addObject(o, h), i && this.propertiesData)) {
+      if (n && (D.decompose(n.position, n.quaternion, n.scale), h && r.addObject(n, h), o && this.propertiesData)) {
         const s = this.propertiesData.get(d);
-        s && (o.userData[S] = s);
+        s && (n.userData[O] = s);
       }
-      e.children.length > 0 && await Promise.allSettled(e.children.map((s) => n(s, o)));
+      e.children.length > 0 && await Promise.allSettled(e.children.map((s) => i(s, n)));
     };
-    await Promise.allSettled(this.treeData.map((e) => n(e, null)));
+    await Promise.allSettled(this.treeData.map((e) => i(e, null)));
   }
   /**
    * 设置 path
@@ -157,7 +158,9 @@ class X {
       (async () => {
         t.syncModelVisions && (this.modelVisionsData = await this.fetchModelVisionsData());
       })()
-    ]), this.treeData = await this.fetchTreeData(), await this.loadObjects(t), t.needsModelsBoundsTree && this.ssp.computeModelsBoundsTree();
+    ]), this.treeData = await this.fetchTreeData(), await this.loadObjects(t), t.needsModelsBoundsTree && this.ssp.computeModelsBoundsTree().catch((o) => {
+      o?.name !== "AbortError" && console.warn("[SoonSpace] BVH generation failed.", o);
+    });
   }
   /**
    * 获取拓扑路径列表
@@ -168,23 +171,23 @@ class X {
   /**
    * 播放动画
    */
-  async playAnimationById(t, i = 0, n = {}) {
-    const { utils: { error: e }, animation: h, THREE: r } = this.ssp, { onStart: f, onUpdate: d } = n;
+  async playAnimationById(t, o = 0, i = {}) {
+    const { utils: { error: e }, animation: h, THREE: r } = this.ssp, { onStart: y, onUpdate: d } = i;
     this.animationsData || (this.animationsData = await this.fetchAnimationsData());
     const l = this.ssp.getObjectById(t);
     if (!l) {
       e(`playAnimationById: id 为 ${t} 场景对象未找到`);
       return;
     }
-    const y = this.animationsData.get(t);
-    if (y) {
-      const c = y[i];
+    const f = this.animationsData.get(t);
+    if (f) {
+      const c = f[o];
       if (c)
         for (let p = 0, D = c.keyframes.length; p < D; p++) {
-          let o;
+          let n;
           if (c.keyframes[p - 1]) {
             const a = c.keyframes[p - 1];
-            o = {
+            n = {
               x: a.x,
               y: a.y,
               z: a.z,
@@ -197,7 +200,7 @@ class X {
             };
           } else {
             const a = new r.Object3D(), u = new r.Matrix4().fromArray(l.userData.matrix);
-            a.applyMatrix4(u), o = {
+            a.applyMatrix4(u), n = {
               x: a.position.x,
               y: a.position.y,
               z: a.position.z,
@@ -221,38 +224,38 @@ class X {
             scaleZ: s.scaleZ
           };
           await h(
-            o,
+            n,
             M,
             { delay: m, duration: P, mode: g, repeat: T === -1 ? 1 / 0 : T, yoyo: E },
             (a, u) => {
               l.position.set(a.x, a.y, a.z), l.rotation.set(a.rotationX, a.rotationY, a.rotationZ), l.scale.set(a.scaleX, a.scaleY, a.scaleZ), d?.(a, u);
             },
             (a) => {
-              f?.(a);
+              y?.(a);
             }
           );
         }
       else
-        e(`id: ${t} 未找到索引为 ${i} 的动画`);
+        e(`id: ${t} 未找到索引为 ${o} 的动画`);
     } else
       e(`id: ${t} 未找到动画`);
   }
 }
 function A(_, t) {
-  const i = /* @__PURE__ */ new Map();
-  return _.reduce((n, e) => {
-    const h = n.get(e[t]);
-    return h ? h.push(e) : n.set(e[t], [e]), n;
-  }, i), i;
+  const o = /* @__PURE__ */ new Map();
+  return _.reduce((i, e) => {
+    const h = i.get(e[t]);
+    return h ? h.push(e) : i.set(e[t], [e]), i;
+  }, o), o;
 }
 export {
-  O as ANIMATIONS_DATA_FILE_PATH,
-  I as META_DATA_FILE_PATH,
-  b as MODEL_VISIONS_DATA_FILE_PATH,
-  j as PROPERTIES_DATA_FLEE_PATH,
-  S as PROPERTIES_KEY,
+  b as ANIMATIONS_DATA_FILE_PATH,
+  w as META_DATA_FILE_PATH,
+  j as MODEL_VISIONS_DATA_FILE_PATH,
+  S as PROPERTIES_DATA_FLEE_PATH,
+  O as PROPERTIES_KEY,
   Y as SIGN_PATH,
   x as TOPOLOGY_DATA_FILE_PATH,
-  w as TREE_DATA_FILE_PATH,
-  X as default
+  I as TREE_DATA_FILE_PATH,
+  V as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soonspacejs/plugin-soonmanager2-sync",
   "pluginName": "Soonmanager2SyncPlugin",
-  "version": "2.15.19",
+  "version": "2.16.1",
   "description": "Sync soonmanager 2.x data plugin for SoonSpace.js",
   "main": "dist/index.esm.js",
   "module": "dist/index.esm.js",
@@ -15,6 +15,6 @@
   "license": "UNLICENSED",
   "gitHead": "4a87dd85050651088e11c3da777c49fab3db7e5d",
   "peerDependencies": {
-    "soonspacejs": "2.15.19"
+    "soonspacejs": "2.16.1"
   }
 }