@realsee/dnalogel 3.49.8 → 3.49.9-alpha.0

package/dist/shared-utils/tag.d.ts

@@ -3,9 +3,9 @@ import { type AnyPosition } from './positionToVector3';
 import * as THREE from 'three';
 export declare class LightTag {
     container: HTMLDivElement;
+    wrapper: HTMLElement;
     visible: boolean;
     enabled: boolean;
-    wrapper: HTMLElement;
     positionsForRotate?: THREE.Vector3[];
     /**
      * @description 碰撞检测
@@ -17,7 +17,7 @@ export declare class LightTag {
      * @default true
      */
     simulate3D: boolean;
-    private tagWrapper;
+    tagWrapper: HTMLElement;
     private five;
     private originPosition?;
     private transformedPosition?;
@@ -26,6 +26,7 @@ export declare class LightTag {
     private fiveUtil;
     constructor(five: Five, position?: AnyPosition, config?: {
         wrapper?: HTMLElement;
+        tagWrapper?: HTMLElement;
         positionsForRotate?: AnyPosition[];
     });
     show(): void;

package/libs/ModelMakerPlugin/Controller.js

@@ -29,7 +29,7 @@ var F = (h, o, e) => new Promise((t, r) => {
 import { Controller as z } from "../base/BasePluginWithData.js";
 import * as c from "three";
 import { ModelMakerBoxItem as B } from "./item/boxItem.js";
-import { PrismMesh as A } from "../Sculpt/Meshes/Prism.js";
+import { PrismMesh as T } from "../Sculpt/Meshes/Prism.js";
 import { anyPositionToVector3 as O } from "../shared-utils/positionToVector3.js";
 import { PolygonWithEdgeMesh as Q } from "../Sculpt/Meshes/PolygonWithEdge.js";
 import "hammerjs";
@@ -39,7 +39,7 @@ import "../vendor/three/examples/jsm/lines/LineGeometry.js";
 import "../shared-utils/tag.js";
 import { boxVertex as g } from "../shared-utils/three/boundingBox.js";
 import "animejs";
-import { notNil as I } from "../shared-utils/isNil.js";
+import { notNil as A } from "../shared-utils/isNil.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import { tagRendererMap as q } from "./utils/tagRenderer.js";
 import { ModelMakerPrismItem as G } from "./item/prismItem.js";
@@ -128,7 +128,7 @@ class nt extends z {
     this.group.name = "ModelMakerPluginGroup", this.state = { enabled: !0, visible: !0 }, this.occlusionVisibility = (r = t == null ? void 0 : t.occlusionVisibility) != null ? r : !1, this.occlusionMode = (p = t == null ? void 0 : t.occlusionMode) != null ? p : "translucence", this.fiveDomEvents = Y(e), this.tagWrapper = (() => {
       var i;
       const a = document.createElement("div");
-      return a.style.position = "absolute", a.style.top = "0", a.style.left = "0", a.style.width = "100%", a.style.height = "100%", a.style.pointerEvents = "none", a.style.zIndex = `${(i = t == null ? void 0 : t.tagContainerZIndex) != null ? i : ""}`, a;
+      return a.style.position = "absolute", a.classList.add("ModelMakerPluginTagWrapper"), a.style.top = "0", a.style.left = "0", a.style.width = "100%", a.style.height = "100%", a.style.pointerEvents = "none", a.style.zIndex = `${(i = t == null ? void 0 : t.tagContainerZIndex) != null ? i : ""}`, a;
     })(), e.scene.add(this.group), this.handleEnable(), window.__MODELMAKER_DEBUG__ = this;
   }
   load(e) {
@@ -160,7 +160,7 @@ class nt extends z {
           });
           this.items.push(d);
         } else if (i.type === "prism") {
-          const s = new A();
+          const s = new T();
           this.zFightingOffset += 1e-4;
           const d = i.object_data.points.map((u) => {
             var y;
@@ -186,7 +186,7 @@ class nt extends z {
           });
           this.items.push(f);
         } else if (i.type === "box") {
-          const s = new A(), { start: d, end: v, rotation: M = [0, 0, 0, 0], opacity: f, color: u } = i.object_data, y = new c.Vector3().fromArray(d), R = new c.Vector3().fromArray(v), T = new c.Euler().fromArray(M), x = new c.Quaternion().setFromEuler(T), C = x.clone().inverse(), V = new c.Vector3().lerpVectors(y, R, 0.5), W = V.clone().negate(), j = y.clone().add(W).applyQuaternion(C), k = R.clone().add(W).applyQuaternion(C), b = new c.Box3(j.clone().max(k), j.clone().min(k));
+          const s = new T(), { start: d, end: v, rotation: M = [0, 0, 0, 0], opacity: f, color: u } = i.object_data, y = new c.Vector3().fromArray(d), R = new c.Vector3().fromArray(v), I = new c.Euler().fromArray(M), x = new c.Quaternion().setFromEuler(I), C = x.clone().inverse(), V = new c.Vector3().lerpVectors(y, R, 0.5), W = V.clone().negate(), k = y.clone().add(W).applyQuaternion(C), j = R.clone().add(W).applyQuaternion(C), b = new c.Box3(k.clone().max(j), k.clone().min(j));
           s.setPoints({
             points: [g(b, 2), g(b, 3), g(b, 7), g(b, 6), g(b, 2)],
             heightPoint: g(b, 0)
@@ -212,7 +212,7 @@ class nt extends z {
     });
   }
   setState(e) {
-    I(e.enabled) && this.state.enabled !== e.enabled && (this.state.enabled = e.enabled, e.enabled ? this.handleEnable() : this.handleDisable(), this.hooks.emit(e.enabled ? "enable" : "disable", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" })), I(e.visible) && this.state.visible !== e.visible && (this.state.visible = e.visible, e.visible ? this.handleShow() : this.handleHide(), this.hooks.emit(e.visible ? "show" : "hide", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" }));
+    A(e.enabled) && this.state.enabled !== e.enabled && (this.state.enabled = e.enabled, e.enabled ? this.handleEnable() : this.handleDisable(), this.hooks.emit(e.enabled ? "enable" : "disable", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" })), A(e.visible) && this.state.visible !== e.visible && (this.state.visible = e.visible, e.visible ? this.handleShow() : this.handleHide(), this.hooks.emit(e.visible ? "show" : "hide", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" }));
   }
   getItemById(e) {
     return this.items.find((t) => t.rawData.id === e);

package/libs/base/BasePlugin.js

@@ -18,7 +18,7 @@ let P = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.49.8");
+    i(this, "VERSION", "3.49.9-alpha.0");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.49.8",
+    "%c %c@realsee/dnalogel %cv3.49.9-alpha.0",
     [
       "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/libs/shared-utils/tag.d.ts

@@ -3,9 +3,9 @@ import { type AnyPosition } from './positionToVector3';
 import * as THREE from 'three';
 export declare class LightTag {
     container: HTMLDivElement;
+    wrapper: HTMLElement;
     visible: boolean;
     enabled: boolean;
-    wrapper: HTMLElement;
     positionsForRotate?: THREE.Vector3[];
     /**
      * @description 碰撞检测
@@ -17,7 +17,7 @@ export declare class LightTag {
      * @default true
      */
     simulate3D: boolean;
-    private tagWrapper;
+    tagWrapper: HTMLElement;
     private five;
     private originPosition?;
     private transformedPosition?;
@@ -26,6 +26,7 @@ export declare class LightTag {
     private fiveUtil;
     constructor(five: Five, position?: AnyPosition, config?: {
         wrapper?: HTMLElement;
+        tagWrapper?: HTMLElement;
         positionsForRotate?: AnyPosition[];
     });
     show(): void;

package/libs/shared-utils/tag.js

@@ -1,19 +1,20 @@
-var P = Object.defineProperty;
-var g = (h, t, e) => t in h ? P(h, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[t] = e;
-var s = (h, t, e) => (g(h, typeof t != "symbol" ? t + "" : t, e), e);
+var u = Object.defineProperty;
+var P = (h, t, e) => t in h ? u(h, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[t] = e;
+var s = (h, t, e) => (P(h, typeof t != "symbol" ? t + "" : t, e), e);
 import { anyPositionToVector3 as d } from "./positionToVector3.js";
-import * as b from "three";
-import { vector3ToScreen as l } from "./five/vector3ToScreen.js";
-import { getFiveModel as x } from "./five/getFiveModel.js";
-import { FiveUtil as U } from "./Utils/FiveUtil.js";
+import * as g from "three";
+import { vector3ToScreen as p } from "./five/vector3ToScreen.js";
+import { getFiveModel as b } from "./five/getFiveModel.js";
+import { FiveUtil as x } from "./Utils/FiveUtil.js";
 import { _raycaster as m } from "./three/temp.js";
-const v = "LightTagContainer_shgjakdhwakjdhsja", w = new b.Vector2();
-class E {
-  constructor(t, e, o) {
+const U = new g.Vector2();
+class w {
+  constructor(t, e, i) {
+    // 单个标签容器
     s(this, "container");
+    s(this, "wrapper");
     s(this, "visible", !1);
     s(this, "enabled", !1);
-    s(this, "wrapper");
     s(this, "positionsForRotate");
     /**
      * @description 碰撞检测
@@ -40,15 +41,15 @@ class E {
       if (this.intersectCheck && this.visible && this.five.state.mode !== "Panorama") {
         let e = 0.01;
         this.fiveUtil.workUtil.fromType === "poincare" && (e = 0.05), m.set(this.five.camera.position, this.transformedPosition.clone().sub(this.five.camera.position));
-        const o = (t = x(this.five).intersectRaycaster(m)) == null ? void 0 : t[0];
-        (o == null ? void 0 : o.distance) + e > this.transformedPosition.distanceTo(this.five.camera.position) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
+        const i = (t = b(this.five).intersectRaycaster(m)) == null ? void 0 : t[0];
+        (i == null ? void 0 : i.distance) + e > this.transformedPosition.distanceTo(this.five.camera.position) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
       }
     });
-    var n, r, a;
-    this.five = t, this.fiveUtil = (n = t.__fiveUtil__) != null ? n : t.__fiveUtil__ = new U(t), this.originPosition = e ? d(e).clone() : void 0, this.transformedPosition = (r = this.originPosition) == null ? void 0 : r.clone(), this.positionsForRotate = (a = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : a.map((i) => d(i).clone()), this.container = (() => {
-      const i = document.createElement("div");
-      return i.style.width = "0", i.style.height = "0", i.style.position = "absolute", i.style.transition = "opacity 0.2s linear", i;
-    })(), this.config = o != null ? o : {}, this.enable(), this.show();
+    var n, a, o;
+    this.five = t, this.tagWrapper = i == null ? void 0 : i.tagWrapper, this.fiveUtil = (n = t.__fiveUtil__) != null ? n : t.__fiveUtil__ = new x(t), this.originPosition = e ? d(e).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (o = i == null ? void 0 : i.positionsForRotate) == null ? void 0 : o.map((r) => d(r).clone()), this.container = (() => {
+      const r = document.createElement("div");
+      return r.style.width = "0", r.style.height = "0", r.style.position = "absolute", r.style.transition = "opacity 0.2s linear", r;
+    })(), this.config = i != null ? i : {}, this.enable(), this.show();
   }
   show() {
     this.visible = !0, this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.onCameraUpdate();
@@ -57,12 +58,12 @@ class E {
     this.visible = !1, this.container.style.opacity = "0", this.container.style.pointerEvents = "none";
   }
   enable() {
-    var o, n, r, a;
+    var i, n, a;
     if (this.enabled)
       return;
-    this.enabled = !0, this.wrapper = (r = (n = this.config.wrapper) != null ? n : (o = this.five.getElement()) == null ? void 0 : o.parentElement) != null ? r : document.body, this.tagWrapper || (this.tagWrapper = (a = document.getElementById(v)) != null ? a : (() => {
-      const i = document.createElement("div");
-      return i.id = v, i.style.position = "absolute", i.style.top = "0", i.style.left = "0", i.style.width = "100%", i.style.height = "100%", i.style.pointerEvents = "none", i.style.zIndex = "1", i;
+    this.enabled = !0, this.wrapper = (a = (n = this.config.wrapper) != null ? n : (i = this.five.getElement()) == null ? void 0 : i.parentElement) != null ? a : document.body, this.tagWrapper || (this.tagWrapper = (() => {
+      const o = document.createElement("div");
+      return o.style.position = "absolute", o.classList.add("LightTagWrapper"), o.style.top = "0", o.style.left = "0", o.style.width = "100%", o.style.height = "100%", o.style.pointerEvents = "none", o.style.zIndex = "1", o;
     })(), this.wrapper.contains(this.tagWrapper) || this.wrapper.appendChild(this.tagWrapper)), this.tagWrapper.appendChild(this.container);
     let t = !1;
     const e = () => {
@@ -93,32 +94,32 @@ class E {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const t = this.five.renderer.getSize(w), e = l(this.five.camera, this.transformedPosition, t);
+    const t = this.five.renderer.getSize(U), e = p(this.five.camera, this.transformedPosition, t);
     if (!e) {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const o = (() => {
+    const i = (() => {
       if (!this.simulate3D)
         return 1;
-      const r = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), a = this.transformedPosition.distanceTo(this.five.camera.position);
-      return Math.max(Math.min(1 - r * a / 40, 1), 0.5);
+      const a = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), o = this.transformedPosition.distanceTo(this.five.camera.position);
+      return Math.max(Math.min(1 - a * o / 40, 1), 0.5);
     })(), n = (() => {
       if (this.positionsForRotate === void 0 || this.positionsForRotate.length !== 2)
         return 0;
-      const [r, a] = this.positionsForRotate, i = l(this.five.camera, r, t), c = l(this.five.camera, a, t);
-      if (!i || !c)
+      const [a, o] = this.positionsForRotate, r = p(this.five.camera, a, t), l = p(this.five.camera, o, t);
+      if (!r || !l)
         return 0;
-      const p = i.leftPx > c.leftPx ? c : i, f = i.leftPx > c.leftPx ? i : c, y = f.leftPx - p.leftPx, u = f.topPx - p.topPx;
-      return Math.atan2(u, y) * (180 / Math.PI);
+      const c = r.leftPx > l.leftPx ? l : r, f = r.leftPx > l.leftPx ? r : l, v = f.leftPx - c.leftPx, y = f.topPx - c.topPx;
+      return Math.atan2(y, v) * (180 / Math.PI);
     })();
-    this.container.style.left = e.leftPx + "px", this.container.style.top = e.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${o})`, n && (this.container.style.transform += ` rotate(${n}deg)`);
+    this.container.style.left = e.leftPx + "px", this.container.style.top = e.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${i})`, n && (this.container.style.transform += ` rotate(${n}deg)`);
   }
 }
-function S(h, t, e) {
-  return new E(h, t, e);
+function _(h, t, e) {
+  return new w(h, t, e);
 }
 export {
-  E as LightTag,
-  S as tag
+  w as LightTag,
+  _ as tag
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.49.8",
+  "version": "3.49.9-alpha.0",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",