@realsee/dnalogel 3.28.6 → 3.28.8

package/libs/PanoTagPlugin/utils/tag/format.d.ts

@@ -1,4 +1,5 @@
 import type { StickType, Tag } from '../../typings';
+export declare function getTagStickType(tag: Tag): StickType;
 export default function formatTag<T extends Tag>(tag: T): tag is T & {
     stickType: StickType;
 };

package/libs/PanoTagPlugin/utils/tag/format.js

@@ -1,10 +1,9 @@
 function o(e) {
+  return e.pointType === "PointTag" && e.dimensionType === "3D" ? "3DPoint" : e.pointType === "PlaneTag" ? "Plane" : "2DPoint";
+}
+function p(e) {
   var t, i, a, r;
-  if (!e.stickType) {
-    const n = (() => e.pointType === "PointTag" && e.dimensionType === "3D" ? "3DPoint" : e.pointType === "PlaneTag" ? "Plane" : "2DPoint")();
-    e.stickType = n;
-  }
-  if (e.contentType === "VRLink" || e.contentType === "PanoLink" || e.contentType === "Link") {
+  if (e.stickType || (e.stickType = o(e)), e.contentType === "VRLink" || e.contentType === "PanoLink" || e.contentType === "Link") {
     const n = e;
     !((i = (t = n.data) == null ? void 0 : t.icon) != null && i.url) && !((r = (a = n.style) == null ? void 0 : a.point) != null && r.url) && (n.data.icon = {
       url: "//vrlab-static.ljcdn.com/release/web/test.09dee741.png",
@@ -16,5 +15,6 @@ function o(e) {
   }), e;
 }
 export {
-  o as default
+  p as default,
+  o as getTagStickType
 };

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.28.6");
+    i(this, "VERSION", "3.28.8");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

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

@@ -1,23 +1,23 @@
 var v = Object.defineProperty, S = Object.defineProperties;
 var H = Object.getOwnPropertyDescriptors;
-var m = Object.getOwnPropertySymbols;
+var c = Object.getOwnPropertySymbols;
 var b = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
 var f = (o, s, e) => s in o ? v(o, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[s] = e, p = (o, s) => {
   for (var e in s || (s = {}))
     b.call(s, e) && f(o, e, s[e]);
-  if (m)
-    for (var e of m(s))
+  if (c)
+    for (var e of c(s))
       w.call(s, e) && f(o, e, s[e]);
   return o;
 }, u = (o, s) => S(o, H(s));
 var i = (o, s, e) => (f(o, typeof s != "symbol" ? s + "" : s, e), e);
 import { PointSelectorHelper as E } from "./PointSelectorHelper.js";
-import { isTouchDevice as F } from "../isTouchDevice.js";
-import y from "hammerjs";
-import { Subscribe as I } from "../Subscribe.js";
+import { isTouchDevice as y } from "../isTouchDevice.js";
+import N from "hammerjs";
+import { Subscribe as F } from "../Subscribe.js";
 import { getIntersectByNdcPosition as d } from "../five/getPosition.js";
 const a = () => !1;
-class x extends I {
+class U extends F {
   constructor(e, t) {
     var r, l;
     super();
@@ -62,6 +62,11 @@ class x extends I {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
     });
     i(this, "onTap", (e) => {
+      if (e != null && e.center && (this.mousePosition = {
+        clientX: e.center.x,
+        clientY: e.center.y
+      }), !this.mouseNdcPosition)
+        return;
       const t = d(this.five, this.mouseNdcPosition);
       t != null && t.face && this.select(t);
     });
@@ -70,7 +75,10 @@ class x extends I {
      * 2. 如果有长按点，把长按点位置更新为当前位置
      */
     i(this, "onPan", (e) => {
-      if (!this.pressDown)
+      if (!this.pressDown || (e != null && e.center && (this.mousePosition = {
+        clientX: e.center.x,
+        clientY: e.center.y
+      }), !this.mouseNdcPosition))
         return;
       const t = d(this.five, this.mouseNdcPosition);
       t != null && t.face && this.updatePointSelectorHelperIntersect(t);
@@ -79,6 +87,11 @@ class x extends I {
      * @description: 长按屏幕后，更新长按点的位置
      */
     i(this, "onPress", (e) => {
+      if (e != null && e.center && (this.mousePosition = {
+        clientX: e.center.x,
+        clientY: e.center.y
+      }), !this.mouseNdcPosition)
+        return;
       const t = d(this.five, this.mouseNdcPosition);
       t != null && t.face && (this.pressDown = !0, this.updatePointSelectorHelperIntersect(t));
     });
@@ -119,9 +132,9 @@ class x extends I {
       const t = this.five.getElement();
       if (!t)
         return null;
-      const { top: n, left: h, width: r, height: l } = t.getBoundingClientRect(), { clientX: c, clientY: P } = e;
+      const { top: n, left: h, width: r, height: l } = t.getBoundingClientRect(), { clientX: m, clientY: P } = e;
       return {
-        x: (c - h) / r,
+        x: (m - h) / r,
         y: 1 - (P - n) / l
       };
     });
@@ -137,7 +150,7 @@ class x extends I {
     });
     this.five = e;
     const n = (r = t == null ? void 0 : t.mode) != null ? r : "auto";
-    n === "auto" ? this.mode = F ? "fixed" : "cursor" : this.mode = n;
+    n === "auto" ? this.mode = y ? "fixed" : "cursor" : this.mode = n;
     const h = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
@@ -159,7 +172,7 @@ class x extends I {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new y(e)), this.mode === "cursor" ? (this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", a), this.five.on("wantsChangeMode", a), this.five.on("wantsTapGesture", a), 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.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
+    this.hammer || (this.hammer = new N(e)), this.mode === "cursor" ? (this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.five.on("wantsMoveToPano", a), this.five.on("wantsChangeMode", a), this.five.on("wantsTapGesture", a), 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.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
   }
   disable() {
     if (!this.enabled)
@@ -176,5 +189,5 @@ class x extends I {
   }
 }
 export {
-  x as PointSelector
+  U as PointSelector
 };

package/package.json

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