@soonspacejs/plugin-soonbuilder-loader 2.15.4 → 2.15.6

package/dist/index.esm.js

@@ -1,4 +1,5 @@
-class T {
+const y = ["FACILITY", "DOOR", "WINDOW"];
+class v {
   constructor(t) {
     this.ssp = t, this.treeData = [], this.modelData = [];
   }
@@ -7,72 +8,72 @@ class T {
   treeData;
   modelData;
   async load(t, e = !1) {
-    const { xmlToJson: i, isArray: s, isObject: r } = this.ssp.utils, d = e ? `${t}/FileInfo.xml` : t;
-    this.fileInfo = await i(d);
-    const x = this._getFileExtensionFc(this.fileInfo), p = d.split("FileInfo.xml")[0], E = this.fileInfo.folder._attributes.name;
-    this.sceneInfo = await i(`${p}${E}.xml`);
+    const { xmlToJson: i, isArray: s, isObject: r } = this.ssp.utils, h = e ? `${t}/FileInfo.xml` : t;
+    this.fileInfo = await i(h);
+    const x = this._getFileExtensionFc(this.fileInfo), p = h.split("FileInfo.xml")[0], D = this.fileInfo.folder._attributes.name;
+    this.sceneInfo = await i(`${p}${D}.xml`);
     const {
       Project: {
         Building: { Floors: c, ObjectHierarchy: u }
       }
-    } = this.sceneInfo, y = async (a) => {
-      const { _attributes: g, FileSource: D } = a, { id: _, name: M } = g, { name: P } = D._attributes, f = {
+    } = this.sceneInfo, m = async (l) => {
+      const { _attributes: g, FileSource: M } = l, { id: _, name: P } = g, { name: A } = M._attributes, f = {
         id: _,
-        name: M,
-        url: this._pathModeChange(p, P),
+        name: P,
+        url: this._pathModeChange(p, A),
         children: [],
-        userData: a
+        userData: l
       };
       this._pushModelData(f);
-      const F = await this.ssp.loadModelToGroup(
+      const E = await this.ssp.loadModelToGroup(
         {
           id: `${f.id}_group`
         },
         [f]
       );
-      if (!F) return;
-      let l = null;
+      if (!E) return;
+      let n = null;
       if (s(u.Entity))
-        l = u.Entity.find(
-          ({ _attributes: { id: o, type: h } }) => h === "Floor" && o === _
+        n = u.Entity.find(
+          ({ _attributes: { id: o, type: d } }) => d === "Floor" && o === _
         );
       else if (r(u.Entity)) {
-        const { id: o, type: h } = u.Entity._attributes;
-        o === _ && h === "Floor" && (l = u.Entity);
+        const { id: o, type: d } = u.Entity._attributes;
+        o === _ && d === "Floor" && (n = u.Entity);
       }
-      if (!l) return;
-      let n = null;
-      if (s(l.Entity) ? n = l.Entity.filter(
-        ({ _attributes: { type: o } }) => o === "FACILITY"
-      ) : r(l.Entity) && l.Entity._attributes.type === "FACILITY" && (n = l.Entity), !!n) {
-        for (let o = 0; o < n.length; o++) {
-          const { id: h, longname: I, visible: $, position: w, eular: A, scale: C } = {
-            ...n[o]._attributes,
-            ...n[o].Properties?._attributes ?? {}
-          }, b = {
-            id: h,
-            name: I,
-            url: this._pathModeChange(p, `/${x(I)}`),
-            visible: this._text2Bool($),
-            position: this._text2IVector3(w),
-            rotation: this._text2IVector3(A),
-            scale: this._text2IVector3(C),
-            userData: n[o]
-          }, m = await this.ssp.loadModel(b);
-          m && (this.ssp.addObject(m, F), this._pushModelData(b), f.children?.push(b));
-        }
-        this.treeData.push(f);
+      if (!n) return;
+      let a = [];
+      s(n.Entity) ? a = n.Entity.filter(
+        ({ _attributes: { type: o } }) => y.includes(o)
+      ) : r(n.Entity) && y.includes(n.Entity._attributes.type) && (a = [n.Entity]);
+      for (let o = 0; o < a.length; o++) {
+        const { id: d, longname: F, visible: O, position: T, eular: $, scale: w } = {
+          ...a[o]._attributes,
+          ...a[o].Properties?._attributes ?? {}
+        }, b = {
+          id: d,
+          name: F,
+          url: this._pathModeChange(p, `/${x(F)}`),
+          visible: this._text2Bool(O),
+          position: this._text2IVector3(T),
+          rotation: this._text2IVector3($),
+          scale: this._text2IVector3(w),
+          userData: a[o]
+        }, I = await this.ssp.loadModel(b);
+        I && (this.ssp.addObject(I, E), this._pushModelData(b), f.children?.push(b));
       }
+      this.treeData.push(f);
     };
     if (s(c.Floor))
-      for (let a = 0; a < c.Floor.length; a++)
-        await y(c.Floor[a]);
-    else r(c.Floor) && await y(c.Floor);
+      for (let l = 0; l < c.Floor.length; l++)
+        await m(c.Floor[l]);
+    else r(c.Floor) && await m(c.Floor);
   }
   _pushModelData(t) {
     this.modelData.find(({ url: i }) => i === t.url) || this.modelData.push(t);
   }
   _text2IVector3(t) {
+    if (!t) return;
     const e = t.split(", ");
     return {
       x: Number(e[0]),
@@ -81,7 +82,8 @@ class T {
     };
   }
   _text2Bool(t) {
-    return t === "True";
+    if (t !== void 0)
+      return t === "True";
   }
   _pathModeChange(t, e) {
     const i = t + e;
@@ -98,11 +100,11 @@ class T {
       const { Extension: r } = s._attributes;
       return r === ".sbm" || r === ".sbmx";
     }))), (s) => {
-      const r = i.find((d) => d?._attributes?.name.startsWith(s))?._attributes;
+      const r = i.find((h) => h?._attributes?.name.startsWith(s))?._attributes;
       return `${s}${r?.Extension || ".sbm"}`;
     };
   }
 }
 export {
-  T as default
+  v as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soonspacejs/plugin-soonbuilder-loader",
   "pluginName": "SoonbuilderLoaderPlugin",
-  "version": "2.15.4",
+  "version": "2.15.6",
   "description": "soonbuilder-loader 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.4"
+    "soonspacejs": "2.15.5"
   }
 }