npm - @realsee/dnalogel - Versions diffs - 2.18.5 → 2.19.0-1 - Mend

@realsee/dnalogel 2.18.5 → 2.19.0-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (325) hide show

package/docs/variables/modelRoomLabelPluginServerParams.html CHANGED Viewed

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html class="default" lang="en"><head><meta charSet="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>modelRoomLabelPluginServerParams | 如视看房插件合集 - v2.18.5</title><meta name="description" content="Documentation for 如视看房插件合集"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><script defer src="../assets/main.js"></script><script async src="../assets/search.js" id="tsd-search-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os"</script><header class="tsd-page-toolbar">
+<!DOCTYPE html><html class="default" lang="en"><head><meta charSet="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>modelRoomLabelPluginServerParams | 如视看房插件合集 - v2.19.0-1</title><meta name="description" content="Documentation for 如视看房插件合集"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><script defer src="../assets/main.js"></script><script async src="../assets/search.js" id="tsd-search-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os"</script><header class="tsd-page-toolbar">
 <div class="tsd-toolbar-contents container">
 <div class="table-cell" id="tsd-search" data-base="..">
 <div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><path d="M15.7824 13.833L12.6666 10.7177C12.5259 10.5771 12.3353 10.499 12.1353 10.499H11.6259C12.4884 9.39596 13.001 8.00859 13.001 6.49937C13.001 2.90909 10.0914 0 6.50048 0C2.90959 0 0 2.90909 0 6.49937C0 10.0896 2.90959 12.9987 6.50048 12.9987C8.00996 12.9987 9.39756 12.4863 10.5008 11.6239V12.1332C10.5008 12.3332 10.5789 12.5238 10.7195 12.6644L13.8354 15.7797C14.1292 16.0734 14.6042 16.0734 14.8948 15.7797L15.7793 14.8954C16.0731 14.6017 16.0731 14.1267 15.7824 13.833ZM6.50048 10.499C4.29094 10.499 2.50018 8.71165 2.50018 6.49937C2.50018 4.29021 4.28781 2.49976 6.50048 2.49976C8.71001 2.49976 10.5008 4.28708 10.5008 6.49937C10.5008 8.70852 8.71314 10.499 6.50048 10.499Z" fill="var(--color-text)"></path></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div>
@@ -6,7 +6,7 @@
 <div id="tsd-toolbar-links"></div></div>
 <ul class="results">
 <li class="state loading">Preparing search index...</li>
-<li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">如视看房插件合集 - v2.18.5</a></div>
+<li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">如视看房插件合集 - v2.19.0-1</a></div>
 <div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><rect x="1" y="3" width="14" height="2" fill="var(--color-text)"></rect><rect x="1" y="7" width="14" height="2" fill="var(--color-text)"></rect><rect x="1" y="11" width="14" height="2" fill="var(--color-text)"></rect></svg></a></div></div></header>
 <div class="container container-main">
 <div class="col-content">
@@ -24,7 +24,7 @@
 <li class="tsd-parameter">
 <h5><span class="tsd-kind-property">version</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">number</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/realsee-developer/dnalogel/blob/4d0829b/plugins/src/ModelRoomLabelPlugin/index.ts#L9">plugins/src/ModelRoomLabelPlugin/index.ts:9</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/realsee-developer/dnalogel/blob/b542819/plugins/src/ModelRoomLabelPlugin/index.ts#L9">plugins/src/ModelRoomLabelPlugin/index.ts:9</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">
@@ -38,7 +38,7 @@
 <div class="tsd-theme-toggle">
 <h4 class="uppercase">Theme</h4><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div>
 <div class="site-menu">
-<nav class="tsd-navigation"><a href="../modules.html"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><rect fill="var(--color-icon-background)" stroke="var(--color-ts-namespace)" stroke-width="1.5" x="1" y="1" width="22" height="22" rx="6" id="icon-4-path"></rect><path d="M9.33 16V7.24H10.77L13.446 14.74C13.43 14.54 13.41 14.296 13.386 14.008C13.37 13.712 13.354 13.404 13.338 13.084C13.33 12.756 13.326 12.448 13.326 12.16V7.24H14.37V16H12.93L10.266 8.5C10.282 8.692 10.298 8.936 10.314 9.232C10.33 9.52 10.342 9.828 10.35 10.156C10.366 10.476 10.374 10.784 10.374 11.08V16H9.33Z" fill="var(--color-text)" id="icon-4-text"></path></svg><span>如视看房插件合集 -<wbr/> v2.18.5</span></a>
+<nav class="tsd-navigation"><a href="../modules.html"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><rect fill="var(--color-icon-background)" stroke="var(--color-ts-namespace)" stroke-width="1.5" x="1" y="1" width="22" height="22" rx="6" id="icon-4-path"></rect><path d="M9.33 16V7.24H10.77L13.446 14.74C13.43 14.54 13.41 14.296 13.386 14.008C13.37 13.712 13.354 13.404 13.338 13.084C13.33 12.756 13.326 12.448 13.326 12.16V7.24H14.37V16H12.93L10.266 8.5C10.282 8.692 10.298 8.936 10.314 9.232C10.33 9.52 10.342 9.828 10.35 10.156C10.366 10.476 10.374 10.784 10.374 11.08V16H9.33Z" fill="var(--color-text)" id="icon-4-text"></path></svg><span>如视看房插件合集 -<wbr/> v2.19.0-<wbr/>1</span></a>
 <ul class="tsd-small-nested-navigation">
 <li>
 <details class="tsd-index-accordion" data-key="CruisePluginTypes"><summary class="tsd-accordion-summary"><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><path d="M4.93896 8.531L12 15.591L19.061 8.531L16.939 6.409L12 11.349L7.06098 6.409L4.93896 8.531Z" fill="var(--color-text)"></path></svg><a href="../modules/CruisePluginTypes.html"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4-path"></use><use href="#icon-4-text"></use></svg><span>Cruise<wbr/>Plugin<wbr/>Types</span></a></summary>

package/libs/PanoMeasurePlugin/Controller/MixedController.d.ts CHANGED Viewed

@@ -17,10 +17,7 @@ export default class MixedController extends BaseController {
     dispose(): void;
     highlightLine(line: Line): void;
     clearHighlightLines(): void;
-    getEditingLines(): Line[];
-    addStartPoint(): void;
-    /** 编辑线条发生改变时通知外部 */
-    private onLineChanged;
+    getEditingLines(): Polyline[];
     private onWantsTapGesture;
     /** 编辑时取消走点,watch时可以走 */
     private onWantsToMoveToPano;

package/libs/PanoMeasurePlugin/Controller/MixedController.js CHANGED Viewed

@@ -1,16 +1,16 @@
-var b = Object.defineProperty;
-var k = (h, s, e) => s in h ? b(h, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[s] = e;
-var t = (h, s, e) => (k(h, typeof s != "symbol" ? s + "" : s, e), e);
-import { Model as S } from "../Model/index.js";
-import y from "../Model/line.js";
-import D from "./BaseController.js";
-import T from "../Modules/DeleteDom/index.js";
-import { findAssociatedLines as M } from "../utils/findAssociatedLines.js";
+var S = Object.defineProperty;
+var k = (h, n, e) => n in h ? S(h, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[n] = e;
+var t = (h, n, e) => (k(h, typeof n != "symbol" ? n + "" : n, e), e);
+import { Model as D } from "../Model/index.js";
+import T from "../Model/line.js";
+import y from "./BaseController.js";
+import M from "../Modules/DeleteDom/index.js";
+import { findAssociatedLines as G } from "../utils/findAssociatedLines.js";
 import { Vector2 as p } from "three";
-import C from "../utils/isNDCPointInScreen.js";
-import { closestPointOnLine as G } from "../utils/math.js";
-import { Polyline as N } from "../Model/polyline.js";
-import R from "../Modules/rangePiece/index.js";
+import L from "../utils/isNDCPointInScreen.js";
+import { closestPointOnLine as N } from "../utils/math.js";
+import { Polyline as v } from "../Model/polyline.js";
+import W from "../Modules/rangePiece/index.js";
 import "@realsee/five";
 import "../../shared-utils/uuid.js";
 import "../utils/line.js";
@@ -29,7 +29,7 @@ import "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/noop.js";
 import "../utils/calculateThreeMouse.js";
 import "../utils/mouseGroup.js";
-class re extends D {
+class re extends y {
   constructor(e) {
     super(e);
     t(this, "state", "watching");
@@ -41,32 +41,28 @@ class re extends D {
     t(this, "deleteDom");
     t(this, "rangePieceController");
     t(this, "disposers", []);
-    /** 编辑线条发生改变时通知外部 */
-    t(this, "onLineChanged", () => {
-      this.hook.emit("editedPolylineChange", this.polyline);
-    });
     t(this, "onWantsTapGesture", (e) => {
       if (this.state === "editing")
         return !1;
       const [i] = this.five.model.intersectRaycaster(e);
       if (!i)
         return;
-      const o = this.five.camera, m = i.point.clone().project(o), r = this.container.clientWidth, d = this.container.clientHeight, f = new p(m.x * r, m.y * d), g = this.polyline.lines.map((n) => {
-        const [a, L] = n.points, l = a.position.clone().project(o), c = L.position.clone().project(o);
-        if (!C(l) && !C(c))
+      const o = this.five.camera, a = i.point.clone().project(o), d = this.container.clientWidth, l = this.container.clientHeight, f = new p(a.x * d, a.y * l), g = this.model.getAllLines().map((s) => {
+        const [r, C] = s.points, c = r.position.clone().project(o), m = C.position.clone().project(o);
+        if (!L(c) && !L(m))
           return null;
-        const v = new p(l.x * r, l.y * d), w = new p(c.x * r, c.y * d);
-        return { id: n.id, points: [v, w] };
-      }).filter((n) => !!n);
+        const w = new p(c.x * d, c.y * l), b = new p(m.x * d, m.y * l);
+        return { id: s.id, points: [w, b] };
+      }).filter((s) => !!s);
       if (g.length === 0)
         return;
-      const u = g.map((n) => {
-        const a = G(f, n.points);
-        return { id: n.id, distance: a.distanceTo(f) };
-      }).sort((n, a) => n.distance - a.distance)[0];
+      const u = g.map((s) => {
+        const r = N(f, s.points);
+        return { id: s.id, distance: r.distanceTo(f) };
+      }).sort((s, r) => s.distance - r.distance)[0];
       if (u.distance > 20)
         return;
-      const P = this.polyline.lines.find(({ id: n }) => n === u.id);
+      const P = this.model.getAllLines().find(({ id: s }) => s === u.id);
       if (P)
         return this.chooseLine(P), !1;
     });
@@ -90,8 +86,8 @@ class re extends D {
     t(this, "onGetEndPoint", (e) => {
       const i = this.mobileNowPoint;
       if (this.removeLine(this.dashed), this.hasAppendDashed = !1, this.mobileStartPoint && i) {
-        const o = new y(this.mobileStartPoint, i, this.model);
-        o.distanceItem.appendTo(this.container), o.distanceItem.update(this.five), o.hook.on("selected", this.chooseLine), this.disposers.push(() => o.hook.off("selected", this.chooseLine)), this.group.add(o.mesh), this.polyline.addLine(o);
+        const o = new T(this.mobileStartPoint, i, this.model), a = new v({ model: this.model });
+        a.addLine(o), o.distanceItem.appendTo(this.container), o.distanceItem.update(this.five), o.hook.on("selected", this.chooseLine), this.disposers.push(() => o.hook.off("selected", this.chooseLine)), this.group.add(o.mesh), this.model.addPolyline(a);
       }
       this.mobileStartPoint = null, this.mobileNowPoint = null, this.five.needsRender = !0;
     });
@@ -106,7 +102,7 @@ class re extends D {
       this.state = i, this.state === "watching" ? this.five.helperVisible = !0 : this.five.helperVisible = !1;
     });
     t(this, "chooseLine", (e) => {
-      const i = M(e);
+      const i = G(e);
       this.highlightLines(i), this.five.needsRender = !0, this.hook.emit(
         "selectedChange",
         i.map((o) => o)
@@ -114,33 +110,33 @@ class re extends D {
     });
     t(this, "deleteDomClickCallback", () => {
       this.highlightedLines.forEach((e) => {
-        this.removeLine(e), this.polyline.removeLine(e);
+        this.removeLine(e);
+        const i = this.model.getPolylineByLine(e);
+        this.model.removePolyline(i);
       }), this.highlightedLines = [], this.deleteDom.setLines([]).hide();
     });
     t(this, "cancelDeleteClickCallback", () => {
       this.clearHighlightLines();
     });
-    this.model = new S(this.config), this.polyline = new N({ model: this.model }), this.model.addPolyline(this.polyline), this.rangePieceController = new R(e), this.deleteDom = new T(this.five, {
+    this.model = new D(this.config), this.polyline = new v({ model: this.model }), this.rangePieceController = new W(e), this.deleteDom = new M(this.five, {
       i18n: this.config.i18n,
       onClick: this.deleteDomClickCallback,
       cancelDelete: this.cancelDeleteClickCallback
-    }).appendTo(this.container), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.onWantsTapGesture), this.five.on("wantsToMoveToPano", this.onWantsToMoveToPano), this.polyline.hook.on("lineAdded", this.onLineChanged), this.polyline.hook.on("lineRemoved", this.onLineChanged), this.five.helperVisible = !1, this.hook.emit("editedDashedLineChange", null), this.hook.on("getStartPoint", this.onGetStartPoint), this.hook.on("getEndPoint", this.onGetEndPoint), this.hook.on("nowPointChange", this.onNowPointChange), this.hook.on("willChangeState", this.onWillChangeState), this.five.refresh();
+    }).appendTo(this.container), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("wantsTapGesture", this.onWantsTapGesture), this.five.on("wantsToMoveToPano", this.onWantsToMoveToPano), this.five.helperVisible = !1, this.hook.emit("editedDashedLineChange", null), this.hook.on("getStartPoint", this.onGetStartPoint), this.hook.on("getEndPoint", this.onGetEndPoint), this.hook.on("nowPointChange", this.onNowPointChange), this.hook.on("willChangeState", this.onWillChangeState), this.five.refresh();
   }
   dispose() {
-    super.dispose(), this.disposers.forEach((e) => e()), this.five.helperVisible = !0, this.rangePieceController.dispose(), this.group.remove(this.mouseGroup, this.dashed.mesh), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.polyline.hook.off("lineAdded", this.onLineChanged), this.polyline.hook.off("lineRemoved", this.onLineChanged), this.hook.off("getStartPoint", this.onGetStartPoint), this.hook.off("getEndPoint", this.onGetEndPoint), this.hook.off("nowPointChange", this.onNowPointChange), this.hook.off("willChangeState", this.onWillChangeState), this.hook.emit("selectedChange", []), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
+    super.dispose(), this.disposers.forEach((e) => e()), this.five.helperVisible = !0, this.rangePieceController.dispose(), this.group.remove(this.mouseGroup, this.dashed.mesh), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("wantsTapGesture", this.onWantsTapGesture), this.five.off("wantsToMoveToPano", this.onWantsToMoveToPano), this.hook.off("getStartPoint", this.onGetStartPoint), this.hook.off("getEndPoint", this.onGetEndPoint), this.hook.off("nowPointChange", this.onNowPointChange), this.hook.off("willChangeState", this.onWillChangeState), this.hook.emit("selectedChange", []), this.dashed.distanceItem.remove(), this.five.needsRender = !0;
   }
   highlightLine(e) {
     e.selected || (e.selected = !0, this.group.add(e.lightMesh), e.distanceItem.highlight(), this.five.needsRender = !0);
   }
   clearHighlightLines() {
-    this.group.children.length !== 0 && (this.deleteDom.setLines([]).hide(), this.polyline.lines.forEach((e) => {
+    this.group.children.length !== 0 && (this.deleteDom.setLines([]).hide(), this.model.getAllLines().forEach((e) => {
       e.selected = !1, e.distanceItem.unHighlight(), this.group.remove(e.lightMesh);
     }), this.highlightedLines = [], this.five.needsRender = !0);
   }
   getEditingLines() {
-    return this.polyline.lines;
-  }
-  addStartPoint() {
+    return this.model.polylines;
   }
   highlightLines(e) {
     this.clearHighlightLines(), this.highlightedLines = e, this.deleteDom.setLines(e).updatePosition().show(), e.forEach((i) => this.highlightLine(i));

package/libs/PanoTagPlugin/controller/TagComputer.js CHANGED Viewed

@@ -2,17 +2,17 @@ var M = Object.defineProperty, U = Object.defineProperties;
 var R = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
 var B = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
-var y = (c, l, e) => l in c ? M(c, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[l] = e, x = (c, l) => {
+var g = (c, l, e) => l in c ? M(c, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[l] = e, x = (c, l) => {
   for (var e in l || (l = {}))
-    B.call(l, e) && y(c, e, l[e]);
+    B.call(l, e) && g(c, e, l[e]);
   if (P)
     for (var e of P(l))
-      C.call(l, e) && y(c, e, l[e]);
+      C.call(l, e) && g(c, e, l[e]);
   return c;
 }, I = (c, l) => U(c, R(l));
-var T = (c, l, e) => (y(c, typeof l != "symbol" ? l + "" : l, e), e);
+var T = (c, l, e) => (g(c, typeof l != "symbol" ? l + "" : l, e), e);
 import * as D from "three";
-import { isMediaModelTag as g, is3DTag as j } from "../utils/tag/tagCheck.js";
+import { is3DTag as j, isMediaModelTag as y } from "../utils/tag/tagCheck.js";
 import { tagPosition as V, getTagPosition as k } from "../utils/tagPosition.js";
 import { checkRange as h } from "../utils/checkRange.js";
 import "hammerjs";
@@ -65,7 +65,7 @@ class Ue extends $ {
    */
   getVisibleByPanoIndex(e, t) {
     const s = this.getCache({ panoIndex: t, id: e.id }), n = t != null ? t : this.five.getCurrentState().panoIndex;
-    if (g(e))
+    if (e.stickType === "Model")
       return !0;
     if (s.visible !== void 0)
       return s.visible;
@@ -270,7 +270,7 @@ class Ue extends $ {
     const e = this.five.getCurrentState().mode;
     this.tags.forEach((t) => {
       var n;
-      if (!g(t))
+      if (!y(t))
         return;
       if (!((n = t.model) != null && n.object)) {
         t.mediaVisible = !1;
@@ -306,9 +306,9 @@ class Ue extends $ {
   getTagEnableByIntersect(e, t) {
     var u, v, r;
     const s = (u = this.getTagConfig(e).visibleConfig) != null ? u : {}, n = this.getDistance(e), [i] = this.five.model.intersectRaycaster(t), o = (() => {
-      if (!g(e))
+      if (!y(e))
         return;
-      const a = this.tags.filter(g).map((b) => {
+      const a = this.tags.filter(y).map((b) => {
         var m;
         return (m = b.model) == null ? void 0 : m.object;
       }).filter(S);

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

@@ -55,5 +55,5 @@ export declare abstract class TagRender extends TagComputer {
      */
     protected clearUnusedPanelTag(): void;
     /** 加载外部模型 */
-    protected loadModel: (tag: TagElement<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
+    protected loadModel: (tag: TagElement<'Model', 'Model'> | TagElement<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
 }

package/libs/PanoTagPlugin/controller/TagRender.js CHANGED Viewed

@@ -1,32 +1,32 @@
-var w = Object.defineProperty;
-var O = (c, l, t) => l in c ? w(c, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[l] = t;
-var u = (c, l, t) => (O(c, typeof l != "symbol" ? l + "" : l, t), t);
-var T = (c, l, t) => new Promise((e, i) => {
-  var o = (s) => {
+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) => {
     try {
-      a(t.next(s));
-    } catch (r) {
-      i(r);
+      a(t.next(r));
+    } catch (s) {
+      i(s);
     }
-  }, n = (s) => {
+  }, n = (r) => {
     try {
-      a(t.throw(s));
-    } catch (r) {
-      i(r);
+      a(t.throw(r));
+    } catch (s) {
+      i(s);
     }
-  }, a = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(o, n);
-  a((t = t.apply(c, l)).next());
+  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(o, n);
+  a((t = t.apply(f, h)).next());
 });
-import { TagComputer as k } from "./TagComputer.js";
-import { Group as b, Quaternion as x, Vector3 as P, Matrix4 as D } from "three";
-import E from "../Components/TagContainer.js";
-import G from "../Components/Tag/index.js";
-import { arrayPositionToVector3 as v } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { centerPoint as I } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as S } from "../utils/tag/tagCheck.js";
+import { TagComputer as E } from "./TagComputer.js";
+import { Group as v, Quaternion as O, Vector3 as T, Matrix4 as D } 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 { centerPoint as G } from "../../shared-utils/three/centerPoint.js";
+import { isMediaModelTag as C, isStickModelTag as I } from "../utils/tag/tagCheck.js";
 import { CSS3DRenderPlugin as V } from "../../CSS3DRenderPlugin/index.js";
-import { loadGLTF as A } from "../../shared-utils/three/GLTFLoader.js";
-import { VideoPlane as j, ImagePlane as R } from "../utils/model/mediaPlane.js";
+import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
+import { VideoPlane as R, ImagePlane as j } from "../utils/model/mediaPlane.js";
 import "../utils/tagPosition.js";
 import "../utils/checkRange.js";
 import "hammerjs";
@@ -139,43 +139,47 @@ import "../Components/Tag/CustomTag.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
-const F = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class ei extends k {
+const L = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
+class ti extends E {
   constructor(t) {
     super(t);
-    u(this, "group", new b());
-    u(this, "imagePlaneGroup", new b());
-    u(this, "gltfObjectGroup", new b());
+    g(this, "group", new v());
+    g(this, "imagePlaneGroup", new v());
+    g(this, "gltfObjectGroup", new v());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
-    u(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    g(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     /** 临时状态 */
-    u(this, "temporaryState", { visible: !0 });
+    g(this, "temporaryState", { visible: !0 });
     /** 点标签 */
-    u(this, "TagContainerSvelte");
+    g(this, "TagContainerSvelte");
     /** 加载外部模型 */
-    u(this, "loadModel", (t) => T(this, null, function* () {
-      var s;
+    g(this, "loadModel", (t) => P(this, null, function* () {
+      var a;
       const e = t.data.modelUrl;
       if (!e)
         return;
-      const i = A(e).then((r) => Object.assign(r.scene, { customID: t.id, isTagModel: !0 }));
+      const i = 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;
+      });
       t.model = { promise: i };
       const o = yield i;
-      if (((s = t.model) == null ? void 0 : s.promise) !== i || (t.model.object = o, !this.tags.includes(t)))
+      if (((a = t.model) == null ? void 0 : a.promise) !== i || !this.tags.includes(t))
         return;
-      o.visible = this.getCurrentVisibleState(t), new D().fromArray(t.matrix).decompose(o.position, o.quaternion, o.scale), o.updateWorldMatrix(!0, !0), o.visible = this.getVisibleByFiveMode(t);
-      const a = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
-      if (a && this.gltfObjectGroup.remove(a), this.getRenderType(t) === "Mesh") {
-        if (!t.mediaPlane) {
-          const r = t.data.mediaPosition.map(v);
-          t.mediaPlane = new R(t.data.mediaData[0].url, t.data.mediaPosition.map(v), {
+      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)) {
+        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), {
             objectFit: t.data.objectFit
           });
-          const m = new P().addVectors(r[0], r[2]).divideScalar(2);
-          t.mediaPlane.position.copy(m), o.add(t.mediaPlane);
+          const s = new T().addVectors(r[0], r[2]).divideScalar(2);
+          t.mediaPlane.position.copy(s), o.add(t.mediaPlane);
         }
-      } else
-        o.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, o), o.updateTagCss3DObjectMatrix();
+        this.getRenderType(t) !== "Mesh" && (o.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, o), o.updateTagCss3DObjectMatrix());
+      }
       return this.gltfObjectGroup.add(o), o;
     }));
     this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.imagePlaneGroup.name = "ImagePlaneGroup", this.group.add(this.gltfObjectGroup), this.group.add(this.imagePlaneGroup);
@@ -197,32 +201,32 @@ class ei extends k {
    */
   updateRenderImagePlane() {
     this.sort(this.filterImagePlane).forEach((e) => {
-      var s, r, m, f, g;
+      var r, s, l, m, u;
       const i = e.data.mediaData[0];
       if (!i)
         return;
       const { url: o, type: n } = i;
-      if (!o || (e.mediaPlane && (e.mediaPlane.visible = (r = (s = e.state) == null ? void 0 : s.visible) != null ? r : !0, e.mediaPlane.visible || e.mediaPlane instanceof j && ((m = e.data.autoplayConfig) != null && m.autoplayVideo || e.mediaPlane.pause())), ((f = e.mediaPlane) == null ? void 0 : f.src) === o))
+      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))
         return;
-      const a = e.position.map(v);
+      const a = e.position.map(S);
       if (e.mediaPlane && e.mediaPlane.removeFromParent(), n === "Image")
-        e.mediaPlane = new R(o, a, { objectFit: e.data.objectFit }), this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (p) => {
+        e.mediaPlane = new j(o, a, { 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 j(o, a, {
+        const p = new R(o, a, {
           videoCoverSrc: i.videoCoverUrl,
           playButton: e.data.playIcon,
-          paused: !((g = e.data.autoplayConfig) != null && g.autoplayVideo),
+          paused: !((u = e.data.autoplayConfig) != null && u.autoplayVideo),
           objectFit: e.data.objectFit,
-          videoTextureMap: F,
+          videoTextureMap: L,
           ImageTextureMap: B
         });
-        p.onVideoReady = (d) => {
-          d.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: p.videoInstance }));
+        p.onVideoReady = (c) => {
+          c.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: p.videoInstance }));
         }, p.initialDomEvents(this.domEvents);
-        const h = (d) => (this.five.on("renderFrame", d), () => this.five.off("renderFrame", d));
-        p.initialRenderHooks(h), e.mediaPlane = p;
+        const d = (c) => (this.five.on("renderFrame", c), () => this.five.off("renderFrame", c));
+        p.initialRenderHooks(d), e.mediaPlane = p;
       }
       this.imagePlaneGroup.add(e.mediaPlane);
     });
@@ -232,44 +236,44 @@ class ei extends k {
    */
   updateRender3DDomTag() {
     this.sort([...this.filterCSS3DTag]).forEach((e) => {
-      var i, o;
+      var i, o, n;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: n, css3DInstance: a, initialNormal: s, currentNormal: r } = e.tag3DContentSvelte;
-        if (n.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !s.equals(r)) {
-          const m = new x().setFromUnitVectors(s, r);
-          a.css3DObject.setRotationFromQuaternion(m);
+        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 m = new O().setFromUnitVectors(s, l);
+          r.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
-        if (((i = e.state) == null ? void 0 : i.visible) === !1)
+        if (C(e) && !((i = e.model) != null && i.object) || ((o = e.state) == null ? void 0 : o.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 n = this.getPositions(e);
-        if (!n)
-          return;
-        const a = this.getTagNormal(e);
+        const a = this.getPositions(e);
         if (!a)
           return;
-        const r = (o = this.getTagConfig(e).tag3DConfig) != null ? o : {};
+        const r = this.getTagNormal(e);
+        if (!r)
+          return;
+        const l = (n = this.getTagConfig(e).tag3DConfig) != null ? n : {};
         if (this.getRenderType(e) === "BehindDom") {
-          r.mode = "behind", r.container = document.createElement("div");
-          const g = "black";
-          r.container.style.backgroundColor = g, r.container.style.border = `3px solid ${g}`, this.css3DRenderPlugin.hooks.on("render", () => {
-            var p;
+          l.mode = "behind", l.container = document.createElement("div");
+          const p = "black";
+          l.container.style.backgroundColor = p, l.container.style.border = `3px solid ${p}`, this.css3DRenderPlugin.hooks.on("render", () => {
+            var d;
             if (m.css3DObject.opacityMesh) {
-              const h = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (d) => {
-                this.hooks.emit("click", { event: d, target: "TagContent", tag: e });
+              const c = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (b) => {
+                this.hooks.emit("click", { event: b, target: "TagContent", tag: e });
               });
-              (p = this.store.css3DRenderDisposer.get(e.id)) == null || p.push(h);
+              (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(c);
             }
           });
         }
-        const m = this.css3DRenderPlugin.create3DDomContainer(n, r);
+        const m = this.css3DRenderPlugin.create3DDomContainer(a, l);
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
-        const f = new G({
+        const u = new A({
           target: m.container,
           props: {
             tag: e,
@@ -281,13 +285,13 @@ class ei extends k {
           }
         });
         e.tag3DContentSvelte = {
-          svelteApp: f,
+          svelteApp: u,
           domContainer: m,
           css3DInstance: m,
-          initialNormal: a,
-          currentNormal: a,
+          initialNormal: r,
+          currentNormal: r,
           dispose: () => {
-            f.$destroy(), m.dispose();
+            u.$destroy(), m.dispose();
           }
         };
       }
@@ -302,7 +306,7 @@ class ei extends k {
    */
   updateRenderModelTag() {
     const t = (i) => !this.enabledModelTagSet.has(i.customID);
-    this.gltfObjectGroup.remove(...this.gltfObjectGroup.children.filter(t)), this.tags.filter(S).forEach((i) => {
+    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) => {
         n.visible = this.getCurrentVisibleState(i);
@@ -320,21 +324,21 @@ class ei extends k {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var d, C, y, M;
-    const i = (y = (C = (d = t.mergedConfig) == null ? void 0 : d.tag3DConfig) == null ? void 0 : C.ratio) != null ? y : 216e-5, o = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
+    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)
       return;
-    const n = S(t) ? t.data.mediaPosition : t.position;
+    const n = C(t) ? t.data.mediaPosition : t.position;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, s = new P().fromArray(n[0]), r = new P().fromArray(n[2]), m = I(s, r).add(new P(0, 0, 5e-4)), f = new D().setPosition(m), g = new D().makeScale(i, i, i), p = new D().multiply(a).multiply(f).multiply(g);
+    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 h = o.opacityMesh;
-    h && p.decompose(h.position, h.quaternion, h.scale);
+    const d = o.opacityMesh;
+    d && p.decompose(d.position, d.quaternion, d.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
-    return T(this, null, function* () {
-      const e = t.filter(S).map((i) => this.loadModel(i));
+    return P(this, null, function* () {
+      const e = t.filter(I).map((i) => this.loadModel(i));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
@@ -350,7 +354,7 @@ class ei extends k {
       const i = (e = this.five.getElement()) == null ? void 0 : e.parentElement;
       if (!i)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new E({
+      this.TagContainerSvelte = new x({
         target: i,
         props: { hooks: this.hooks, tags: t, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });
@@ -363,8 +367,8 @@ class ei extends k {
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
     }), this.filterCSS3DTag.forEach((e) => {
-      var i, o, n, a, s;
-      (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), (s = e.tag3DContentSvelte) == null || s.svelteApp.$set({
+      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({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation
@@ -391,5 +395,5 @@ class ei extends k {
   }
 }
 export {
-  ei as TagRender
+  ti as TagRender
 };

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

@@ -32,7 +32,7 @@ export declare abstract class TagUtil extends TagCache {
      * @description: 获取merge后的配置
      * TODO: 缓存
      */
-    getTagConfig(tag: Tag<any, any>): TagConfig<"Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", StickType>;
+    getTagConfig(tag: Tag<any, any>): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", StickType>;
     protected loadVideoFirstFrame(): void;
     protected updateTagConfig(params?: {
         force?: boolean;