@realsee/dnalogel 3.44.3 → 3.44.5

package/libs/PanoTagPlugin/utils/DebugUtil.js

@@ -1,16 +1,55 @@
-var l = Object.defineProperty;
-var t = (s, i, e) => i in s ? l(s, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[i] = e;
-var n = (s, i, e) => (t(s, typeof i != "symbol" ? i + "" : i, e), e);
-import { safeObj as a } from "../../shared-utils/safeObj.js";
-class r {
+var c = Object.defineProperty;
+var a = (t, i, e) => i in t ? c(t, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[i] = e;
+var o = (t, i, e) => (a(t, typeof i != "symbol" ? i + "" : i, e), e);
+import { safeObj as g } from "../../shared-utils/safeObj.js";
+import { addDebugPoints as d } from "./addDebugPoints.js";
+import "three";
+import "../../shared-utils/positionToVector3.js";
+class y {
   constructor(i) {
-    n(this, "plugin");
+    o(this, "plugin");
+    o(this, "logBinded", !1);
     this.plugin = i;
   }
+  get debug() {
+    return this.plugin.debug;
+  }
+  addDebugPoints() {
+    try {
+      d(this.plugin.five, this.plugin.tags);
+    } catch (i) {
+      console.error(i);
+    }
+  }
+  bindLog() {
+    if (this.logBinded)
+      return;
+    this.logBinded = !0;
+    const i = (e) => {
+      Object.getOwnPropertyNames(e).forEach((n) => {
+        typeof e[n] == "function" && (e[n] = new Proxy(e[n], {
+          apply: (s, l, r) => (["render"].includes(n) || this.addLog(n, ...r), s.apply(l, r))
+        }));
+      });
+    };
+    i(this.plugin), i(this.plugin.constructor.prototype);
+  }
+  addLog(i, ...e) {
+    if (this.debug) {
+      let n = new Error().stack;
+      console.debug(
+        `%cPanoTagPlugin%c${i}`,
+        "background-color: #35e0ed; color: black; padding:0 6px; border-radius: 3px",
+        "padding: 0 3px; color: #f3f47c",
+        ...e,
+        { stack: n }
+      );
+    }
+  }
   closeIntersectRaycaster() {
     this.plugin.tags.forEach((i) => {
       var e;
-      a((e = i == null ? void 0 : i.initialConfig) == null ? void 0 : e.visibleConfig).intersectRaycaster && (i.initialConfig.visibleConfig.intersectRaycaster.enabled = !1);
+      g((e = i == null ? void 0 : i.initialConfig) == null ? void 0 : e.visibleConfig).intersectRaycaster && (i.initialConfig.visibleConfig.intersectRaycaster.enabled = !1);
     }), this.plugin.changeGlobalConfig({
       visibleConfig: {
         intersectRaycaster: {
@@ -21,5 +60,5 @@ class r {
   }
 }
 export {
-  r as DebugUtil
+  y as DebugUtil
 };

package/libs/base/BasePlugin.js

@@ -16,7 +16,7 @@ let c = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "3.44.3");
+    e(this, "VERSION", "3.44.5");
     e(this, "NAME");
     e(this, "five");
     e(this, "workUtil");

package/libs/index.js

@@ -276,7 +276,6 @@ import "./vendor/gl-vec2/dot.js";
 import "./shared-utils/math/intersecting.js";
 import "./shared-utils/five/mode.js";
 import "./shared-utils/three/blink.js";
-import "./PanoTagPlugin/utils/addDebugPoints.js";
 import "./PanoTagPlugin/utils/tag/tagCheck.js";
 import "./PanoTagPlugin/utils/debounce.js";
 import "./PanoTagPlugin/utils/throttle.js";
@@ -376,6 +375,7 @@ import "./PanoTagPlugin/utils/normalPositionToPositions.js";
 import "./shared-utils/five/FiveDomEvents.js";
 import "./shared-utils/three/THREERaycaster.js";
 import "./PanoTagPlugin/utils/DebugUtil.js";
+import "./PanoTagPlugin/utils/addDebugPoints.js";
 import "./PanoTagPlugin/controller/Tag/PointTag.js";
 import "./PanoTagPlugin/utils/requestIdleCallback.js";
 import "./PanoTagPlugin/controller/Tag/PlaneTag.js";

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.44.3",
+    "%c %c@realsee/dnalogel %cv3.44.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/three/PointSelector/index.js

@@ -2,22 +2,22 @@ var P = Object.defineProperty, E = Object.defineProperties;
 var S = Object.getOwnPropertyDescriptors;
 var p = Object.getOwnPropertySymbols;
 var w = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
-var f = (n, s, e) => s in n ? P(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e, l = (n, s) => {
+var f = (o, s, e) => s in o ? P(o, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[s] = e, l = (o, s) => {
   for (var e in s || (s = {}))
-    w.call(s, e) && f(n, e, s[e]);
+    w.call(s, e) && f(o, e, s[e]);
   if (p)
     for (var e of p(s))
-      C.call(s, e) && f(n, e, s[e]);
-  return n;
-}, c = (n, s) => E(n, S(s));
-var i = (n, s, e) => (f(n, typeof s != "symbol" ? s + "" : s, e), e);
-import { PointSelectorHelper as b } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as y } from "../../isTouchDevice.js";
+      C.call(s, e) && f(o, e, s[e]);
+  return o;
+}, c = (o, s) => E(o, S(s));
+var i = (o, s, e) => (f(o, typeof s != "symbol" ? s + "" : s, e), e);
+import { PointSelectorHelper as y } from "./utils/PointSelectorHelper.js";
+import { isTouchDevice as b } from "../../isTouchDevice.js";
 import H from "hammerjs";
 import { Subscribe as F } from "../../Subscribe.js";
 import { getIntersectByNdcPosition as d } from "../../five/getPosition.js";
 const h = () => !1;
-class B extends F {
+class M extends F {
   constructor(e, t) {
     var a, u;
     super();
@@ -122,24 +122,24 @@ class B extends F {
       }
       this.onEnter(), this.five.getElement().style.cursor = "";
       const t = l({}, e);
-      let o = !1;
+      let n = !1;
       if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number") {
         for (const r of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
           if (r.distanceTo(e.point) < this.adherePointsRadius) {
-            t.point = r.clone(), o = !0;
+            t.point = r.clone(), n = !0;
             break;
           }
       }
-      this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t, o);
+      this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t, n);
     });
     i(this, "mousePositionToNdcPosition", (e) => {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: o, left: r, width: a, height: u } = t.getBoundingClientRect(), { clientX: m, clientY: v } = e;
+      const { top: n, left: r, width: a, height: u } = t.getBoundingClientRect(), { clientX: m, clientY: v } = e;
       return {
         x: (m - r) / a,
-        y: 1 - (v - o) / u
+        y: 1 - (v - n) / u
       };
     });
     i(this, "onFiveWantsPanGesture", () => {
@@ -153,13 +153,13 @@ class B extends F {
       this.emit("intersectionUpdate", e);
     });
     this.five = e, this.config = t != null ? t : {};
-    const o = (a = t == null ? void 0 : t.mode) != null ? a : "auto";
-    o === "auto" ? this.mode = y ? "fixed" : "cursor" : this.mode = o;
+    const n = (a = t == null ? void 0 : t.mode) != null ? a : "auto";
+    n === "auto" ? this.mode = b ? "fixed" : "cursor" : this.mode = n;
     const r = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new b(e, c(l({}, t == null ? void 0 : t.helper), {
+    this.pointSelectorHelper = new y(e, c(l({}, t == null ? void 0 : t.helper), {
       magnifierParams: l(l({}, r), (u = t == null ? void 0 : t.helper) == null ? void 0 : u.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
@@ -188,7 +188,7 @@ class B extends F {
       return;
     this.enabled = !1, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
     const e = this.five.getElement();
-    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", h), this.five.off("wantsChangeMode", h), this.five.off("wantsTapGesture", h), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
+    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", h), this.five.off("wantsChangeMode", h), this.five.off("wantsTapGesture", h), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.updateByMousePosition), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
@@ -198,5 +198,5 @@ class B extends F {
   }
 }
 export {
-  B as PointSelector
+  M as PointSelector
 };

package/libs/shared-utils/three/PointSelector/utils/PointHelper.js

@@ -1,10 +1,10 @@
-var a = Object.defineProperty;
-var i = (r, n, e) => n in r ? a(r, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[n] = e;
-var s = (r, n, e) => (i(r, typeof n != "symbol" ? n + "" : n, e), e);
+var i = Object.defineProperty;
+var a = (n, r, e) => r in n ? i(n, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[r] = e;
+var s = (n, r, e) => (a(n, typeof r != "symbol" ? r + "" : r, e), e);
 import * as t from "three";
 import { POINT_HELPER_TEXTURE_URL as l } from "../../Assets/index.js";
-import { CSS3DObjectPlus as c } from "../../../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
-import { rangePieceImg as h } from "./html.js";
+import { CSS3DObjectPlus as h } from "../../../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
+import { rangePieceImg as c } from "./html.js";
 import { initialCSS3DRender as d } from "../../../five/initialCSS3DRender.js";
 const p = `
 varying vec2 vUv;
@@ -23,37 +23,37 @@ void main() {
 }
 `;
 function M() {
-  const r = new t.PlaneGeometry(0.4, 0.4), n = l, e = new t.TextureLoader().load(n);
+  const n = new t.PlaneGeometry(0.4, 0.4), r = l, e = new t.TextureLoader().load(r);
   e.encoding = t.sRGBEncoding, e.minFilter = t.LinearFilter;
   const o = new t.MeshBasicMaterial({
     map: e,
     transparent: !0,
     depthTest: !1
   });
-  return new t.Mesh(r, o);
+  return new t.Mesh(n, o);
 }
 function m() {
-  const r = new t.CurvePath();
-  r.add(new t.LineCurve3(new t.Vector3(0, 0, 0), new t.Vector3(0, 0, 0.1)));
-  const n = new t.TubeGeometry(r, 8, 3e-3), e = new t.ShaderMaterial({
+  const n = new t.CurvePath();
+  n.add(new t.LineCurve3(new t.Vector3(0, 0, 0), new t.Vector3(0, 0, 0.1)));
+  const r = new t.TubeGeometry(n, 8, 3e-3), e = new t.ShaderMaterial({
     vertexShader: p,
     fragmentShader: u,
     depthTest: !1,
     transparent: !0
   });
-  return new t.Mesh(n, e);
+  return new t.Mesh(r, e);
 }
 function v() {
-  const r = new t.SphereGeometry(0.01, 20, 20), n = new t.MeshBasicMaterial({
+  const n = new t.SphereGeometry(0.01, 20, 20), r = new t.MeshBasicMaterial({
     color: 10349931,
     depthTest: !1,
     transparent: !0,
     side: t.DoubleSide
-  }), e = new t.Mesh(r, n);
+  }), e = new t.Mesh(n, r);
   return e.position.set(0, 0, 0.1), e;
 }
 function w() {
-  const n = new c({
+  const r = new h({
     pointerEvents: "none",
     cornerPoints: [
       new t.Vector3(-0.2, 0.2, 0),
@@ -62,7 +62,7 @@ function w() {
       new t.Vector3(0.2, 0.2, 0)
     ]
   }), e = document.createElement("div");
-  return e.style.width = "100%", e.style.height = "100%", e.style.backgroundImage = `url(${h})`, e.style.backgroundSize = "100%", e.style.backgroundRepeat = "no-repeat", n.container.appendChild(e), n;
+  return e.style.width = "100%", e.style.height = "100%", e.style.backgroundImage = `url(${c})`, e.style.backgroundSize = "100%", e.style.backgroundRepeat = "no-repeat", r.container.appendChild(e), r;
 }
 class x extends t.Object3D {
   constructor(e) {
@@ -80,10 +80,10 @@ class x extends t.Object3D {
     this.position.copy(e.point), this.lookAt(o);
   }
   show() {
-    this.visible = !0;
+    this.visible = !0, this.borderMesh.parent || this.add(this.borderMesh);
   }
   hide() {
-    this.visible = !1;
+    this.visible = !1, this.remove(this.borderMesh);
   }
   dispose() {
     var e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.44.3",
+  "version": "3.44.5",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.2.0-alpha.1",
+    "@realsee/five": "6.1.2",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",