@realsee/dnalogel 2.19.0-1 → 2.19.0-2

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,29 +1,29 @@
 var k = Object.defineProperty;
-var w = (f, h, t) => h in f ? k(f, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[h] = t;
-var g = (f, h, t) => (w(f, typeof h != "symbol" ? h + "" : h, t), t);
-var P = (f, h, t) => new Promise((e, i) => {
-  var o = (r) => {
+var E = (f, h, t) => h in f ? k(f, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[h] = t;
+var g = (f, h, t) => (E(f, typeof h != "symbol" ? h + "" : h, t), t);
+var D = (f, h, t) => new Promise((e, o) => {
+  var i = (r) => {
     try {
-      a(t.next(r));
+      n(t.next(r));
     } catch (s) {
-      i(s);
+      o(s);
     }
-  }, n = (r) => {
+  }, a = (r) => {
     try {
-      a(t.throw(r));
+      n(t.throw(r));
     } catch (s) {
-      i(s);
+      o(s);
     }
-  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(o, n);
-  a((t = t.apply(f, h)).next());
+  }, n = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, a);
+  n((t = t.apply(f, h)).next());
 });
-import { TagComputer as E } from "./TagComputer.js";
-import { Group as v, Quaternion as O, Vector3 as T, Matrix4 as D } from "three";
+import { TagComputer as w } from "./TagComputer.js";
+import { Group as P, Quaternion as O, Vector3 as v, Matrix4 as T } from "three";
 import x from "../Components/TagContainer.js";
 import A from "../Components/Tag/index.js";
-import { arrayPositionToVector3 as S } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { arrayPositionToVector3 as C } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { centerPoint as G } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as C, isStickModelTag as I } from "../utils/tag/tagCheck.js";
+import { isMediaModelTag as S, isStickModelTag as I } from "../utils/tag/tagCheck.js";
 import { CSS3DRenderPlugin as V } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
 import { VideoPlane as R, ImagePlane as j } from "../utils/model/mediaPlane.js";
@@ -140,12 +140,12 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const L = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class ti extends E {
+class ti extends w {
   constructor(t) {
     super(t);
-    g(this, "group", new v());
-    g(this, "imagePlaneGroup", new v());
-    g(this, "gltfObjectGroup", new v());
+    g(this, "group", new P());
+    g(this, "imagePlaneGroup", new P());
+    g(this, "gltfObjectGroup", new P());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
     g(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     /** 临时状态 */
@@ -153,41 +153,47 @@ class ti extends E {
     /** 点标签 */
     g(this, "TagContainerSvelte");
     /** 加载外部模型 */
-    g(this, "loadModel", (t) => P(this, null, function* () {
-      var a;
+    g(this, "loadModel", (t) => D(this, null, function* () {
+      var n;
       const e = t.data.modelUrl;
       if (!e)
         return;
-      const i = F(e).then((r) => {
+      const o = F(e).then((r) => {
         var m, u, p, d, c;
-        const s = Object.assign(r.scene, { customID: t.id, isTagModel: !0 });
-        return s.visible = this.getCurrentVisibleState(t), new D().fromArray(t.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), s.visible = this.getVisibleByFiveMode(t), (p = (u = (m = this.config) == null ? void 0 : m.globalConfig) == null ? void 0 : u.modelConfig) != null && p.autoLookAtEnabled && ((c = (d = t.config) == null ? void 0 : d.modelConfig) != null && c.autoLookAtEnabled) && s.lookAt(this.five.camera.position.clone().setY(s.position.y)), s;
+        const s = Object.assign(r.scene, {
+          customID: t.id,
+          isTagModel: !0,
+          removeEventListener: this.addObjectClickHandler(t, r.scene, (b) => {
+            this.hooks.emit("click", { target: "TagModel", tag: t, event: b });
+          })
+        });
+        return s.visible = this.getCurrentVisibleState(t), new T().fromArray(t.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), s.visible = this.getVisibleByFiveMode(t), (p = (u = (m = this.config) == null ? void 0 : m.globalConfig) == null ? void 0 : u.modelConfig) != null && p.autoLookAtEnabled && ((c = (d = t.config) == null ? void 0 : d.modelConfig) != null && c.autoLookAtEnabled) && s.lookAt(this.five.camera.position.clone().setY(s.position.y)), s;
       });
-      t.model = { promise: i };
-      const o = yield i;
-      if (((a = t.model) == null ? void 0 : a.promise) !== i || !this.tags.includes(t))
+      t.model = { promise: o };
+      const i = yield o;
+      if (((n = t.model) == null ? void 0 : n.promise) !== o || !this.tags.includes(t))
         return;
-      t.model.object = o;
-      const n = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
-      if (n && this.gltfObjectGroup.remove(n), this.updateRender3DDomTag(), C(t)) {
+      t.model.object = i;
+      const a = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
+      if (a && (this.gltfObjectGroup.remove(a), a.removeEventListener()), this.updateRender3DDomTag(), S(t)) {
         if (this.getRenderType(t) === "Mesh" && !t.mediaPlane) {
-          const r = t.data.mediaPosition.map(S);
-          t.mediaPlane = new j(t.data.mediaData[0].url, t.data.mediaPosition.map(S), {
+          const r = t.data.mediaPosition.map(C);
+          t.mediaPlane = new j(t.data.mediaData[0].url, t.data.mediaPosition.map(C), {
             objectFit: t.data.objectFit
           });
-          const s = new T().addVectors(r[0], r[2]).divideScalar(2);
-          t.mediaPlane.position.copy(s), o.add(t.mediaPlane);
+          const s = new v().addVectors(r[0], r[2]).divideScalar(2);
+          t.mediaPlane.position.copy(s), i.add(t.mediaPlane);
         }
-        this.getRenderType(t) !== "Mesh" && (o.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, o), o.updateTagCss3DObjectMatrix());
+        this.getRenderType(t) !== "Mesh" && (i.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, i), i.updateTagCss3DObjectMatrix());
       }
-      return this.gltfObjectGroup.add(o), o;
+      return this.gltfObjectGroup.add(i), i;
     }));
     this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.imagePlaneGroup.name = "ImagePlaneGroup", this.group.add(this.gltfObjectGroup), this.group.add(this.imagePlaneGroup);
   }
   clearTags() {
     this.tags.forEach((t) => {
-      var e, i;
-      (i = (e = t.mediaPlane) == null ? void 0 : e.parent) == null || i.remove(t.mediaPlane);
+      var e, o;
+      (o = (e = t.mediaPlane) == null ? void 0 : e.parent) == null || o.remove(t.mediaPlane);
     }), this.tags = [], this.enabledModelTagSet.clear(), this.clearCache(), this.disposeAllCSS3DContainer(), this.updateRenderAllTags();
   }
   /**
@@ -202,20 +208,20 @@ class ti extends E {
   updateRenderImagePlane() {
     this.sort(this.filterImagePlane).forEach((e) => {
       var r, s, l, m, u;
-      const i = e.data.mediaData[0];
-      if (!i)
+      const o = e.data.mediaData[0];
+      if (!o)
         return;
-      const { url: o, type: n } = i;
-      if (!o || (e.mediaPlane && (e.mediaPlane.visible = (s = (r = e.state) == null ? void 0 : r.visible) != null ? s : !0, e.mediaPlane.visible || e.mediaPlane instanceof R && ((l = e.data.autoplayConfig) != null && l.autoplayVideo || e.mediaPlane.pause())), ((m = e.mediaPlane) == null ? void 0 : m.src) === o))
+      const { url: i, type: a } = o;
+      if (!i || (e.mediaPlane && (e.mediaPlane.visible = (s = (r = e.state) == null ? void 0 : r.visible) != null ? s : !0, e.mediaPlane.visible || e.mediaPlane instanceof R && ((l = e.data.autoplayConfig) != null && l.autoplayVideo || e.mediaPlane.pause())), ((m = e.mediaPlane) == null ? void 0 : m.src) === i))
         return;
-      const a = e.position.map(S);
-      if (e.mediaPlane && e.mediaPlane.removeFromParent(), n === "Image")
-        e.mediaPlane = new j(o, a, { objectFit: e.data.objectFit }), this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (p) => {
+      const n = e.position.map(C);
+      if (e.mediaPlane && e.mediaPlane.removeFromParent(), a === "Image")
+        e.mediaPlane = new j(i, n, { objectFit: e.data.objectFit }), this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (p) => {
           this.hooks.emit("click", { tag: e, target: "TagContent", event: p.origDomEvent });
         });
-      else if (n === "Video") {
-        const p = new R(o, a, {
-          videoCoverSrc: i.videoCoverUrl,
+      else if (a === "Video") {
+        const p = new R(i, n, {
+          videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
           paused: !((u = e.data.autoplayConfig) != null && u.autoplayVideo),
           objectFit: e.data.objectFit,
@@ -236,26 +242,26 @@ class ti extends E {
    */
   updateRender3DDomTag() {
     this.sort([...this.filterCSS3DTag]).forEach((e) => {
-      var i, o, n;
+      var o, i, a;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: a, css3DInstance: r, initialNormal: s, currentNormal: l } = e.tag3DContentSvelte;
-        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !s.equals(l)) {
+        const { svelteApp: n, css3DInstance: r, initialNormal: s, currentNormal: l } = e.tag3DContentSvelte;
+        if (n.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !s.equals(l)) {
           const m = new O().setFromUnitVectors(s, l);
           r.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
-        if (C(e) && !((i = e.model) != null && i.object) || ((o = e.state) == null ? void 0 : o.visible) === !1 || !this.state.visible || !this.state.enabled)
+        if (S(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled)
           return;
         if (this.css3DRenderPlugin || (this.css3DRenderPlugin = V(this.five)), e.stickType === "3DPoint" && !e.normal)
           return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
-        const a = this.getPositions(e);
-        if (!a)
+        const n = this.getPositions(e);
+        if (!n)
           return;
         const r = this.getTagNormal(e);
         if (!r)
           return;
-        const l = (n = this.getTagConfig(e).tag3DConfig) != null ? n : {};
+        const l = (a = this.getTagConfig(e).tag3DConfig) != null ? a : {};
         if (this.getRenderType(e) === "BehindDom") {
           l.mode = "behind", l.container = document.createElement("div");
           const p = "black";
@@ -269,7 +275,7 @@ class ti extends E {
             }
           });
         }
-        const m = this.css3DRenderPlugin.create3DDomContainer(a, l);
+        const m = this.css3DRenderPlugin.create3DDomContainer(n, l);
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
@@ -305,13 +311,13 @@ class ti extends E {
    * FIXME: 有性能问题，但是之前的逻辑都是这么写，暂时先这样吧
    */
   updateRenderModelTag() {
-    const t = (i) => !this.enabledModelTagSet.has(i.customID);
-    this.gltfObjectGroup.remove(...this.gltfObjectGroup.children.filter(t)), this.tags.filter((i) => i.stickType === "Model").forEach((i) => {
-      var o;
-      (o = i.model) == null || o.promise.then((n) => {
+    const t = (i) => !this.enabledModelTagSet.has(i.customID), e = this.gltfObjectGroup.children.filter(t);
+    e.forEach((i) => i.removeEventListener()), this.gltfObjectGroup.remove(...e), this.tags.filter((i) => i.stickType === "Model").forEach((i) => {
+      var a;
+      (a = i.model) == null || a.promise.then((n) => {
         n.visible = this.getCurrentVisibleState(i);
       });
-    });
+    }), this.five.needsRender = !0;
   }
   updateTagModelVisible() {
     this.tags.forEach((t) => {
@@ -325,20 +331,20 @@ class ti extends E {
    */
   updateTagCss3DObjectMatrix(t, e) {
     var c, b, y, M;
-    const i = (y = (b = (c = t.mergedConfig) == null ? void 0 : c.tag3DConfig) == null ? void 0 : b.ratio) != null ? y : 216e-5, o = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
-    if (!o)
+    const o = (y = (b = (c = t.mergedConfig) == null ? void 0 : c.tag3DConfig) == null ? void 0 : b.ratio) != null ? y : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
+    if (!i)
       return;
-    const n = C(t) ? t.data.mediaPosition : t.position;
+    const a = S(t) ? t.data.mediaPosition : t.position;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, r = new T().fromArray(n[0]), s = new T().fromArray(n[2]), l = G(r, s).add(new T(0, 0, 5e-4)), m = new D().setPosition(l), u = new D().makeScale(i, i, i), p = new D().multiply(a).multiply(m).multiply(u);
-    p.decompose(o.position, o.quaternion, o.scale);
-    const d = o.opacityMesh;
+    const n = e.matrixWorld, r = new v().fromArray(a[0]), s = new v().fromArray(a[2]), l = G(r, s).add(new v(0, 0, 5e-4)), m = new T().setPosition(l), u = new T().makeScale(o, o, o), p = new T().multiply(n).multiply(m).multiply(u);
+    p.decompose(i.position, i.quaternion, i.scale);
+    const d = i.opacityMesh;
     d && p.decompose(d.position, d.quaternion, d.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
-    return P(this, null, function* () {
-      const e = t.filter(I).map((i) => this.loadModel(i));
+    return D(this, null, function* () {
+      const e = t.filter(I).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
@@ -351,11 +357,11 @@ class ti extends E {
     if (this.setPointTagPosition(), this.TagContainerSvelte)
       this.TagContainerSvelte.$set({ tags: t, state: this.state, temporaryState: this.temporaryState });
     else {
-      const i = (e = this.five.getElement()) == null ? void 0 : e.parentElement;
-      if (!i)
+      const o = (e = this.five.getElement()) == null ? void 0 : e.parentElement;
+      if (!o)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
       this.TagContainerSvelte = new x({
-        target: i,
+        target: o,
         props: { hooks: this.hooks, tags: t, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });
     }
@@ -367,8 +373,8 @@ class ti extends E {
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
     }), this.filterCSS3DTag.forEach((e) => {
-      var i, o, n, a, r;
-      (a = (o = (i = e.tag3DContentSvelte) == null ? void 0 : i.css3DInstance) == null ? void 0 : o.css3DObject) == null || a.setVisible((this.state.visible && ((n = e.state) == null ? void 0 : n.visible)) !== !1), (r = e.tag3DContentSvelte) == null || r.svelteApp.$set({
+      var o, i, a, n, r;
+      (n = (i = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : i.css3DObject) == null || n.setVisible((this.state.visible && ((a = e.state) == null ? void 0 : a.visible)) !== !1), (r = e.tag3DContentSvelte) == null || r.svelteApp.$set({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation
@@ -377,7 +383,7 @@ class ti extends E {
   }
   disposeAllCSS3DContainer() {
     for (const [t, e] of this.store.css3DRenderDisposer)
-      e == null || e.forEach((i) => i == null ? void 0 : i());
+      e == null || e.forEach((o) => o == null ? void 0 : o());
     this.store.css3DRenderDisposer = /* @__PURE__ */ new Map();
   }
   /**
@@ -389,8 +395,8 @@ class ti extends E {
       (e = t.tag3DContentSvelte) == null || e.css3DInstance.dispose(), t.tag3DContentSvelte = void 0;
     });
     for (const [t, e] of this.store.css3DRenderDisposer) {
-      const i = this.getTagById(t);
-      (!i || i.stickType === "2DPoint") && (e == null || e.forEach((o) => o == null ? void 0 : o()), this.store.css3DRenderDisposer.delete(t));
+      const o = this.getTagById(t);
+      (!o || o.stickType === "2DPoint") && (e == null || e.forEach((i) => i == null ? void 0 : i()), this.store.css3DRenderDisposer.delete(t));
     }
   }
 }

package/libs/PanoTagPlugin/controller/TagUtil.d.ts

@@ -49,7 +49,7 @@ export declare abstract class TagUtil extends TagCache {
     protected getDistance(tag: Tag<any, any>, panoIndex?: number): number;
     protected getPositions(tag: TagElement<any, any>): any;
     protected preventWhenMouseDown: () => false | void;
-    protected addObjectClickHandler(tag: TagElement, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
+    protected addObjectClickHandler(tag: TagElement<any, any>, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
     protected getTagNormal(tag: TagElement<any, 'Plane'> | TagElement<any, 'Model'> | TagElement<any, '3DPoint'>): THREE.Vector3;
     protected get filterPointTag(): PointTagElement[];
     protected get filter2DPointTag(): Point2DElement[];

package/libs/PanoTagPlugin/typings/controller.d.ts

@@ -33,6 +33,9 @@ export interface EventMap extends BasePlugin.EventMap<State> {
         target: 'AudioTagPlayIcon';
         tag: TagElement;
         audioInstance: HTMLAudioElement;
+    } | {
+        target: 'TagModel';
+        tag: TagElement<'Model', 'Model'> | TagElement<'MediaModel', 'Model'>;
     })) => void;
     playStateChange: (params: {
         event: Event;

package/libs/PanoTagPlugin/typings/tag/Utils.d.ts

@@ -44,6 +44,7 @@ export interface TagStyle {
 export type TagGLTFObject = GLTFObject & {
     customID: number | string;
     isTagModel: boolean;
+    removeEventListener: () => void;
     updateTagCss3DObjectMatrix?: () => void;
 };
 /** 返回一个销毁函数 */

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.19.0-1");
+    e(this, "VERSION", "2.19.0-2");
     e(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.info(
-    "%c %c@realsee/dnalogel %cv2.19.0-1",
+    "%c %c@realsee/dnalogel %cv2.19.0-2",
     [
       "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

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.19.0-1",
+  "version": "2.19.0-2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",