@realsee/dnalogel 3.47.7 → 3.47.9

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -95,7 +95,7 @@ import "../../shared-utils/three/IObject3D.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/tag.js";
 import "../../shared-utils/five/vector3ToScreen.js";
-import "../../shared-utils/three/raycaster.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/floorplan/MapviewFloorplanPlugin/index.js

@@ -55,11 +55,11 @@ import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 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/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -94,7 +94,7 @@ import "../../shared-utils/three/IObject3D.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/tag.js";
 import "../../shared-utils/five/vector3ToScreen.js";
-import "../../shared-utils/three/raycaster.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/floorplan/ModelFloorplanPlugin/index.js

@@ -56,11 +56,11 @@ import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 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/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -65,11 +65,11 @@ import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 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/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/floorplan/PanoFloorplanRadarPlugin/index.js

@@ -36,11 +36,11 @@ import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 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/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -92,7 +92,7 @@ import "../../shared-utils/three/IObject3D.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/tag.js";
 import "../../shared-utils/five/vector3ToScreen.js";
-import "../../shared-utils/three/raycaster.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/floorplan/TopviewFloorplanPlugin/index.js

@@ -54,11 +54,11 @@ import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 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/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
+import "../../shared-utils/three/temp.js";
 import "../../Sculpt/utils/Modules/Global.js";
 import "../../Sculpt/utils/Modules/Cursor.js";
 import "../../Object3DHelperPlugin/Controller.js";

package/libs/index.js

@@ -83,12 +83,12 @@ import "./shared-utils/isNil.js";
 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 "./shared-utils/three/temp.js";
 import "./Sculpt/utils/Modules/Global.js";
 import "./Sculpt/utils/Modules/Cursor.js";
 import "./shared-utils/five/FiveDomEvents.js";

package/libs/shared-utils/five/vector3ToScreen.js

@@ -1,12 +1,10 @@
-import * as s from "three";
-new s.Vector2();
-function x(t, n, o) {
-  const { x: e, y: c, z: r } = n.clone().project(t);
+function i(t, n, o) {
+  const { x: c, y: e, z: r } = n.clone().project(t);
   return r > 1 ? void 0 : {
-    leftPx: (e + 1) / 2 * o.x,
-    topPx: (-c + 1) / 2 * o.y
+    leftPx: (c + 1) / 2 * o.x,
+    topPx: (-e + 1) / 2 * o.y
   };
 }
 export {
-  x as vector3ToScreen
+  i as vector3ToScreen
 };

package/libs/shared-utils/logger.js

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

@@ -7,6 +7,11 @@ export declare class LightTag {
     enabled: boolean;
     wrapper: HTMLElement;
     positionsForRotate?: THREE.Vector3[];
+    /**
+     * @description 碰撞检测
+     * @default true
+     */
+    intersectCheck: boolean;
     private tagWrapper;
     private five;
     private originPosition?;

package/libs/shared-utils/tag.js

@@ -1,44 +1,49 @@
 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);
+var s = (h, t, e) => (g(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 { _raycaster as m } from "./three/raycaster.js";
 import { FiveUtil as U } 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, s) {
-    o(this, "container");
-    o(this, "visible", !1);
-    o(this, "enabled", !1);
-    o(this, "wrapper");
-    o(this, "positionsForRotate");
-    o(this, "tagWrapper");
-    o(this, "five");
-    o(this, "originPosition");
-    o(this, "transformedPosition");
-    o(this, "disposer");
-    o(this, "config");
-    o(this, "fiveUtil");
-    o(this, "onCameraUpdate", () => {
+  constructor(t, e, o) {
+    s(this, "container");
+    s(this, "visible", !1);
+    s(this, "enabled", !1);
+    s(this, "wrapper");
+    s(this, "positionsForRotate");
+    /**
+     * @description 碰撞检测
+     * @default true
+     */
+    s(this, "intersectCheck", !0);
+    s(this, "tagWrapper");
+    s(this, "five");
+    s(this, "originPosition");
+    s(this, "transformedPosition");
+    s(this, "disposer");
+    s(this, "config");
+    s(this, "fiveUtil");
+    s(this, "onCameraUpdate", () => {
       this.visible !== !1 && this.updateScreenPosition();
     });
-    o(this, "onFiveEveryReady", () => {
+    s(this, "onFiveEveryReady", () => {
       var t;
-      if (this.visible && this.five.state.mode !== "Panorama") {
+      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 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");
+        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");
       }
     });
     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 = (() => {
+    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 = s != null ? s : {}, this.enable(), this.show();
+    })(), this.config = o != null ? o : {}, this.enable(), this.show();
   }
   show() {
     this.visible = !0, this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.onCameraUpdate();
@@ -47,10 +52,10 @@ class E {
     this.visible = !1, this.container.style.opacity = "0", this.container.style.pointerEvents = "none";
   }
   enable() {
-    var s, n, r, a;
+    var o, n, r, a;
     if (this.enabled)
       return;
-    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 : (() => {
+    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;
     })(), this.wrapper.contains(this.tagWrapper) || this.wrapper.appendChild(this.tagWrapper)), this.tagWrapper.appendChild(this.container);
@@ -88,7 +93,7 @@ class E {
       this.container.style.left = "-100%", this.container.style.top = "-100%";
       return;
     }
-    const s = (() => {
+    const o = (() => {
       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 = (() => {
@@ -97,7 +102,7 @@ class E {
       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(${s})`, 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(${o})`, n && (this.container.style.transform += ` rotate(${n}deg)`);
   }
 }
 function S(h, t, e) {

package/package.json

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