@realsee/dnalogel 3.47.7 → 3.47.8

package/libs/PanoTagPlugin/controller/Tag/PointTag.d.ts

@@ -27,5 +27,4 @@ export declare class PointTag<C extends TagContentType = TagContentType> extends
     }): void;
     updateUnfoldedByPanoIndex(): void;
     computeNormal(): THREE.Vector3;
-    destroy(): void;
 }

package/libs/PanoTagPlugin/controller/Tag/PointTag.js

@@ -203,9 +203,6 @@ class Si extends g {
   computeNormal() {
     return new d.Vector3().fromArray(this.normal);
   }
-  destroy() {
-    this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
-  }
 }
 export {
   Si as PointTag

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,30 +1,30 @@
 var x = Object.defineProperty;
 var v = Object.getOwnPropertySymbols;
 var O = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
-var T = (s, e, t) => e in s ? x(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, w = (s, e) => {
+var T = (a, e, t) => e in a ? x(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t, j = (a, e) => {
   for (var t in e || (e = {}))
-    O.call(e, t) && T(s, t, e[t]);
+    O.call(e, t) && T(a, t, e[t]);
   if (v)
     for (var t of v(e))
-      A.call(e, t) && T(s, t, e[t]);
-  return s;
+      A.call(e, t) && T(a, t, e[t]);
+  return a;
 };
-var c = (s, e, t) => (T(s, typeof e != "symbol" ? e + "" : e, t), t);
-var R = (s, e, t) => new Promise((i, o) => {
-  var r = (n) => {
+var d = (a, e, t) => (T(a, typeof e != "symbol" ? e + "" : e, t), t);
+var w = (a, e, t) => new Promise((i, o) => {
+  var r = (p) => {
     try {
-      d(t.next(n));
+      l(t.next(p));
     } catch (h) {
       o(h);
     }
-  }, a = (n) => {
+  }, m = (p) => {
     try {
-      d(t.throw(n));
+      l(t.throw(p));
     } catch (h) {
       o(h);
     }
-  }, d = (n) => n.done ? i(n.value) : Promise.resolve(n.value).then(r, a);
-  d((t = t.apply(s, e)).next());
+  }, l = (p) => p.done ? i(p.value) : Promise.resolve(p.value).then(r, m);
+  l((t = t.apply(a, e)).next());
 });
 import { Group as y, Quaternion as G, Vector3 as C, Matrix4 as M } from "three";
 import E from "../Components/Tag/index.js";
@@ -230,17 +230,17 @@ import "../../CSS3DRenderPlugin/Controller.js";
 class vr extends U {
   constructor(t) {
     super(t);
-    c(this, "rendererMap", /* @__PURE__ */ new Map());
-    c(this, "contentTypeMap", /* @__PURE__ */ new Map());
-    c(this, "group", new y());
-    c(this, "imagePlaneGroup", new y());
-    c(this, "gltfObjectGroup", new y());
+    d(this, "rendererMap", /* @__PURE__ */ new Map());
+    d(this, "contentTypeMap", /* @__PURE__ */ new Map());
+    d(this, "group", new y());
+    d(this, "imagePlaneGroup", new y());
+    d(this, "gltfObjectGroup", new y());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
-    c(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    d(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     /** 临时状态 */
-    c(this, "temporaryState", { visible: !0 });
+    d(this, "temporaryState", { visible: !0 });
     /** 点标签 */
-    c(this, "TagContainerSvelte");
+    d(this, "TagContainerSvelte");
     this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.imagePlaneGroup.name = "ImagePlaneGroup", this.group.add(this.gltfObjectGroup), this.group.add(this.imagePlaneGroup);
   }
   /**
@@ -261,8 +261,8 @@ class vr extends U {
   clearTags() {
     var t;
     this.tags.length && (this.tags.forEach((i) => {
-      var o, r;
-      (r = (o = i.mediaPlane) == null ? void 0 : o.parent) == null || r.remove(i.mediaPlane);
+      var o, r, m, l, p;
+      (r = (o = i.mediaPlane) == null ? void 0 : o.parent) == null || r.remove(i.mediaPlane), (p = (l = (m = i.model) == null ? void 0 : m.object) == null ? void 0 : l.parent) == null || p.remove(i.model.object);
     }), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (t = this.TagContainerSvelte) == null || t.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer()), this.enabledModelTagSet.clear(), this.cache.clear();
   }
   /**
@@ -270,47 +270,47 @@ class vr extends U {
    */
   updateRender3DDomTag(t) {
     (t ? N(t) : this.filterCSS3DTag).forEach((o) => {
-      var r, a, d, n, h, b;
+      var r, m, l, p, h, b;
       if (o.tag3DContentSvelte) {
-        const { svelteApp: f, css3DInstance: l, initialNormal: u, currentNormal: p } = o.tag3DContentSvelte;
-        if ((a = l == null ? void 0 : l.css3DObject) == null || a.setVisible((this.state.visible && ((r = o.state) == null ? void 0 : r.visible)) !== !1), f.$set({ tag: o, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !u.equals(p)) {
-          const m = new G().setFromUnitVectors(u, p);
-          l.css3DObject.setRotationFromQuaternion(m);
+        const { svelteApp: f, css3DInstance: c, initialNormal: u, currentNormal: s } = o.tag3DContentSvelte;
+        if ((m = c == null ? void 0 : c.css3DObject) == null || m.setVisible((this.state.visible && ((r = o.state) == null ? void 0 : r.visible)) !== !1), f.$set({ tag: o, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !u.equals(s)) {
+          const n = new G().setFromUnitVectors(u, s);
+          c.css3DObject.setRotationFromQuaternion(n);
         }
         return;
       } else {
-        if (P(o) && !((d = o.model) != null && d.object) || ((n = o.state) == null ? void 0 : n.visible) === !1 || !this.state.visible || !this.state.enabled || !this.css3DRenderPlugin)
+        if (P(o) && !((l = o.model) != null && l.object) || ((p = o.state) == null ? void 0 : p.visible) === !1 || !this.state.visible || !this.state.enabled || !this.css3DRenderPlugin)
           return;
         if (o.stickType === "3DPoint" && !o.normal)
           return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
         const f = this.getPositions(o);
         if (!f)
           return;
-        const l = o.computeNormal();
-        if (!l)
+        const c = o.computeNormal();
+        if (!c)
           return;
-        const u = o.getConfig(), p = w({
+        const u = o.getConfig(), s = j({
           wrapperStyle: { zIndex: `${Math.round((1e4 - ((h = o.getDistance()) != null ? h : 0)) * 100)}` }
         }, u.tag3DConfig);
-        if (o.computeRenderType() === "BehindDom" || p.mode === "behind") {
-          p.mode = "behind", p.container = document.createElement("div");
+        if (o.computeRenderType() === "BehindDom" || s.mode === "behind") {
+          s.mode = "behind", s.container = document.createElement("div");
           const D = "black";
-          p.container.style.backgroundColor = D, p.container.style.border = `3px solid ${D}`, this.css3DRenderPlugin.hooks.on("render", () => {
+          s.container.style.backgroundColor = D, s.container.style.border = `3px solid ${D}`, this.css3DRenderPlugin.hooks.on("render", () => {
             var S;
-            if (m.css3DObject.opacityMesh && u.clickable !== !1) {
-              const j = this.addObjectClickHandler(o, m.css3DObject.opacityMesh, (k) => {
+            if (n.css3DObject.opacityMesh && u.clickable !== !1) {
+              const R = this.addObjectClickHandler(o, n.css3DObject.opacityMesh, (k) => {
                 this.hooks.emit("click", { event: k, target: "TagContent", tag: o });
               });
-              (S = this.store.css3DRenderDisposer.get(o.id)) == null || S.push(j);
+              (S = this.store.css3DRenderDisposer.get(o.id)) == null || S.push(R);
             }
           });
         }
-        const m = this.css3DRenderPlugin.create3DDomContainer(f, p);
-        if (!m)
+        const n = this.css3DRenderPlugin.create3DDomContainer(f, s);
+        if (!n)
           return;
-        this.store.css3DRenderDisposer.set(o.id, [m.dispose]);
+        this.store.css3DRenderDisposer.set(o.id, [n.dispose]);
         const g = new E({
-          target: m.container,
+          target: n.container,
           props: {
             tag: o,
             hooks: this.hooks,
@@ -322,12 +322,12 @@ class vr extends U {
         });
         o.tag3DContentSvelte = {
           svelteApp: g,
-          domContainer: m,
-          css3DInstance: m,
-          initialNormal: l,
-          currentNormal: l,
+          domContainer: n,
+          css3DInstance: n,
+          initialNormal: c,
+          currentNormal: c,
           dispose: () => {
-            g.$destroy(), m.dispose();
+            g.$destroy(), n.dispose();
           }
         }, P(o) && ((b = o.model) != null && b.object) && this.updateTagCss3DObjectMatrix(o, o.model.object);
       }
@@ -338,22 +338,22 @@ class vr extends U {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, i) {
-    var m, g, D;
-    const o = (g = (m = t.getConfig().tag3DConfig) == null ? void 0 : m.ratio) != null ? g : 216e-5, r = (D = t.tag3DContentSvelte) == null ? void 0 : D.css3DInstance.css3DObject;
+    var n, g, D;
+    const o = (g = (n = t.getConfig().tag3DConfig) == null ? void 0 : n.ratio) != null ? g : 216e-5, r = (D = t.tag3DContentSvelte) == null ? void 0 : D.css3DInstance.css3DObject;
     if (!r)
       return;
-    const a = P(t) ? t.data.mediaPosition : t.position;
-    if (!a || a.length !== 4 || !Array.isArray(a[0]) || !Array.isArray(a[2]))
+    const m = P(t) ? t.data.mediaPosition : t.position;
+    if (!m || m.length !== 4 || !Array.isArray(m[0]) || !Array.isArray(m[2]))
       return;
     i.updateWorldMatrix(!1, !1);
-    const d = i.matrixWorld, n = new C().fromArray(a[0]), h = new C().fromArray(a[2]), b = I(n, h).add(new C(0, 0, 5e-4)), f = new M().setPosition(b), l = new M().makeScale(o, o, o), u = new M().multiply(d).multiply(f).multiply(l);
+    const l = i.matrixWorld, p = new C().fromArray(m[0]), h = new C().fromArray(m[2]), b = I(p, h).add(new C(0, 0, 5e-4)), f = new M().setPosition(b), c = new M().makeScale(o, o, o), u = new M().multiply(l).multiply(f).multiply(c);
     u.decompose(r.position, r.quaternion, r.scale);
-    const p = r.opacityMesh;
-    p && u.decompose(p.position, p.quaternion, p.scale);
+    const s = r.opacityMesh;
+    s && u.decompose(s.position, s.quaternion, s.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
-    return R(this, null, function* () {
+    return w(this, null, function* () {
       const i = t.filter((o) => o.stickType === "Model").map((o) => o.loadModel());
       yield Promise.all(i), t.forEach((o) => o.updateVisible());
     });

package/libs/base/BasePlugin.js

@@ -16,7 +16,7 @@ let c = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "3.47.7");
+    e(this, "VERSION", "3.47.8");
     e(this, "NAME");
     e(this, "five");
     e(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.47.7",
+    "%c %c@realsee/dnalogel %cv3.47.8",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.47.7",
+  "version": "3.47.8",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",