@realsee/dnalogel 3.72.5-alpha.4 → 3.72.5-alpha.5

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

@@ -1,22 +1,22 @@
 var Q = Object.defineProperty, Y = Object.defineProperties;
 var ee = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
+var R = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
 var T = Math.pow, V = (m, i, e) => i in m ? Q(m, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[i] = e, y = (m, i) => {
   for (var e in i || (i = {}))
-    E.call(i, e) && V(m, e, i[e]);
+    R.call(i, e) && V(m, e, i[e]);
   if (w)
     for (var e of w(i))
-      O.call(i, e) && V(m, e, i[e]);
+      E.call(i, e) && V(m, e, i[e]);
   return m;
 }, S = (m, i) => Y(m, ee(i));
-var R = (m, i) => {
+var O = (m, i) => {
   var e = {};
   for (var t in m)
-    E.call(m, t) && i.indexOf(t) < 0 && (e[t] = m[t]);
+    R.call(m, t) && i.indexOf(t) < 0 && (e[t] = m[t]);
   if (m != null && w)
     for (var t of w(m))
-      i.indexOf(t) < 0 && O.call(m, t) && (e[t] = m[t]);
+      i.indexOf(t) < 0 && E.call(m, t) && (e[t] = m[t]);
   return e;
 };
 var a = (m, i, e) => (V(m, typeof i != "symbol" ? i + "" : i, e), e);
@@ -406,7 +406,7 @@ class Wi {
     this.cache.clear();
   }
   updateVisible() {
-    this.enabled ? (this.state.visible = this.getVisible(), this.applyVisible()) : this.applyVisible(), this._updating = !1;
+    this.enabled ? (this.state.visible = this.getVisible(), this.applyVisible()) : this.applyVisible(), this.five.needsRender = !0, this._updating = !1;
   }
   updateZIndex() {
     const i = this.getSquaredDistance();
@@ -512,7 +512,7 @@ class Wi {
         if ((u == null ? void 0 : u.value) === !1)
           return u;
         if (n.followModelVisibility === !0 && ["poincare", "aerophoto", "sand"].includes(this.workUtil.fromType) && (o === "Floorplan" || o === "Mapview")) {
-          const p = this.computeVisibleByFloorIndex(), { value: v } = p, b = R(p, ["value"]);
+          const p = this.computeVisibleByFloorIndex(), { value: v } = p, b = O(p, ["value"]);
           if (v === !1)
             return y({ value: !1, checkedList: s, reason: "followModelVisibility check failed" }, b);
         }

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

@@ -1,11 +1,11 @@
-var w = Object.defineProperty;
-var E = (m, l, t) => l in m ? w(m, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[l] = t;
-var c = (m, l, t) => (E(m, typeof l != "symbol" ? l + "" : l, t), t);
-import { BaseTag as k } from "./BaseTag.js";
-import * as n from "three";
-import { Line as I } from "@realsee/five/line";
-import { anyPositionToVector3 as M } from "../../../shared-utils/positionToVector3.js";
-import { transformPosition as R } from "../../../shared-utils/five/transformPosition.js";
+var I = Object.defineProperty;
+var M = (p, h, t) => h in p ? I(p, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : p[h] = t;
+var c = (p, h, t) => (M(p, typeof h != "symbol" ? h + "" : h, t), t);
+import { BaseTag as U } from "./BaseTag.js";
+import * as r from "three";
+import { Line as R } from "@realsee/five/line";
+import { anyPositionToVector3 as g } from "../../../shared-utils/positionToVector3.js";
+import { transformPosition as P } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -87,10 +87,10 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-const g = new n.Vector2();
-class gi extends k {
+const _ = new r.Vector2();
+class Pi extends U {
   constructor(t, e) {
-    var o, i, r, s, h;
+    var o, i, n, s, a;
     super(t, e);
     c(this, "__Object__");
     c(this, "requestIdleCallbackId");
@@ -98,19 +98,19 @@ class gi extends k {
     c(this, "iconPixelGap", 10);
     // 优化：重用临时对象，避免频繁创建
     c(this, "_temp", {
-      lineStart: new n.Vector3(),
+      lineStart: new r.Vector3(),
       // 线条起点（project后会变成NDC）
-      iconPos: new n.Vector3(),
+      iconPos: new r.Vector3(),
       // icon位置（project后会变成NDC）
-      screenDirPixel: new n.Vector2(),
+      screenDirPixel: new r.Vector2(),
       // 屏幕方向（normalize后会变成单位向量）
-      targetNDC: new n.Vector2(),
+      targetNDC: new r.Vector2(),
       // 目标NDC坐标
-      lineDir: new n.Vector3(),
+      lineDir: new r.Vector3(),
       // 线条方向（计算w0时重用）
-      lineEnd: new n.Vector3(),
+      lineEnd: new r.Vector3(),
       // 线条终点
-      raycaster: new n.Raycaster()
+      raycaster: new r.Raycaster()
       // 射线投射器
     });
     // 用于变化检测的缓存值
@@ -122,20 +122,20 @@ class gi extends k {
       visible: !1
     });
     if ((i = (o = e.style) == null ? void 0 : o.point) != null && i.width) {
-      const p = (h = (s = (r = e.style) == null ? void 0 : r.point) == null ? void 0 : s.scale) != null ? h : 1;
-      this.iconPixelGap = e.style.point.width * p * 1.4 / 2 + 2;
+      const d = (a = (s = (n = e.style) == null ? void 0 : n.point) == null ? void 0 : s.scale) != null ? a : 1;
+      this.iconPixelGap = e.style.point.width * d * 1.4 / 2 + 2;
     }
     e.contentType === "Audio" && (this.iconPixelGap = 34 / 2 + 2), this.initialTagLine();
   }
   initialTagLine() {
-    var i, r, s;
+    var n, s, a;
     const t = this.config;
-    if (!((i = t == null ? void 0 : t.tagNormalLineConfig) != null && i.enabled) || !this.normalLineLength)
+    if (!this.five.renderer || !((n = t == null ? void 0 : t.tagNormalLineConfig) != null && n.enabled) || !this.normalLineLength)
       return;
-    const e = this.five.renderer.getSize(g), o = this.five.renderer.getPixelRatio();
-    this.tagNormalLine = new I(new n.Vector3().fromArray(this.position), new n.Vector3().fromArray(this.originPosition)), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
-      color: new n.Vector3(1, 1, 1),
-      linewidth: (s = (r = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : r.lineWidth) != null ? s : 1.2,
+    const e = this.five.renderer.getSize(_), o = this.five.renderer.getPixelRatio(), i = P(g(this.originPosition), this.plugin.workUtil.transform);
+    this.tagNormalLine = new R(new r.Vector3().fromArray(this.position), i), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
+      color: new r.Vector3(1, 1, 1),
+      linewidth: (a = (s = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : s.lineWidth) != null ? a : 1.2,
       dashed: !1
     }), this.tagNormalLine.line.material.transparent = !0, this.tagNormalLine.line.material.depthWrite = !1, this.tagNormalLine.line.material.depthTest = !0, this.tagNormalLine.line.material.dashed = !1, this.tagNormalLine.line.renderOrder = 2, this.tagNormalLine.setResolution(e.width * o, e.height * o), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
   }
@@ -179,10 +179,10 @@ class gi extends k {
   setPosition(t) {
     this.originPosition = t, this.position = (() => {
       const e = this.plugin.workUtil.transform;
-      let o = R(M(t), e).toArray();
+      let o = P(g(t), e).toArray();
       if (this.normal && this.normalLineLength) {
         const i = this.computeNormal();
-        o = new n.Vector3().fromArray(o).clone().add(i.clone().setLength(this.normalLineLength)).toArray();
+        o = new r.Vector3().fromArray(o).clone().add(i.clone().setLength(this.normalLineLength)).toArray();
       }
       return o;
     })(), this.cache.clear(), this._lastUpdateCache.position = [0, 0, 0], this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -192,7 +192,7 @@ class gi extends k {
    * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
    */
   updateTagNormalLinePosition(t) {
-    var v, b, L, x, C, N, S;
+    var L, x, C, N, S, T, D;
     if (!this.screenPosition || !this.tagNormalLine)
       return;
     const { force: e = !1 } = t != null ? t : {};
@@ -202,31 +202,32 @@ class gi extends k {
     }
     const i = this._lastUpdateCache;
     if (!(this.visible !== i.visible)) {
-      const u = Math.abs(this.position[0] - i.position[0]) > 1e-3 || Math.abs(this.position[1] - i.position[1]) > 1e-3 || Math.abs(this.position[2] - i.position[2]) > 1e-3, V = Math.abs(((v = this.screenPosition.leftPx) != null ? v : 0) - i.screenLeft) > 0.5 || Math.abs(((b = this.screenPosition.topPx) != null ? b : 0) - i.screenTop) > 0.5 || Math.abs(((L = this.screenPosition.scale) != null ? L : 1) - i.scale) > 2e-3;
-      if (!u && !V)
+      const u = Math.abs(this.position[0] - i.position[0]) > 1e-3 || Math.abs(this.position[1] - i.position[1]) > 1e-3 || Math.abs(this.position[2] - i.position[2]) > 1e-3, E = Math.abs(((L = this.screenPosition.leftPx) != null ? L : 0) - i.screenLeft) > 0.5 || Math.abs(((x = this.screenPosition.topPx) != null ? x : 0) - i.screenTop) > 0.5 || Math.abs(((C = this.screenPosition.scale) != null ? C : 1) - i.scale) > 2e-3;
+      if (!u && !E)
         return;
     }
-    i.position = new n.Vector3().fromArray(this.position).toArray(), i.screenLeft = (x = this.screenPosition.leftPx) != null ? x : 0, i.screenTop = (C = this.screenPosition.topPx) != null ? C : 0, i.scale = (N = this.screenPosition.scale) != null ? N : 1, i.visible = this.visible;
-    const s = this.five.renderer.getSize(g);
-    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineStart.project(this.five.camera), this._temp.iconPos.project(this.five.camera), this._temp.screenDirPixel.set(
+    if (i.position = new r.Vector3().fromArray(this.position).toArray(), i.screenLeft = (N = this.screenPosition.leftPx) != null ? N : 0, i.screenTop = (S = this.screenPosition.topPx) != null ? S : 0, i.scale = (T = this.screenPosition.scale) != null ? T : 1, i.visible = this.visible, !this.five.renderer)
+      return;
+    const s = this.five.renderer.getSize(_), a = P(g(this.originPosition), this.plugin.workUtil.transform).toArray();
+    this._temp.lineStart.fromArray(a), this._temp.iconPos.fromArray(this.position), this._temp.lineStart.project(this.five.camera), this._temp.iconPos.project(this.five.camera), this._temp.screenDirPixel.set(
       (this._temp.iconPos.x - this._temp.lineStart.x) * s.x / 2,
       (this._temp.iconPos.y - this._temp.lineStart.y) * s.y / 2
     );
-    const h = this._temp.screenDirPixel.length();
+    const d = this._temp.screenDirPixel.length();
     this._temp.screenDirPixel.normalize();
-    const p = this.iconPixelGap * ((S = this.screenPosition.scale) != null ? S : 1);
+    const m = this.iconPixelGap * ((D = this.screenPosition.scale) != null ? D : 1);
     this._temp.targetNDC.set(
-      (this._temp.iconPos.x * s.x / 2 - this._temp.screenDirPixel.x * p) / (s.x / 2),
-      (this._temp.iconPos.y * s.y / 2 - this._temp.screenDirPixel.y * p) / (s.y / 2)
+      (this._temp.iconPos.x * s.x / 2 - this._temp.screenDirPixel.x * m) / (s.x / 2),
+      (this._temp.iconPos.y * s.y / 2 - this._temp.screenDirPixel.y * m) / (s.y / 2)
     ), this._temp.raycaster.setFromCamera(this._temp.targetNDC, this.five.camera);
-    const a = this._temp.raycaster.ray;
-    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(a.origin).sub(this._temp.lineStart);
-    const d = a.direction.dot(a.direction), f = a.direction.dot(this._temp.lineDir), P = this._temp.lineDir.dot(this._temp.lineDir), T = a.direction.dot(this._temp.lineEnd), D = this._temp.lineDir.dot(this._temp.lineEnd), _ = d * P - f * f;
-    let y = 0;
-    Math.abs(_) > 1e-4 && (y = (f * D - P * T) / _), this._temp.lineEnd.copy(a.origin).add(a.direction.multiplyScalar(Math.max(0, y)));
-    const A = this._temp.lineStart.distanceTo(this._temp.iconPos);
-    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > A) {
-      const u = Math.max(0, 1 - p / h);
+    const l = this._temp.raycaster.ray;
+    this._temp.lineStart.fromArray(a), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(l.origin).sub(this._temp.lineStart);
+    const A = l.direction.dot(l.direction), f = l.direction.dot(this._temp.lineDir), y = this._temp.lineDir.dot(this._temp.lineDir), w = l.direction.dot(this._temp.lineEnd), V = this._temp.lineDir.dot(this._temp.lineEnd), v = A * y - f * f;
+    let b = 0;
+    Math.abs(v) > 1e-4 && (b = (f * V - y * w) / v), this._temp.lineEnd.copy(l.origin).add(l.direction.multiplyScalar(Math.max(0, b)));
+    const k = this._temp.lineStart.distanceTo(this._temp.iconPos);
+    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > k) {
+      const u = Math.max(0, 1 - m / d);
       this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, u);
     }
     this.tagNormalLine.setPoints(this._temp.lineStart, this._temp.lineEnd), this.tagNormalLine.visible = !0;
@@ -245,26 +246,26 @@ class gi extends k {
       });
     }, 1e3)) : i.timeoutId && (clearTimeout(i.timeoutId), i.inAnimation = !1, i.timeoutId = void 0), !o && !i.inAnimation)
       return;
-    const r = this.computeTagProject();
-    if (r && this.five.renderer) {
-      const h = this.getDistance(void 0, 1), p = (() => {
+    const n = this.computeTagProject();
+    if (n && this.five.renderer) {
+      const a = this.getDistance(void 0, 1), d = (() => {
         if (!this.currentConfig.simulate3D)
           return 1;
-        const d = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
-        return Math.max(Math.min(1 - d * h / 40, 1), 0.7);
-      })(), a = this.five.renderer.getSize(g);
+        const l = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
+        return Math.max(Math.min(1 - l * a / 40, 1), 0.7);
+      })(), m = this.five.renderer.getSize(_);
       this.screenPosition = {
-        leftPx: (r.x + 1) / 2 * a.x,
-        topPx: (-r.y + 1) / 2 * a.y,
-        scale: p
+        leftPx: (n.x + 1) / 2 * m.x,
+        topPx: (-n.y + 1) / 2 * m.y,
+        scale: d
       }, this.updateTagNormalLinePosition({ force: t == null ? void 0 : t.force });
     } else
       this.screenPosition = null;
     this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   set(t, e = !0) {
-    var o, i, r;
-    super.set(t, e), this.normalLineLength = (r = (i = (o = t.style) == null ? void 0 : o.point) == null ? void 0 : i.normalLen) != null ? r : 0, this._lastUpdateCache.position = [0, 0, 0], this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
+    var o, i, n;
+    super.set(t, e), this.normalLineLength = (n = (i = (o = t.style) == null ? void 0 : o.point) == null ? void 0 : i.normalLen) != null ? n : 0, this._lastUpdateCache.position = [0, 0, 0], this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
   }
   setData(...t) {
     super.setData(...t), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -279,7 +280,7 @@ class gi extends k {
     }
   }
   computeNormal() {
-    return new n.Vector3().fromArray(this.normal);
+    return new r.Vector3().fromArray(this.normal);
   }
   removeTagNormalLine() {
     this.tagNormalLine && (this.plugin.group.remove(this.tagNormalLine), this.tagNormalLine = null);
@@ -293,5 +294,5 @@ class gi extends k {
   }
 }
 export {
-  gi as PointTag
+  Pi as PointTag
 };

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let A = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.72.5-alpha.4");
+    r(this, "VERSION", "3.72.5-alpha.5");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.72.5-alpha.4",
+    "%c %c@realsee/dnalogel %cv3.72.5-alpha.5",
     [
       "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.72.5-alpha.4",
+  "version": "3.72.5-alpha.5",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",