@realsee/dnalogel 3.35.0-dev.0 → 3.35.0-dev.1

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -89,6 +89,8 @@ class ni extends W {
    * @description 获取是否可见
    */
   getVisible(e, i) {
+    if (!e.enabled)
+      return !1;
     const s = h(h({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = s, n = x(r) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((n == null ? void 0 : n.visible) !== void 0)
       return n.visible;

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

@@ -35,6 +35,8 @@ export declare abstract class TagRender extends TagComputer {
      * @description 更新所有标签
      */
     protected updateRenderAllTags(): void;
+    protected updateAllTagsNextFrame(): void;
+    protected updateTag(tag: TagInstance): void;
     protected updateRenderVideoPlane(): void;
     /**
      * @description 渲染图片贴片
@@ -68,7 +70,6 @@ export declare abstract class TagRender extends TagComputer {
      * @description 渲染单个点的标签
      */
     protected updateRenderPointTag(): void;
-    protected updatePointTagPosition(): void;
     protected updateTagContainerVisible(): void;
     protected disposeAllCSS3DContainer(): void;
     /**

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,16 +1,16 @@
 var A = Object.defineProperty;
-var R = Object.getOwnPropertySymbols;
-var k = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
-var C = (d, m, t) => m in d ? A(d, m, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[m] = t, j = (d, m) => {
+var j = Object.getOwnPropertySymbols;
+var I = Object.prototype.hasOwnProperty, V = Object.prototype.propertyIsEnumerable;
+var S = (p, m, t) => m in p ? A(p, m, { enumerable: !0, configurable: !0, writable: !0, value: t }) : p[m] = t, k = (p, m) => {
   for (var t in m || (m = {}))
-    k.call(m, t) && C(d, t, m[t]);
-  if (R)
-    for (var t of R(m))
-      I.call(m, t) && C(d, t, m[t]);
-  return d;
+    I.call(m, t) && S(p, t, m[t]);
+  if (j)
+    for (var t of j(m))
+      V.call(m, t) && S(p, t, m[t]);
+  return p;
 };
-var u = (d, m, t) => (C(d, typeof m != "symbol" ? m + "" : m, t), t);
-var S = (d, m, t) => new Promise((e, o) => {
+var u = (p, m, t) => (S(p, typeof m != "symbol" ? m + "" : m, t), t);
+var C = (p, m, t) => new Promise((e, o) => {
   var i = (s) => {
     try {
       a(t.next(s));
@@ -24,17 +24,18 @@ var S = (d, m, t) => new Promise((e, o) => {
       o(n);
     }
   }, a = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(i, r);
-  a((t = t.apply(d, m)).next());
+  a((t = t.apply(p, m)).next());
 });
-import { TagComputer as V } from "./TagComputer.js";
-import { Group as y, Quaternion as x, Vector3 as b, Matrix4 as v } from "three";
+import { TagComputer as x } from "./TagComputer.js";
+import { Group as M, Quaternion as E, Vector3 as b, Matrix4 as v } from "three";
 import O from "../Components/TagContainer.js";
-import E from "../Components/Tag/index.js";
-import { loadGLTF as G } from "../../shared-utils/three/GLTFLoader.js";
-import { isMediaModelTag as D, isStickModelTag as F } from "../utils/tag/tagCheck.js";
-import { VideoPlane as _, ImagePlane as w } from "../utils/model/mediaPlane.js";
-import { centerPoint as L } from "../../shared-utils/three/centerPoint.js";
-import { arrayPositionToVector3 as g } from "../../shared-utils/positionToVector3.js";
+import G from "../Components/Tag/index.js";
+import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
+import { isMediaModelTag as g, isStickModelTag as _ } from "../utils/tag/tagCheck.js";
+import { VideoPlane as L, ImagePlane as w } from "../utils/model/mediaPlane.js";
+import { centerPoint as W } from "../../shared-utils/three/centerPoint.js";
+import { arrayPositionToVector3 as D } from "../../shared-utils/positionToVector3.js";
+import { debounceByKey as y } from "../utils/debounce.js";
 import "../utils/tagPosition.js";
 import "../utils/checkRange.js";
 import "../../shared-utils/five/mode.js";
@@ -161,15 +162,15 @@ import "../Components/Tag/LinkTag.js";
 import "../Components/Tag/PanoramaTag.js";
 import "../Components/Tag/CustomTag.js";
 import "@realsee/five/gltf-loader";
-const W = /* @__PURE__ */ new Map(), $ = /* @__PURE__ */ new Map();
-class Pi extends V {
+const q = /* @__PURE__ */ new Map(), $ = /* @__PURE__ */ new Map();
+class bi extends x {
   constructor(t) {
     super(t);
     u(this, "rendererMap", /* @__PURE__ */ new Map());
     u(this, "contentTypeMap", /* @__PURE__ */ new Map());
-    u(this, "group", new y());
-    u(this, "imagePlaneGroup", new y());
-    u(this, "gltfObjectGroup", new y());
+    u(this, "group", new M());
+    u(this, "imagePlaneGroup", new M());
+    u(this, "gltfObjectGroup", new M());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
     u(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     /** 临时状态 */
@@ -177,14 +178,14 @@ class Pi extends V {
     /** 点标签 */
     u(this, "TagContainerSvelte");
     /** 加载外部模型 */
-    u(this, "loadModel", (t) => S(this, null, function* () {
+    u(this, "loadModel", (t) => C(this, null, function* () {
       var a;
       const e = t.data.modelUrl;
       if (!e)
         return;
       t.loading = !0;
-      const o = G(e).then((s) => {
-        var p;
+      const o = F(e).then((s) => {
+        var d;
         const n = Object.assign(s.scene, {
           customID: t.id,
           isTagModel: !0,
@@ -193,7 +194,7 @@ class Pi extends V {
             this.hooks.emit("click", { target: "TagModel", tag: t, event: h });
           })
         });
-        return n.visible = this.getCurrentVisibleState(t), new v().fromArray(t.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisible(t), (p = this.getTagConfig(t).modelConfig) != null && p.autoLookAtEnabled && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
+        return n.visible = this.getCurrentVisibleState(t), new v().fromArray(t.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisible(t), (d = this.getTagConfig(t).modelConfig) != null && d.autoLookAtEnabled && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
       });
       t.model = { promise: o };
       const i = yield o;
@@ -201,10 +202,10 @@ class Pi extends V {
         return;
       t.model.object = i;
       const r = this.gltfObjectGroup.children.find((s) => s.customID === t.id);
-      if (r && (this.gltfObjectGroup.remove(r), r.removeEventListener()), this.updateRender3DDomTag(), D(t)) {
+      if (r && (this.gltfObjectGroup.remove(r), r.removeEventListener()), this.updateRender3DDomTag(), g(t)) {
         if (this.getRenderType(t) === "Mesh" && !t.mediaPlane) {
-          const s = t.data.mediaPosition.map(g);
-          t.mediaPlane = new w(t.data.mediaData[0].url, t.data.mediaPosition.map(g), {
+          const s = t.data.mediaPosition.map(D);
+          t.mediaPlane = new w(t.data.mediaData[0].url, t.data.mediaPosition.map(D), {
             objectFit: t.data.objectFit
           });
           const n = new b().addVectors(s[0], s[2]).divideScalar(2);
@@ -237,7 +238,7 @@ class Pi extends V {
     this.tags.length && (this.tags.forEach((e) => {
       var o, i;
       (i = (o = e.mediaPlane) == null ? void 0 : o.parent) == null || i.remove(e.mediaPlane);
-    }), this.tags = [], (t = this.TagContainerSvelte) == null || t.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer(), this.updateRenderAllTags()), this.enabledModelTagSet.clear(), this.clearCache();
+    }), this.tags = [], (t = this.TagContainerSvelte) == null || t.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer(), this.updateRenderAllTags()), this.enabledModelTagSet.clear(), this.clearCache(), this.tagsLengthWillUpdate = !0;
   }
   /**
    * @description 更新所有标签
@@ -245,6 +246,12 @@ class Pi extends V {
   updateRenderAllTags() {
     this.enabledModelTagSet.clear(), this.tags.forEach((t) => t.stickType === "Model" && this.enabledModelTagSet.add(t.id)), this.updateRenderPointTag(), this.updateRender3DDomTag(), this.updateRenderModelTag(), this.updateRenderImagePlane(), this.updateRenderVideoPlane();
   }
+  updateAllTagsNextFrame() {
+    requestAnimationFrame(() => this.updateRenderAllTags());
+  }
+  updateTag(t) {
+    t.stickType === "2DPoint" ? y("updateRenderPointTag", () => this.updateRenderPointTag()) : t.stickType === "3DPoint" ? (y("updateRenderPointTag", () => this.updateRenderPointTag()), y("updateRender3DDomTag", () => this.updateRender3DDomTag())) : t.stickType === "Model" ? (this.enabledModelTagSet.clear(), this.tags.forEach((e) => e.stickType === "Model" && this.enabledModelTagSet.add(e.id)), this.updateRenderModelTag()) : t.stickType === "Plane" && (this.updateRenderImagePlane(), this.updateRenderVideoPlane());
+  }
   updateRenderVideoPlane() {
     this.filterImagePlane.filter((e) => {
       var o, i;
@@ -259,12 +266,12 @@ class Pi extends V {
         return;
       const r = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !r))(), s = (() => !!(!e.mediaPlane && r))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
       if ((a || n) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), s || n) {
-        const p = e.position.map(g), h = new _(i, p, {
+        const d = e.position.map(D), h = new L(i, d, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
           paused: !((l = e.data.autoplayConfig) != null && l.autoplayVideo),
           objectFit: e.data.objectFit,
-          videoTextureMap: W,
+          videoTextureMap: q,
           ImageTextureMap: $,
           domEvents: this.domEvents
         });
@@ -287,7 +294,7 @@ class Pi extends V {
       const { url: o } = e.data.mediaData[0];
       if (!o)
         return;
-      const i = e.position.map(g), r = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !r))(), s = (() => !!(!e.mediaPlane && r))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
+      const i = e.position.map(D), r = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !r))(), s = (() => !!(!e.mediaPlane && r))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
       (a || n) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), (s || n) && (e.mediaPlane = new w(o, i, { objectFit: e.data.objectFit }), this.getTagConfig(e).clickable !== !1 && this.domEvents.addAutoBindEventListener(
         e.mediaPlane,
         "click",
@@ -307,12 +314,12 @@ class Pi extends V {
       if (e.tag3DContentSvelte) {
         const { svelteApp: a, css3DInstance: s, initialNormal: n, currentNormal: l } = e.tag3DContentSvelte;
         if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !n.equals(l)) {
-          const p = new x().setFromUnitVectors(n, l);
-          s.css3DObject.setRotationFromQuaternion(p);
+          const d = new E().setFromUnitVectors(n, l);
+          s.css3DObject.setRotationFromQuaternion(d);
         }
         return;
       } else {
-        if (D(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled || !this.css3DRenderPlugin)
+        if (g(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled || !this.css3DRenderPlugin)
           return;
         if (e.stickType === "3DPoint" && !e.normal)
           return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
@@ -322,26 +329,26 @@ class Pi extends V {
         const s = this.getTagNormal(e);
         if (!s)
           return;
-        const n = this.getTagConfig(e), l = j({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
+        const n = this.getTagConfig(e), l = k({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
         if (this.getRenderType(e) === "BehindDom" || l.mode === "behind") {
           l.mode = "behind", l.container = document.createElement("div");
           const f = "black";
           l.container.style.backgroundColor = f, l.container.style.border = `3px solid ${f}`, this.css3DRenderPlugin.hooks.on("render", () => {
             var c;
-            if (p.css3DObject.opacityMesh && n.clickable !== !1) {
-              const P = this.addObjectClickHandler(e, p.css3DObject.opacityMesh, (T) => {
-                this.hooks.emit("click", { event: T, target: "TagContent", tag: e });
+            if (d.css3DObject.opacityMesh && n.clickable !== !1) {
+              const T = this.addObjectClickHandler(e, d.css3DObject.opacityMesh, (P) => {
+                this.hooks.emit("click", { event: P, target: "TagContent", tag: e });
               });
-              (c = this.store.css3DRenderDisposer.get(e.id)) == null || c.push(P);
+              (c = this.store.css3DRenderDisposer.get(e.id)) == null || c.push(T);
             }
           });
         }
-        const p = this.css3DRenderPlugin.create3DDomContainer(a, l);
-        if (!p)
+        const d = this.css3DRenderPlugin.create3DDomContainer(a, l);
+        if (!d)
           return;
-        this.store.css3DRenderDisposer.set(e.id, [p.dispose]);
-        const h = new E({
-          target: p.container,
+        this.store.css3DRenderDisposer.set(e.id, [d.dispose]);
+        const h = new G({
+          target: d.container,
           props: {
             tag: e,
             hooks: this.hooks,
@@ -353,14 +360,14 @@ class Pi extends V {
         });
         e.tag3DContentSvelte = {
           svelteApp: h,
-          domContainer: p,
-          css3DInstance: p,
+          domContainer: d,
+          css3DInstance: d,
           initialNormal: s,
           currentNormal: s,
           dispose: () => {
-            h.$destroy(), p.dispose();
+            h.$destroy(), d.dispose();
           }
-        }, D(e) && ((r = e.model) != null && r.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
+        }, g(e) && ((r = e.model) != null && r.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
     }), this.clearUnusedPanelTag();
   }
@@ -392,23 +399,23 @@ class Pi extends V {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var P, T, M;
-    const o = (T = (P = this.getTagConfig(t).tag3DConfig) == null ? void 0 : P.ratio) != null ? T : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
+    var T, P, R;
+    const o = (P = (T = this.getTagConfig(t).tag3DConfig) == null ? void 0 : T.ratio) != null ? P : 216e-5, i = (R = t.tag3DContentSvelte) == null ? void 0 : R.css3DInstance.css3DObject;
     if (!i)
       return;
-    const r = D(t) ? t.data.mediaPosition : t.position;
+    const r = g(t) ? t.data.mediaPosition : t.position;
     if (!r || r.length !== 4 || !Array.isArray(r[0]) || !Array.isArray(r[2]))
       return;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, s = new b().fromArray(r[0]), n = new b().fromArray(r[2]), l = L(s, n).add(new b(0, 0, 5e-4)), p = new v().setPosition(l), h = new v().makeScale(o, o, o), f = new v().multiply(a).multiply(p).multiply(h);
+    const a = e.matrixWorld, s = new b().fromArray(r[0]), n = new b().fromArray(r[2]), l = W(s, n).add(new b(0, 0, 5e-4)), d = new v().setPosition(l), h = new v().makeScale(o, o, o), f = new v().multiply(a).multiply(d).multiply(h);
     f.decompose(i.position, i.quaternion, i.scale);
     const c = i.opacityMesh;
     c && f.decompose(c.position, c.quaternion, c.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
-    return S(this, null, function* () {
-      const e = t.filter(F).map((o) => this.loadModel(o));
+    return C(this, null, function* () {
+      const e = t.filter(_).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setVisible(), this.updateRenderAllTags();
     });
   }
@@ -438,10 +445,7 @@ class Pi extends V {
    */
   updateRenderPointTag() {
     const t = this.filterPointTag;
-    this.setTagZIndex(t), this.setPointTagPosition(), this.updateDomView();
-  }
-  updatePointTagPosition() {
-    this.setPointTagPosition(), this.updateDomView();
+    this.setTagZIndex(t), this.setPointTagPosition(), y("updateDomView", () => this.updateDomView())();
   }
   updateTagContainerVisible() {
     var t;
@@ -505,5 +509,5 @@ class Pi extends V {
   }
 }
 export {
-  Pi as TagRender
+  bi as TagRender
 };

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

@@ -12,7 +12,7 @@ export declare abstract class TagUtil extends TagCache {
     get container(): Element;
     set container(container: Element);
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
-    tagsLengthWillUpdate: boolean;
+    set tagsLengthWillUpdate(value: boolean);
     workUtil: WorkUtil;
     set workCode(workCode: string);
     get workCode(): string;
@@ -36,6 +36,16 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
+    private _cache_pointTag?;
+    private _cache_2DPointTag?;
+    private _cache_imagePlane?;
+    private _cache_mediaModel?;
+    private _cache_css3DTag?;
+    protected get filterPointTag(): PointTagInstance[];
+    protected get filter2DPointTag(): TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "2DPoint">[];
+    protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
+    protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
+    protected get filterCSS3DTag(): (TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
     private _container;
     private _css3DRenderPlugin;
     protected constructor(five: Five);
@@ -68,11 +78,6 @@ export declare abstract class TagUtil extends TagCache {
     protected getPositions(tag: TagInstance): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
     protected addObjectClickHandler(tag: TagInstance, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
     protected getTagNormal(tag: TagInstance): THREE.Vector3 | undefined;
-    protected get filterPointTag(): PointTagInstance[];
-    protected get filter2DPointTag(): TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "2DPoint">[];
-    protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
-    protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
-    protected get filterCSS3DTag(): (TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
     protected getTransformedPostion(position: Tag['position']): THREE.Vector3 | [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3];
     /**
      * @description 检查是否已经销毁