@realsee/dnalogel 2.21.0-dev.12 → 2.21.0-dev.14

package/libs/PanoMeasurePlugin/utils/dom/distanceItem.js

@@ -1,20 +1,21 @@
-var $ = Object.defineProperty, w = Object.defineProperties;
-var H = Object.getOwnPropertyDescriptors;
+var $ = Object.defineProperty, j = Object.defineProperties;
+var w = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
-var j = Object.prototype.hasOwnProperty, v = Object.prototype.propertyIsEnumerable;
-var u = (n, e, t) => e in n ? $(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t, b = (n, e) => {
-  for (var t in e || (e = {}))
-    j.call(e, t) && u(n, t, e[t]);
+var H = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
+var u = (e, n, t) => n in e ? $(e, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[n] = t, b = (e, n) => {
+  for (var t in n || (n = {}))
+    H.call(n, t) && u(e, t, n[t]);
   if (P)
-    for (var t of P(e))
-      v.call(e, t) && u(n, t, e[t]);
-  return n;
-}, y = (n, e) => w(n, H(e));
-var C = (n, e, t) => (u(n, typeof e != "symbol" ? e + "" : e, t), t);
-import { ItemDom as z } from "./base.js";
+    for (var t of P(n))
+      z.call(n, t) && u(e, t, n[t]);
+  return e;
+}, y = (e, n) => j(e, w(n));
+var C = (e, n, t) => (u(e, typeof n != "symbol" ? n + "" : n, t), t);
+import { ItemDom as F } from "./base.js";
 import { Vector2 as I } from "three";
 import { isNDCPointInFront as g } from "../isNDCPointInScreen.js";
-class V extends z {
+import { centerPoint as Y } from "../../../shared-utils/three/centerPoint.js";
+class A extends F {
   constructor(t) {
     var o;
     t.contentStyle = y(b({}, t.contentStyle), {
@@ -35,28 +36,28 @@ class V extends z {
     const o = t.getElement();
     if (!o)
       return;
-    const l = o.clientWidth, r = o.clientHeight, a = l / 2, c = r / 2;
+    const a = o.clientWidth, r = o.clientHeight, d = a / 2, c = r / 2;
     if (this.line.points.length < 2)
       return;
-    const [h, d] = this.line.points, i = h.position.clone().project(t.camera), s = d.position.clone().project(t.camera), m = i.clone().lerp(s, 0.5), p = new I(i.x * a, i.y * c), f = new I(s.x * a, s.y * c), x = p.distanceTo(f);
+    const [l, h] = this.line.points, i = l.position.clone().project(t.camera), s = h.position.clone().project(t.camera), m = Y(l.position, h.position).clone().project(t.camera), p = new I(i.x * d, i.y * c), f = new I(s.x * d, s.y * c), x = p.distanceTo(f);
     if ((() => !(Math.abs(i.z) > 1 || Math.abs(s.z) > 1 || !g(i) && !g(s) || !g(m) || x === 0))() === !1) {
       this.hide();
       return;
     }
-    const S = (m.x + 1) / 2 * l, E = -(m.y - 1) / 2 * r, M = -(Math.atan((p.y - f.y) / (p.x - f.x)) * 180) / Math.PI, T = this.containerDom.parentElement && this.contentDom.clientWidth > x ? -20 : 0;
+    const S = (m.x + 1) / 2 * a, E = -(m.y - 1) / 2 * r, M = -(Math.atan((p.y - f.y) / (p.x - f.x)) * 180) / Math.PI, T = this.containerDom.parentElement && this.contentDom.clientWidth > x ? -20 : 0;
     this.containerDom.style.transform = `translate(${S}px, ${E}px) rotate(${M}deg) translateY(${T}px)`, this.show(), (D = this.params.userDistanceItem) == null || D.update({ line: this.line, polyline: this.line.getPolyline() });
     const W = this.getCurrentContent();
     this.contentDom.innerText = W;
   }
   /** 获取内容文本 */
   getCurrentContent() {
-    var h, d, i, s;
+    var l, h, i, s;
     if (this.line.points.length < 2)
       return "";
-    const [t, o] = this.line.points, l = t.position.clone().distanceTo(o.position), r = (d = this.line.text) != null ? d : (h = this.line.model.config) == null ? void 0 : h.defaultText, a = (s = (i = this.line.model.config) == null ? void 0 : i.getDistanceText) == null ? void 0 : s.call(i, l), c = r != null ? r : a;
-    return c != null ? c : l.toFixed(2) + "m";
+    const [t, o] = this.line.points, a = t.position.clone().distanceTo(o.position), r = (h = this.line.text) != null ? h : (l = this.line.model.config) == null ? void 0 : l.defaultText, d = (s = (i = this.line.model.config) == null ? void 0 : i.getDistanceText) == null ? void 0 : s.call(i, a), c = r != null ? r : d;
+    return c != null ? c : a.toFixed(2) + "m";
   }
 }
 export {
-  V as DistanceItem
+  A as DistanceItem
 };

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "2.21.0-dev.12");
+    i(this, "VERSION", "2.21.0-dev.14");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv2.21.0-dev.12",
+    "%c %c@realsee/dnalogel %cv2.21.0-dev.14",
     [
       "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/Magnifier.js

@@ -2,11 +2,11 @@ var p = Object.defineProperty;
 var P = (s, t, e) => t in s ? p(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
 var a = (s, t, e) => (P(s, typeof t != "symbol" ? t + "" : t, e), e);
 import w from "hammerjs";
-import * as g from "three";
+import * as v from "three";
 import { Subscribe as D } from "@realsee/five";
 function l(s, t, e) {
   const n = s[t], i = s[e];
-  !n || !i || (s[t] = i, s[e] = n);
+  n === void 0 || i === void 0 || (s[t] = i, s[e] = n);
 }
 function C(s, t, e) {
   const n = e / 2;
@@ -30,7 +30,7 @@ class H {
     a(this, "config");
     a(this, "offset", { x: 0, y: 0 });
     a(this, "context");
-    a(this, "renderCenter", new g.Vector3());
+    a(this, "renderCenter", new v.Vector3());
     a(this, "hammer");
     a(this, "state", { enabled: !1 });
     a(this, "onPan", (t) => {
@@ -98,7 +98,7 @@ class H {
   render() {
     if (!this.five.renderer || !this.containerDom)
       return;
-    const { scale: t, context: e, width: n, height: i } = this, h = this.renderCenter.clone().project(this.five.camera), r = this.five.renderer.getSize(new g.Vector2()), o = 1, c = n / t, v = i / t, u = o * t, y = (h.x + 1) / 2 * r.x, b = (h.y + 1) / 2 * r.y, d = this.five.getPixels(y - c / 2, b - c / 2, c, v, u), f = Math.floor(n * o), x = Math.floor(i * o);
+    const { scale: t, context: e, width: n, height: i } = this, h = this.renderCenter.clone().project(this.five.camera), r = this.five.renderer.getSize(new v.Vector2()), o = 1, c = n / t, g = i / t, u = o * t, y = (h.x + 1) / 2 * r.x, b = (h.y + 1) / 2 * r.y, d = this.five.getPixels(y - c / 2, b - c / 2, c, g, u), f = Math.floor(n * o), x = Math.floor(i * o);
     C(d, f, x);
     const m = new ImageData(f, x);
     m.data.set(d), e.putImageData(m, 0, 0);

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

@@ -9,16 +9,16 @@ var p = (s, e, t) => e in s ? u(s, e, { enumerable: !0, configurable: !0, writab
     for (var t of m(e))
       w.call(e, t) && p(s, t, e[t]);
   return s;
-}, l = (s, e) => v(s, P(e));
+}, c = (s, e) => v(s, P(e));
 var i = (s, e, t) => (p(s, typeof e != "symbol" ? e + "" : e, t), t);
 import { Subscribe as H } from "@realsee/five";
 import { PointSelectorHelper as y } from "./PointSelectorHelper.js";
 import { isTouchDevice as b } from "../isTouchDevice.js";
 import U from "hammerjs";
 import { getIntersectionFromEvent as d } from "../getIntersectionFromEvent.js";
-import { Vector3 as E, Object3D as F, Face3 as I, Vector2 as M, Raycaster as O } from "three";
+import { Vector3 as E, Object3D as M, Face3 as F, Vector2 as I, Raycaster as O } from "three";
 import { getIntersectFromRelativePosition as k } from "./getIntersect.js";
-const c = () => !1;
+const l = () => !1;
 class W {
   constructor(e, t) {
     i(this, "hook", new H());
@@ -83,7 +83,7 @@ class W {
      * @description: 手指抬起后，重置pressDown状态
      */
     i(this, "onPanEnd", () => {
-      this.pressDown = !1, this.select();
+      this.pressDown && (this.pressDown = !1, this.select());
     });
     i(this, "intersectionOnModelUpdate", (e) => {
       this.pointSelectorHelper.show(), this.updatePointSelectorHelperIntersect(e);
@@ -102,7 +102,7 @@ class W {
      * @description: 根据鼠标位置更新helper位置
      */
     i(this, "updateByNdcPosition", (e) => {
-      const t = k(this.five, e), o = (() => t ? l(a({}, t), { isVirtual: !1 }) : l(a({}, G(this.five, e)), { isVirtual: !0 }))();
+      const t = k(this.five, e), o = (() => t ? c(a({}, t), { isVirtual: !1 }) : c(a({}, x(this.five, e)), { isVirtual: !0 }))();
       this.updatePointSelectorHelperIntersect(o);
     });
     /**
@@ -139,7 +139,7 @@ class W {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new y(e, l(a({}, t == null ? void 0 : t.pointSelectorHelperParams), {
+    this.pointSelectorHelper = new y(e, c(a({}, t == null ? void 0 : t.pointSelectorHelperParams), {
       magnifierParams: a(a({}, r), (h = t == null ? void 0 : t.pointSelectorHelperParams) == null ? void 0 : h.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
@@ -153,14 +153,14 @@ class W {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new U(e)), this.mode === "cursor" ? (this.five.on("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", c), this.five.on("wantsTapGesture", c), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate);
+    this.hammer || (this.hammer = new U(e)), this.mode === "cursor" ? (this.five.on("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", l), this.five.on("wantsChangeMode", l), this.five.on("wantsTapGesture", l), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate);
   }
   disable() {
     if (!this.enabled)
       return;
     this.enabled = !1, this.pointSelectorHelper.disable();
     const e = this.five.getElement();
-    this.five.off("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", c), this.five.off("wantsTapGesture", c), 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("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate);
+    this.five.off("intersectionOnModelUpdate", this.intersectionOnModelUpdate), this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", l), this.five.off("wantsChangeMode", l), this.five.off("wantsTapGesture", l), 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("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate);
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
@@ -169,17 +169,17 @@ class W {
     e ? this.adherePoints = Array.isArray(e) ? e : [e] : this.adherePoints = null, typeof t == "number" && (this.adherePointsRadius = t);
   }
 }
-function x(s, e) {
-  const { x: t, y: o } = e, r = t * 2 - 1, n = o * 2 - 1, h = new M().fromArray([r, n]), f = new O();
+function C(s, e) {
+  const { x: t, y: o } = e, r = t * 2 - 1, n = o * 2 - 1, h = new I().fromArray([r, n]), f = new O();
   return f.setFromCamera(h, s.camera), f;
 }
-function G(s, e) {
-  const t = x(s, e), o = 3, r = new E().addVectors(t.ray.origin, t.ray.direction.clone().normalize().multiplyScalar(o)), n = t.ray.direction.clone().negate();
+function x(s, e) {
+  const t = C(s, e), o = 3, r = new E().addVectors(t.ray.origin, t.ray.direction.clone().normalize().multiplyScalar(o)), n = t.ray.direction.clone().negate();
   return {
     distance: o,
     point: r,
-    object: new F(),
-    face: new I(0, 0, 0, n)
+    object: new M(),
+    face: new F(0, 0, 0, n)
   };
 }
 export {

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.21.0-dev.12",
+  "version": "2.21.0-dev.14",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",