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

package/dist/index.js

@@ -43,7 +43,7 @@ import { LineGeometry as yb, LineMaterial as wb, THREE_Line2 as Pb, Line as I0 }
 import { GLTFLoader as Cb } from "@realsee/five/gltf-loader";
 function Ib() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.72.5-alpha.3",
+    "%c %c@realsee/dnalogel %cv3.72.5-alpha.4",
     [
       "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",
@@ -13117,7 +13117,7 @@ let bs = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    f(this, "VERSION", "3.72.5-alpha.3");
+    f(this, "VERSION", "3.72.5-alpha.4");
     f(this, "NAME");
     f(this, "five");
     f(this, "workUtil");
@@ -33440,7 +33440,7 @@ class D8 extends Hd {
       const c = (l = (a = (r = i.style) == null ? void 0 : r.point) == null ? void 0 : a.scale) != null ? l : 1;
       this.iconPixelGap = i.style.point.width * c * 1.4 / 2 + 2;
     }
-    this.initialTagLine();
+    i.contentType === "Audio" && (this.iconPixelGap = 34 / 2 + 2), this.initialTagLine();
   }
   initialTagLine() {
     var o, r, a;
@@ -33452,7 +33452,7 @@ class D8 extends Hd {
       color: new y.Vector3(1, 1, 1),
       linewidth: (a = (r = e == null ? void 0 : e.tagNormalLineConfig) == null ? void 0 : r.lineWidth) != null ? a : 1.2,
       dashed: !1
-    }), this.tagNormalLine.line.material.transparent = !0, this.tagNormalLine.line.material.depthWrite = !1, this.tagNormalLine.line.material.depthTest = !1, this.tagNormalLine.line.material.dashed = !1, this.tagNormalLine.line.renderOrder = 2, this.tagNormalLine.setResolution(i.width * s, i.height * s), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
+    }), 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(i.width * s, i.height * s), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
   }
   /**
    * @description 展开自己，收起其他标签
@@ -33506,42 +33506,43 @@ class D8 extends Hd {
    * 更新标签连线的位置，使其端点与icon保持固定像素距离
    * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
    */
-  updateTagNormalLinePosition() {
-    var A, P, E, I, z, D, j;
+  updateTagNormalLinePosition(e) {
+    var I, z, D, j, T, O, b;
     if (!this.screenPosition || !this.tagNormalLine)
       return;
-    if (!this.visible) {
+    const { force: i = !1 } = e != null ? e : {};
+    if (!(i ? this.state.visible : this.currentVisible)) {
       this.tagNormalLine.visible = !1;
       return;
     }
-    const e = this._lastUpdateCache;
-    if (!(this.visible !== e.visible)) {
-      const T = Math.abs(this.position[0] - e.position[0]) > 1e-3 || Math.abs(this.position[1] - e.position[1]) > 1e-3 || Math.abs(this.position[2] - e.position[2]) > 1e-3, O = Math.abs(((A = this.screenPosition.leftPx) != null ? A : 0) - e.screenLeft) > 0.5 || Math.abs(((P = this.screenPosition.topPx) != null ? P : 0) - e.screenTop) > 0.5 || Math.abs(((E = this.screenPosition.scale) != null ? E : 1) - e.scale) > 2e-3;
-      if (!T && !O)
+    const o = this._lastUpdateCache;
+    if (!(this.visible !== o.visible)) {
+      const C = Math.abs(this.position[0] - o.position[0]) > 1e-3 || Math.abs(this.position[1] - o.position[1]) > 1e-3 || Math.abs(this.position[2] - o.position[2]) > 1e-3, M = Math.abs(((I = this.screenPosition.leftPx) != null ? I : 0) - o.screenLeft) > 0.5 || Math.abs(((z = this.screenPosition.topPx) != null ? z : 0) - o.screenTop) > 0.5 || Math.abs(((D = this.screenPosition.scale) != null ? D : 1) - o.scale) > 2e-3;
+      if (!C && !M)
         return;
     }
-    e.position = new y.Vector3().fromArray(this.position).toArray(), e.screenLeft = (I = this.screenPosition.leftPx) != null ? I : 0, e.screenTop = (z = this.screenPosition.topPx) != null ? z : 0, e.scale = (D = this.screenPosition.scale) != null ? D : 1, e.visible = this.visible;
-    const s = this.five.renderer.getSize(Dc);
+    o.position = new y.Vector3().fromArray(this.position).toArray(), o.screenLeft = (j = this.screenPosition.leftPx) != null ? j : 0, o.screenTop = (T = this.screenPosition.topPx) != null ? T : 0, o.scale = (O = this.screenPosition.scale) != null ? O : 1, o.visible = this.visible;
+    const a = this.five.renderer.getSize(Dc);
     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(
-      (this._temp.iconPos.x - this._temp.lineStart.x) * s.x / 2,
-      (this._temp.iconPos.y - this._temp.lineStart.y) * s.y / 2
+      (this._temp.iconPos.x - this._temp.lineStart.x) * a.x / 2,
+      (this._temp.iconPos.y - this._temp.lineStart.y) * a.y / 2
     );
-    const o = this._temp.screenDirPixel.length();
+    const l = this._temp.screenDirPixel.length();
     this._temp.screenDirPixel.normalize();
-    const r = this.iconPixelGap * ((j = this.screenPosition.scale) != null ? j : 1);
+    const c = this.iconPixelGap * ((b = this.screenPosition.scale) != null ? b : 1);
     this._temp.targetNDC.set(
-      (this._temp.iconPos.x * s.x / 2 - this._temp.screenDirPixel.x * r) / (s.x / 2),
-      (this._temp.iconPos.y * s.y / 2 - this._temp.screenDirPixel.y * r) / (s.y / 2)
+      (this._temp.iconPos.x * a.x / 2 - this._temp.screenDirPixel.x * c) / (a.x / 2),
+      (this._temp.iconPos.y * a.y / 2 - this._temp.screenDirPixel.y * c) / (a.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 l = a.direction.dot(a.direction), c = a.direction.dot(this._temp.lineDir), h = this._temp.lineDir.dot(this._temp.lineDir), d = a.direction.dot(this._temp.lineEnd), u = this._temp.lineDir.dot(this._temp.lineEnd), g = l * h - c * c;
-    let p = 0;
-    Math.abs(g) > 1e-4 && (p = (c * u - h * d) / g), this._temp.lineEnd.copy(a.origin).add(a.direction.multiplyScalar(Math.max(0, p)));
-    const m = this._temp.lineStart.distanceTo(this._temp.iconPos);
-    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > m) {
-      const T = Math.max(0, 1 - r / o);
-      this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, T);
+    const h = 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(h.origin).sub(this._temp.lineStart);
+    const d = h.direction.dot(h.direction), u = h.direction.dot(this._temp.lineDir), g = this._temp.lineDir.dot(this._temp.lineDir), p = h.direction.dot(this._temp.lineEnd), m = this._temp.lineDir.dot(this._temp.lineEnd), v = d * g - u * u;
+    let A = 0;
+    Math.abs(v) > 1e-4 && (A = (u * m - g * p) / v), this._temp.lineEnd.copy(h.origin).add(h.direction.multiplyScalar(Math.max(0, A)));
+    const P = this._temp.lineStart.distanceTo(this._temp.iconPos);
+    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > P) {
+      const C = Math.max(0, 1 - c / l);
+      this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, C);
     }
     this.tagNormalLine.setPoints(this._temp.lineStart, this._temp.lineEnd), this.tagNormalLine.visible = !0;
   }
@@ -33571,7 +33572,7 @@ class D8 extends Hd {
         leftPx: (r.x + 1) / 2 * h.x,
         topPx: (-r.y + 1) / 2 * h.y,
         scale: c
-      }, this.updateTagNormalLinePosition();
+      }, this.updateTagNormalLinePosition({ force: e == null ? void 0 : e.force });
     } else
       this.screenPosition = null;
     this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -47245,7 +47246,11 @@ function nu(n, t, e) {
     var de;
     j.length = 0;
     let Me = P.length === 0 ? re.point : E.clone();
-    l && (Me = Me.clone().setY(d)), P.push(Me), n.setPoints(P, { closed: !1 }), v(), (de = e == null ? void 0 : e.onPointPlaced) == null || de.call(e, P), z && (S(), s());
+    if (l && (Me = Me.clone().setY(d)), P.push(Me), n.setPoints(P, { closed: !1 }), e != null && e.experimental_self_intersect_check && P.length > 2 && n.isBlank) {
+      P.pop(), n.setPoints(P, { closed: !1 }), v(), console.warn("[Polygon] 检测到自相交，无法添加该点");
+      return;
+    }
+    v(), (de = e == null ? void 0 : e.onPointPlaced) == null || de.call(e, P), z && (S(), s());
   }, k = (re) => {
     const Me = () => {
       u.setPoints([]), g.setPoints([]), n.setPoints(P), t.pointSelectorHelper && t.pointSelectorHelper.magnifier && t.pointSelectorHelper.magnifier.render();
@@ -53401,7 +53406,7 @@ class Lh extends k8 {
     var e;
     this.tags.length && (this.tags.forEach((i) => {
       var s, o, r, a, l, c;
-      (s = i.tag3DContentSvelte) == null || s.dispose(), (r = (o = i.mediaPlane) == null ? void 0 : o.parent) == null || r.remove(i.mediaPlane), (c = (l = (a = i.model) == null ? void 0 : a.object) == null ? void 0 : l.parent) == null || c.remove(i.model.object);
+      (s = i.tag3DContentSvelte) == null || s.dispose(), (r = (o = i.mediaPlane) == null ? void 0 : o.parent) == null || r.remove(i.mediaPlane), (c = (l = (a = i.model) == null ? void 0 : a.object) == null ? void 0 : l.parent) == null || c.remove(i.model.object), this.group.remove(i.tagNormalLine);
     }), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (e = this.TagContainerSvelte) == null || e.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer()), this.enabledModelTagSet.clear(), this.cache.clear();
   }
   /**