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

package/libs/floorplan/TopviewFloorplanPlugin/index.js

@@ -71,6 +71,7 @@ import "../../vendor/animejs/lib/anime.es.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../shared-utils/five/FivePuppet.js";
 import "@realsee/five";
+import "../../shared-utils/five/fiveModelLoad.js";
 import "../../shared-utils/three/PointSelector/utils/html.js";
 import "../../shared-utils/five/initialCSS3DRender.js";
 import "../../shared-utils/CSS3DRender/CSS3DRenderer.js";
@@ -98,8 +99,8 @@ import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/to.js";
 import "../../shared-utils/getPxmm.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const Yo = (o, r) => new t(o, r);
+const Zo = (o, r) => new t(o, r);
 export {
-  Yo as TopviewFloorplanPlugin,
-  Yo as default
+  Zo as TopviewFloorplanPlugin,
+  Zo as default
 };

package/libs/index.js

@@ -108,6 +108,7 @@ import "./shared-utils/three/core/Five_LineMaterial2.js";
 import "./shared-utils/three/core/Sphere.js";
 import "./vendor/animejs/lib/anime.es.js";
 import "./shared-utils/five/FivePuppet.js";
+import "./shared-utils/five/fiveModelLoad.js";
 import "./shared-utils/three/PointSelector/utils/html.js";
 import "./shared-utils/five/initialCSS3DRender.js";
 import "./shared-utils/CSS3DRender/CSS3DRenderer.js";
@@ -129,7 +130,6 @@ import "./shared-utils/isTouchDevice.js";
 import "./shared-utils/five/getPosition.js";
 import "./shared-utils/five/getRaycasterByNdcPosition.js";
 import "./shared-utils/three/PointSelector/utils/contents.js";
-import "./shared-utils/five/fiveModelLoad.js";
 import "./shared-utils/url/absoluteUrl.js";
 import "./CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "./CSS3DRenderPlugin/utils/getAllCSS3DObject.js";

package/libs/shared-utils/logger.js

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

@@ -43,7 +43,7 @@ export declare class LightTag {
     /**
      * @description 标签的容器，根据 namespace 区分
      */
-    private tagWrapper;
+    private tagWrapper?;
     private five;
     private originPosition?;
     private transformedPosition?;
@@ -69,7 +69,7 @@ export declare class LightTag {
     /**
      * @description 启用标签
      */
-    enable(): void;
+    enable(): Promise<void>;
     /**
      * @description 禁用标签
      */

package/libs/shared-utils/tag.js

@@ -1,23 +1,49 @@
-var b = Object.defineProperty;
-var P = (c, e, t) => e in c ? b(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t;
-var i = (c, e, t) => (P(c, typeof e != "symbol" ? e + "" : e, t), t);
+var P = Object.defineProperty;
+var g = (p, e, t) => e in p ? P(p, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : p[e] = t;
+var r = (p, e, t) => (g(p, typeof e != "symbol" ? e + "" : e, t), t);
+var u = (p, e, t) => new Promise((o, n) => {
+  var a = (i) => {
+    try {
+      s(t.next(i));
+    } catch (l) {
+      n(l);
+    }
+  }, h = (i) => {
+    try {
+      s(t.throw(i));
+    } catch (l) {
+      n(l);
+    }
+  }, s = (i) => i.done ? o(i.value) : Promise.resolve(i.value).then(a, h);
+  s((t = t.apply(p, e)).next());
+});
 import { anyPositionToVector3 as f } from "./positionToVector3.js";
-import * as g from "three";
-import { vector3ToScreen as v } from "./five/vector3ToScreen.js";
-import { getFiveModel as C } from "./five/getFiveModel.js";
-import { FiveUtil as U } from "./Utils/FiveUtil.js";
-import { _raycaster as m } from "./three/temp.js";
+import * as C from "three";
+import { vector3ToScreen as m } from "./five/vector3ToScreen.js";
+import { getFiveModel as U } from "./five/getFiveModel.js";
+import { FiveUtil as w } from "./Utils/FiveUtil.js";
+import { _raycaster as v } from "./three/temp.js";
 import { resizeObserver as x } from "./dom/resizeObserver.js";
 import { fiveEveryReadyListener as E } from "./five/fiveEveryReadyListener.js";
-const w = new g.Vector2();
-class F {
-  constructor(e, t, r) {
+import "../vendor/hammerjs/hammer.js";
+import "./three/PointSelector/index.js";
+import "./three/CSS3DRenderer/index.js";
+import "@realsee/five/line";
+import "./three/core/Five_LineMaterial2.js";
+import "./three/core/Sphere.js";
+import "../vendor/animejs/lib/anime.es.js";
+import { waitFiveModelLoaded as F } from "./five/fiveModelLoad.js";
+import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "./five/FivePuppet.js";
+const R = new C.Vector2();
+class M {
+  constructor(e, t, o) {
     /**
      * @description 单个标签 dom
      */
-    i(this, "container");
-    i(this, "visible", !1);
-    i(this, "enabled", !1);
+    r(this, "container");
+    r(this, "visible", !1);
+    r(this, "enabled", !1);
     /**
      * @description 标签的可见性数组
      * ```
@@ -27,63 +53,63 @@ class F {
      * [3] 强制显示
      * ```
      */
-    i(this, "visibles", []);
+    r(this, "visibles", []);
     /**
      * @description 标签容器的父容器
      * @default this.five.getElement()?.parentElement
      */
-    i(this, "wrapper");
-    i(this, "positionsForRotate");
+    r(this, "wrapper");
+    r(this, "positionsForRotate");
     /**
      * @description 碰撞检测
      * @default true
      */
-    i(this, "intersectCheck", !0);
+    r(this, "intersectCheck", !0);
     /**
      * @description 用于碰撞检测的额外 Object3D
      */
-    i(this, "extraObjectsForIntersectCheck", []);
+    r(this, "extraObjectsForIntersectCheck", []);
     /**
      * @description 模拟3D
      * @default false
      */
-    i(this, "simulate3D", !1);
+    r(this, "simulate3D", !1);
     /**
      * @description 标签的容器，根据 namespace 区分
      */
-    i(this, "tagWrapper");
-    i(this, "five");
-    i(this, "originPosition");
-    i(this, "transformedPosition");
-    i(this, "disposer");
-    i(this, "config");
-    i(this, "fiveUtil");
-    i(this, "disposers", []);
-    i(this, "onModeChange", () => {
+    r(this, "tagWrapper");
+    r(this, "five");
+    r(this, "originPosition");
+    r(this, "transformedPosition");
+    r(this, "disposer");
+    r(this, "config");
+    r(this, "fiveUtil");
+    r(this, "disposers", []);
+    r(this, "onModeChange", () => {
       this.visibles[3] = void 0, this.updateVisible();
     });
-    i(this, "onPanoArrived", () => {
+    r(this, "onPanoArrived", () => {
       this.visibles[3] = void 0, this.updateVisible();
     });
-    i(this, "onCameraUpdate", () => {
+    r(this, "onCameraUpdate", () => {
       this.visible !== !1 && this.updateScreenPosition();
     });
-    i(this, "onCameraFovUpdate", () => {
+    r(this, "onCameraFovUpdate", () => {
       this.onCameraUpdate(), this.five.off("render.prepare", this.onCameraUpdate), this.five.on("render.prepare", this.onCameraUpdate), setTimeout(() => {
         this.five.off("render.prepare", this.onCameraUpdate);
       }, 1e3);
     });
-    i(this, "onFiveEveryReady", () => {
+    r(this, "onFiveEveryReady", () => {
       this.five.state.mode !== "Panorama" && this.updateVisible();
     });
-    i(this, "updateVisible", () => {
+    r(this, "updateVisible", () => {
       this.visible && (this.updateIntersectCheckVisible(), this.needsRender = !0);
     });
-    i(this, "applyVisible", () => {
+    r(this, "applyVisible", () => {
       this.visibles[3] === !0 || this.visibles.every((t) => t !== !1) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
     });
-    i(this, "updateIntersectCheckVisible", () => {
-      var n, s;
+    r(this, "updateIntersectCheckVisible", () => {
+      var i, l;
       if (!this.position)
         return;
       if (!this.intersectCheck) {
@@ -92,15 +118,15 @@ class F {
       }
       let e = !1, t = 0.01;
       this.fiveUtil.workUtil.fromType === "poincare" && (t = 0.05);
-      const r = this.transformedPosition.clone().sub(this.five.camera.position).normalize();
-      m.set(this.five.camera.position, r);
-      const a = (n = C(this.five).intersectRaycaster(m)) != null ? n : [], h = (s = m.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? s : [], o = [...a, ...h].sort((d, p) => d.distance - p.distance)[0];
-      o ? e = (o == null ? void 0 : o.distance) + t > this.transformedPosition.distanceTo(this.five.camera.position) : e = !0, this.visibles[1] = e;
+      const o = this.transformedPosition.clone().sub(this.five.camera.position).normalize();
+      v.set(this.five.camera.position, o);
+      const n = (i = U(this.five).intersectRaycaster(v)) != null ? i : [], a = (l = v.intersectObjects(this.extraObjectsForIntersectCheck, !0)) != null ? l : [], s = [...n, ...a].sort((c, d) => c.distance - d.distance)[0];
+      s ? e = (s == null ? void 0 : s.distance) + t > this.transformedPosition.distanceTo(this.five.camera.position) : e = !0, this.visibles[1] = e;
     });
-    var a, h, l;
-    this.five = e, this.fiveUtil = (a = e.__fiveUtil__) != null ? a : e.__fiveUtil__ = new U(e), this.originPosition = t ? f(t).clone() : void 0, this.transformedPosition = (h = this.originPosition) == null ? void 0 : h.clone(), this.positionsForRotate = (l = r == null ? void 0 : r.positionsForRotate) == null ? void 0 : l.map((o) => f(o).clone()), this.config = r != null ? r : {}, this.container = (() => {
-      const o = document.createElement("div");
-      return o.classList.add("light-tag"), o.style.width = "0", o.style.height = "0", o.style.position = "absolute", o.style.transition = "opacity 0.2s linear", o;
+    var n, a, h;
+    this.five = e, this.fiveUtil = (n = e.__fiveUtil__) != null ? n : e.__fiveUtil__ = new w(e), this.originPosition = t ? f(t).clone() : void 0, this.transformedPosition = (a = this.originPosition) == null ? void 0 : a.clone(), this.positionsForRotate = (h = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : h.map((s) => f(s).clone()), this.config = o != null ? o : {}, this.container = (() => {
+      const s = document.createElement("div");
+      return s.classList.add("light-tag"), s.style.width = "0", s.style.height = "0", s.style.position = "absolute", s.style.transition = "opacity 0.2s linear", s;
     })(), this.addResizeListener(), this.show(), this.enable(), setTimeout(() => {
       this.updateVisible(), this.needsRender = !0;
     }, 0);
@@ -127,31 +153,36 @@ class F {
    * @description 启用标签
    */
   enable() {
-    var r, a, h, l, o;
-    if (this.enabled)
-      return;
-    this.enabled = !0, this.wrapper = (h = (a = this.config.wrapper) != null ? a : (r = this.five.getElement()) == null ? void 0 : r.parentElement) != null ? h : document.body;
-    const e = `light-tag-wrapper-${(o = (l = this.config) == null ? void 0 : l.namespace) != null ? o : "default"}`;
-    if (!this.tagWrapper) {
-      let n = Array.from(this.wrapper.children).find((s) => s.id === e);
-      if (!n) {
-        const s = document.createElement("div");
-        n = s, s.id = e, s.style.position = "absolute", s.style.overflow = "hidden", s.style.top = "0", s.style.left = "0", s.style.width = "100%", s.style.height = "100%", s.style.pointerEvents = "none", s.style.zIndex = "1", this.wrapper.appendChild(n);
+    return u(this, null, function* () {
+      var o, n, a, h;
+      if (this.enabled || (this.enabled = !0, yield F(this.five), !this.enabled))
+        return;
+      if (this.wrapper = (n = this.config.wrapper) != null ? n : (o = this.five.getElement()) == null ? void 0 : o.parentElement, !this.wrapper) {
+        console.error("lighttag: wrapper is required");
+        return;
       }
-      this.tagWrapper = n;
-    }
-    this.tagWrapper.appendChild(this.container), this.updateVisible();
-    const t = E(this.five, this.onFiveEveryReady);
-    this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("cameraFovUpdate", this.onCameraFovUpdate), this.five.on("panoArrived", this.onPanoArrived), this.five.on("modeChange", this.onModeChange), this.disposer = () => {
-      t(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("cameraFovUpdate", this.onCameraFovUpdate), this.five.off("panoArrived", this.onPanoArrived), this.five.off("modeChange", this.onModeChange);
-    };
+      const e = `light-tag-wrapper-${(h = (a = this.config) == null ? void 0 : a.namespace) != null ? h : "default"}`;
+      if (!this.tagWrapper) {
+        let s = Array.from(this.wrapper.children).find((i) => i.id === e);
+        if (!s) {
+          const i = document.createElement("div");
+          s = i, i.id = e, i.style.position = "absolute", i.style.overflow = "hidden", i.style.top = "0", i.style.left = "0", i.style.width = "100%", i.style.height = "100%", i.style.pointerEvents = "none", i.style.zIndex = "1", this.wrapper.appendChild(s);
+        }
+        this.tagWrapper = s;
+      }
+      this.tagWrapper.appendChild(this.container), this.updateVisible();
+      const t = E(this.five, this.onFiveEveryReady);
+      this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("cameraFovUpdate", this.onCameraFovUpdate), this.five.on("panoArrived", this.onPanoArrived), this.five.on("modeChange", this.onModeChange), this.disposer = () => {
+        t(), this.five.off("cameraUpdate", this.onCameraUpdate), this.five.off("cameraFovUpdate", this.onCameraFovUpdate), this.five.off("panoArrived", this.onPanoArrived), this.five.off("modeChange", this.onModeChange);
+      };
+    });
   }
   /**
    * @description 禁用标签
    */
   disable() {
-    var e;
-    this.enabled && (this.enabled = !1, this.tagWrapper.removeChild(this.container), (e = this.disposer) == null || e.call(this));
+    var e, t;
+    this.enabled && (this.enabled = !1, (e = this.tagWrapper) == null || e.removeChild(this.container), (t = this.disposer) == null || t.call(this));
   }
   /**
    * @description 销毁标签，并释放相关资源
@@ -165,56 +196,56 @@ class F {
    * @param positionsForRotate 用于 css 旋转的斜线的两个端点
    */
   setPosition(e, t) {
-    this.transformedPosition = f(e).clone(), this.positionsForRotate = t == null ? void 0 : t.map((r) => f(r).clone()), this.onCameraUpdate(), setTimeout(() => this.onCameraUpdate(), 0);
+    this.transformedPosition = f(e).clone(), this.positionsForRotate = t == null ? void 0 : t.map((o) => f(o).clone()), this.onCameraUpdate(), setTimeout(() => this.onCameraUpdate(), 0);
   }
   setTransformMatrix(e) {
     var t;
     this.transformedPosition = (t = this.originPosition) == null ? void 0 : t.clone().applyMatrix4(e), this.onCameraUpdate();
   }
   updateScreenPosition() {
-    var h;
+    var a;
     if (!this.transformedPosition) {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const e = (h = this.five.renderer) == null ? void 0 : h.getSize(w);
+    const e = (a = this.five.renderer) == null ? void 0 : a.getSize(R);
     if (!e) {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const t = v(this.five.camera, this.transformedPosition, e);
+    const t = m(this.five.camera, this.transformedPosition, e);
     if (!t) {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const r = (() => {
+    const o = (() => {
       if (!this.simulate3D)
         return 1;
-      const l = 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 - l * o / 40, 1), 0.5);
-    })(), a = (() => {
+      const h = 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 - h * s / 40, 1), 0.5);
+    })(), n = (() => {
       if (this.positionsForRotate === void 0 || this.positionsForRotate.length !== 2)
         return 0;
-      const [l, o] = this.positionsForRotate, n = v(this.five.camera, l, e), s = v(this.five.camera, o, e);
-      if (!n || !s)
+      const [h, s] = this.positionsForRotate, i = m(this.five.camera, h, e), l = m(this.five.camera, s, e);
+      if (!i || !l)
         return 0;
-      const d = n.leftPx > s.leftPx ? s : n, p = n.leftPx > s.leftPx ? n : s, u = p.leftPx - d.leftPx, y = p.topPx - d.topPx;
-      return Math.atan2(y, u) * (180 / Math.PI);
+      const c = i.leftPx > l.leftPx ? l : i, d = i.leftPx > l.leftPx ? i : l, y = d.leftPx - c.leftPx, b = d.topPx - c.topPx;
+      return Math.atan2(b, y) * (180 / Math.PI);
     })();
-    this.container.style.left = t.leftPx + "px", this.container.style.top = t.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${r})`, a && (this.container.style.transform += ` rotate(${a}deg)`);
+    this.container.style.left = t.leftPx + "px", this.container.style.top = t.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${o})`, n && (this.container.style.transform += ` rotate(${n}deg)`);
   }
   addResizeListener() {
     const e = this.five.getElement();
     if (e) {
-      const { observe: t, unobserve: r } = x(this.onCameraUpdate, e);
-      t(), this.disposers.push(r);
+      const { observe: t, unobserve: o } = x(this.onCameraUpdate, e);
+      t(), this.disposers.push(o);
     }
   }
 }
-function z(...c) {
-  return new F(...c);
+function J(...p) {
+  return new M(...p);
 }
 export {
-  F as LightTag,
-  z as tag
+  M as LightTag,
+  J as tag
 };

package/package.json

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