@realsee/dnalogel 3.47.6 → 3.47.8

package/libs/index.js

@@ -84,6 +84,11 @@ import "./shared-utils/tag.js";
 import "./shared-utils/five/vector3ToScreen.js";
 import "./shared-utils/five/getFiveModel.js";
 import "./shared-utils/three/raycaster.js";
+import "./shared-utils/Utils/FiveUtil.js";
+import "./shared-utils/Utils/BaseUtil.js";
+import "./shared-utils/Subscribe.js";
+import "./shared-utils/Utils/WorkUtil.js";
+import "./shared-utils/five/transformPosition.js";
 import "./Sculpt/utils/Modules/Global.js";
 import "./Sculpt/utils/Modules/Cursor.js";
 import "./shared-utils/five/FiveDomEvents.js";
@@ -96,13 +101,8 @@ import "./shared-utils/three/PointSelector/utils/PointHelper.js";
 import "./shared-utils/three/Assets/index.js";
 import "./CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "./CSS3DRenderPlugin/utils/even.js";
-import "./shared-utils/Subscribe.js";
 import "./CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "./base/BasePlugin.js";
-import "./shared-utils/Utils/FiveUtil.js";
-import "./shared-utils/Utils/BaseUtil.js";
-import "./shared-utils/Utils/WorkUtil.js";
-import "./shared-utils/five/transformPosition.js";
 import "./shared-utils/url/absoluteUrl.js";
 import "./shared-utils/Object3DHelper/Helper/MoveHelper.js";
 import "./shared-utils/Object3DHelper/Base/BaseHelper.js";

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.47.6",
+    "%c %c@realsee/dnalogel %cv3.47.8",
     [
       "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

@@ -13,6 +13,7 @@ export declare class LightTag {
     private transformedPosition?;
     private disposer;
     private config;
+    private fiveUtil;
     constructor(five: Five, position?: AnyPosition, config?: {
         wrapper?: HTMLElement;
         positionsForRotate?: AnyPosition[];

package/libs/shared-utils/tag.js

@@ -1,14 +1,15 @@
 var u = Object.defineProperty;
 var g = (h, t, e) => t in h ? u(h, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[t] = e;
 var o = (h, t, e) => (g(h, typeof t != "symbol" ? t + "" : t, e), e);
-import { anyPositionToVector3 as f } from "./positionToVector3.js";
+import { anyPositionToVector3 as d } from "./positionToVector3.js";
 import * as b from "three";
-import { vector3ToScreen as p } from "./five/vector3ToScreen.js";
+import { vector3ToScreen as l } from "./five/vector3ToScreen.js";
 import { getFiveModel as x } from "./five/getFiveModel.js";
 import { _raycaster as m } from "./three/raycaster.js";
-const v = "LightTagContainer_shgjakdhwakjdhsja", E = new b.Vector2();
-class w {
-  constructor(t, e, i) {
+import { FiveUtil as U } from "./Utils/FiveUtil.js";
+const v = "LightTagContainer_shgjakdhwakjdhsja", w = new b.Vector2();
+class E {
+  constructor(t, e, s) {
     o(this, "container");
     o(this, "visible", !1);
     o(this, "enabled", !1);
@@ -20,22 +21,24 @@ class w {
     o(this, "transformedPosition");
     o(this, "disposer");
     o(this, "config");
+    o(this, "fiveUtil");
     o(this, "onCameraUpdate", () => {
       this.visible !== !1 && this.updateScreenPosition();
     });
     o(this, "onFiveEveryReady", () => {
       var t;
       if (this.visible && this.five.state.mode !== "Panorama") {
-        m.set(this.five.camera.position, this.transformedPosition.clone().sub(this.five.camera.position));
-        const i = (t = x(this.five).intersectRaycaster(m)) == null ? void 0 : t[0];
-        (i == null ? void 0 : i.distance) + 0.01 > 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");
+        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 s = (t = x(this.five).intersectRaycaster(m)) == null ? void 0 : t[0];
+        (s == null ? void 0 : s.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 r, a;
-    this.five = t, this.originPosition = e ? f(e).clone() : void 0, this.transformedPosition = (r = this.originPosition) == null ? void 0 : r.clone(), this.positionsForRotate = (a = i == null ? void 0 : i.positionsForRotate) == null ? void 0 : a.map((s) => f(s).clone()), this.container = (() => {
-      const s = document.createElement("div");
-      return s.style.width = "0", s.style.height = "0", s.style.position = "absolute", s.style.transition = "opacity 0.2s linear", s;
-    })(), this.config = i != null ? i : {}, this.enable(), this.show();
+    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 = s == null ? void 0 : s.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 = s != null ? s : {}, this.enable(), this.show();
   }
   show() {
     this.visible = !0, this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.onCameraUpdate();
@@ -44,12 +47,12 @@ class w {
     this.visible = !1, this.container.style.opacity = "0", this.container.style.pointerEvents = "none";
   }
   enable() {
-    var i, r, a, s;
+    var s, n, r, a;
     if (this.enabled)
       return;
-    this.enabled = !0, this.wrapper = (a = (r = this.config.wrapper) != null ? r : (i = this.five.getElement()) == null ? void 0 : i.parentElement) != null ? a : document.body, this.tagWrapper || (this.tagWrapper = (s = document.getElementById(v)) != null ? s : (() => {
-      const n = document.createElement("div");
-      return n.id = v, n.style.position = "absolute", n.style.top = "0", n.style.left = "0", n.style.width = "100%", n.style.height = "100%", n.style.pointerEvents = "none", n;
+    this.enabled = !0, this.wrapper = (r = (n = this.config.wrapper) != null ? n : (s = this.five.getElement()) == null ? void 0 : s.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;
     })(), this.wrapper.contains(this.tagWrapper) || this.wrapper.appendChild(this.tagWrapper)), this.tagWrapper.appendChild(this.container);
     let t = !1;
     const e = () => {
@@ -80,27 +83,27 @@ class w {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const t = this.five.renderer.getSize(E), e = p(this.five.camera, this.transformedPosition, t);
+    const t = this.five.renderer.getSize(w), e = l(this.five.camera, this.transformedPosition, t);
     if (!e) {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const i = (() => {
-      const a = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), s = this.transformedPosition.distanceTo(this.five.camera.position);
-      return Math.max(Math.min(1 - a * s / 40, 1), 0.5);
-    })(), r = (() => {
+    const s = (() => {
+      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);
+    })(), n = (() => {
       if (this.positionsForRotate === void 0 || this.positionsForRotate.length !== 2)
         return 0;
-      const [a, s] = this.positionsForRotate, n = p(this.five.camera, a, t), c = p(this.five.camera, s, t), l = n.leftPx > c.leftPx ? c : n, d = n.leftPx > c.leftPx ? n : c, y = d.leftPx - l.leftPx, P = d.topPx - l.topPx;
+      const [r, a] = this.positionsForRotate, i = l(this.five.camera, r, t), c = l(this.five.camera, a, t), p = i.leftPx > c.leftPx ? c : i, f = i.leftPx > c.leftPx ? i : c, y = f.leftPx - p.leftPx, P = f.topPx - p.topPx;
       return Math.atan2(P, y) * (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(${i})`, r && (this.container.style.transform += ` rotate(${r}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(${s})`, n && (this.container.style.transform += ` rotate(${n}deg)`);
   }
 }
-function M(h, t, e) {
-  return new w(h, t, e);
+function S(h, t, e) {
+  return new E(h, t, e);
 }
 export {
-  w as LightTag,
-  M as tag
+  E as LightTag,
+  S as tag
 };

package/package.json

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