@realsee/dnalogel 3.49.14-alpha.0 → 3.49.14-alpha.1

package/dist/shared-utils/three/PointSelector/index.d.ts

@@ -72,7 +72,6 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private _outOfFive;
     private set enabled(value);
     private _enabled;
-    private hammer?;
     private mode;
     /** 长按屏幕的动作触发后为true，手指抬起后为false */
     private pressDown;
@@ -80,6 +79,8 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private adherePoints;
     /** 吸附点的半径 */
     private adherePointsRadius;
+    /** 有值时表明处于按压检查阶段 */
+    private setPressDown?;
     private lastFiveHelperVisible?;
     private lastIntersection?;
     private mousePosition;
@@ -108,19 +109,9 @@ export declare class PointSelector extends Subscribe<EventMap> {
      */
     private onLeave;
     private onClick;
-    /**
-     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
-     * 2. 如果有长按点，把长按点位置更新为当前位置
-     */
-    private onPan;
-    /**
-     * @description: 长按屏幕后，更新长按点的位置
-     */
-    private onPress;
-    /**
-     * @description: 手指抬起后，重置pressDown状态
-     */
-    private onPanEnd;
+    private onTouchStart;
+    private onTouchMove;
+    private onTouchEnd;
     private updateByMousePosition;
     /**
      * @description: 根据鼠标位置计算焦点位置并更新

package/libs/Sculpt/Objects/Point/index.js

@@ -11,7 +11,7 @@ var p = (e, i, t) => i in e ? g(e, i, { enumerable: !0, configurable: !0, writab
   return e;
 }, m = (e, i) => u(e, y(i));
 var c = (e, i, t) => (p(e, typeof i != "symbol" ? i + "" : i, t), t);
-var b = (e, i, t) => new Promise((h, n) => {
+var M = (e, i, t) => new Promise((h, n) => {
   var r = (s) => {
     try {
       o(t.next(s));
@@ -27,7 +27,7 @@ var b = (e, i, t) => new Promise((h, n) => {
   }, o = (s) => s.done ? h(s.value) : Promise.resolve(s.value).then(r, f);
   o((t = t.apply(e, i)).next());
 });
-import { PointMesh as M } from "../../Meshes/Point.js";
+import { PointMesh as b } from "../../Meshes/Point.js";
 import { BaseObject as v } from "../Base/index.js";
 import { PointEditor as x } from "./Editor.js";
 import { vector3ToArray as E } from "../../../shared-utils/three/vector3ToArray.js";
@@ -36,7 +36,7 @@ class C extends v {
     super(t, h);
     c(this, "type", "Point");
     c(this, "pointMesh");
-    this.editor = new x(this), t && (this.pointMesh = new M(a(a({}, t.style), t)), this.add(this.pointMesh));
+    this.editor = new x(this), t && (this.pointMesh = new b(a(a({}, t.style), t)), this.add(this.pointMesh));
   }
   get data() {
     return m(a({}, this.baseData), {
@@ -67,8 +67,8 @@ class C extends v {
    * @description: 创建点
    */
   create(t) {
-    return b(this, null, function* () {
-      this.pointMesh && this.remove(this.pointMesh), this.add(this.pointMesh = new M(t)), yield U(this.pointMesh, this.pointSelector), this.editor.enable();
+    return M(this, null, function* () {
+      this.pointMesh && this.remove(this.pointMesh), this.add(this.pointMesh = new b(t)), yield U(this.pointMesh, this.pointSelector);
     });
   }
 }

package/libs/base/BasePlugin.js

@@ -18,7 +18,7 @@ let P = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.49.14-alpha.0");
+    i(this, "VERSION", "3.49.14-alpha.1");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

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

@@ -72,7 +72,6 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private _outOfFive;
     private set enabled(value);
     private _enabled;
-    private hammer?;
     private mode;
     /** 长按屏幕的动作触发后为true，手指抬起后为false */
     private pressDown;
@@ -80,6 +79,8 @@ export declare class PointSelector extends Subscribe<EventMap> {
     private adherePoints;
     /** 吸附点的半径 */
     private adherePointsRadius;
+    /** 有值时表明处于按压检查阶段 */
+    private setPressDown?;
     private lastFiveHelperVisible?;
     private lastIntersection?;
     private mousePosition;
@@ -108,19 +109,9 @@ export declare class PointSelector extends Subscribe<EventMap> {
      */
     private onLeave;
     private onClick;
-    /**
-     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
-     * 2. 如果有长按点，把长按点位置更新为当前位置
-     */
-    private onPan;
-    /**
-     * @description: 长按屏幕后，更新长按点的位置
-     */
-    private onPress;
-    /**
-     * @description: 手指抬起后，重置pressDown状态
-     */
-    private onPanEnd;
+    private onTouchStart;
+    private onTouchMove;
+    private onTouchEnd;
     private updateByMousePosition;
     /**
      * @description: 根据鼠标位置计算焦点位置并更新

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

@@ -1,26 +1,25 @@
-var b = Object.defineProperty, y = Object.defineProperties;
+var w = Object.defineProperty, b = Object.defineProperties;
 var E = Object.getOwnPropertyDescriptors;
-var p = Object.getOwnPropertySymbols;
-var I = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
-var f = (n, s, e) => s in n ? b(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e, l = (n, s) => {
+var f = Object.getOwnPropertySymbols;
+var I = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
+var p = (n, s, e) => s in n ? w(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e, l = (n, s) => {
   for (var e in s || (s = {}))
-    I.call(s, e) && f(n, e, s[e]);
-  if (p)
-    for (var e of p(s))
-      w.call(s, e) && f(n, e, s[e]);
+    I.call(s, e) && p(n, e, s[e]);
+  if (f)
+    for (var e of f(s))
+      y.call(s, e) && p(n, e, s[e]);
   return n;
-}, m = (n, s) => y(n, E(s));
-var i = (n, s, e) => (f(n, typeof s != "symbol" ? s + "" : s, e), e);
+}, v = (n, s) => b(n, E(s));
+var i = (n, s, e) => (p(n, typeof s != "symbol" ? s + "" : s, e), e);
 import { PointSelectorHelper as H } from "./utils/PointSelectorHelper.js";
-import { isTouchDevice as v } from "../../isTouchDevice.js";
-import M from "hammerjs";
+import { isTouchDevice as m } from "../../isTouchDevice.js";
 import * as d from "three";
-import { Subscribe as N } from "../../Subscribe.js";
-import { getIntersectByRaycaster as F, getVirtualIntersectByRaycaster as L } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as U } from "../../five/getRaycasterByNdcPosition.js";
+import { Subscribe as M } from "../../Subscribe.js";
+import { getIntersectByRaycaster as T, getVirtualIntersectByRaycaster as L } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as N } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as P } from "./utils/contents.js";
-const C = new d.Vector3(), u = () => !1;
-class k extends N {
+const F = new d.Vector3(), u = () => !1;
+class g extends M {
   constructor(e, t) {
     var a, o, c;
     super();
@@ -33,7 +32,6 @@ class k extends N {
     i(this, "five");
     i(this, "_outOfFive", !1);
     i(this, "_enabled", !1);
-    i(this, "hammer");
     i(this, "mode");
     /** 长按屏幕的动作触发后为true，手指抬起后为false */
     i(this, "pressDown", !1);
@@ -41,6 +39,8 @@ class k extends N {
     i(this, "adherePoints");
     /** 吸附点的半径 */
     i(this, "adherePointsRadius", 0.1);
+    /** 有值时表明处于按压检查阶段 */
+    i(this, "setPressDown");
     i(this, "lastFiveHelperVisible");
     i(this, "lastIntersection");
     i(this, "mousePosition");
@@ -76,32 +76,32 @@ class k extends N {
     i(this, "onClick", () => {
       this.select();
     });
-    /**
-     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
-     * 2. 如果有长按点，把长按点位置更新为当前位置
-     */
-    i(this, "onPan", (e) => {
-      this.pressDown && (e != null && e.center && (this.mousePosition = {
-        clientX: e.center.x,
-        clientY: e.center.y
-      }), this.mouseNdcPosition && this.updateByNdcPosition(this.mouseNdcPosition));
+    i(this, "onTouchStart", (e) => {
+      console.log("touchstart"), this.setPressDown = setTimeout(() => {
+        if (this.setPressDown = void 0, this.mousePosition = {
+          clientX: e.touches[0].clientX,
+          clientY: e.touches[0].clientY
+        }, !this.mouseNdcPosition)
+          return;
+        const t = this.updateByNdcPosition(this.mouseNdcPosition);
+        this.pressDown = t;
+      }, 300);
     });
-    /**
-     * @description: 长按屏幕后，更新长按点的位置
-     */
-    i(this, "onPress", (e) => {
-      if (e != null && e.center && (this.mousePosition = {
-        clientX: e.center.x,
-        clientY: e.center.y
-      }), !this.mouseNdcPosition)
+    i(this, "onTouchMove", (e) => {
+      if (console.log("touchmove"), this.setPressDown) {
+        clearTimeout(this.setPressDown), this.setPressDown = void 0;
         return;
-      const t = this.updateByNdcPosition(this.mouseNdcPosition);
-      this.pressDown = t;
+      }
+      if (this.pressDown) {
+        if (this.mousePosition = {
+          clientX: e.touches[0].clientX,
+          clientY: e.touches[0].clientY
+        }, !this.mouseNdcPosition)
+          return;
+        this.updateByNdcPosition(this.mouseNdcPosition);
+      }
     });
-    /**
-     * @description: 手指抬起后，重置pressDown状态
-     */
-    i(this, "onPanEnd", () => {
+    i(this, "onTouchEnd", (e) => {
       this.pressDown && (setTimeout(() => {
         this.pressDown = !1;
       }, 100), this.select());
@@ -114,11 +114,11 @@ class k extends N {
      */
     i(this, "updateByNdcPosition", (e) => {
       var h, a;
-      const t = U(this.five, e), r = F(this.five, t);
+      const t = N(this.five, e), r = T(this.five, t);
       if (r)
         return this.updatePointSelectorHelperIntersect(r), this.lastIntersection = r, !0;
       if (this.plane) {
-        const o = t.ray.intersectPlane(this.plane, C);
+        const o = t.ray.intersectPlane(this.plane, F);
         if (o) {
           const c = {
             distance: this.five.camera.position.distanceTo(o),
@@ -181,12 +181,12 @@ class k extends N {
     });
     this.five = e, this.config = l(l({}, this.config), t), this.actionIfNoModelUnderMouse = (a = t == null ? void 0 : t.actionIfNoModelUnderMouse) != null ? a : "virtualPoint";
     const r = (o = t == null ? void 0 : t.mode) != null ? o : "auto";
-    r === "auto" ? this.mode = v ? "fixed" : "cursor" : this.mode = r;
+    r === "auto" ? this.mode = m ? "fixed" : "cursor" : this.mode = r;
     const h = {
       autoFixPCPosition: this.mode === "cursor",
       initialPosition: this.mode === "fixed" ? { left: "35%", top: "20%" } : void 0
     };
-    this.pointSelectorHelper = new H(this.five, m(l({}, t == null ? void 0 : t.helper), {
+    this.pointSelectorHelper = new H(this.five, v(l({}, t == null ? void 0 : t.helper), {
       magnifierParams: l(l({}, h), (c = t == null ? void 0 : t.helper) == null ? void 0 : c.magnifierParams)
     })), this.pointSelectorHelper.hide();
   }
@@ -224,14 +224,14 @@ class k extends N {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new M(e)), this.mode === "cursor" ? (this.five.on("wantsMoveToPano", u), this.five.on("wantsChangeMode", u), this.five.on("wantsTapGesture", u), e.addEventListener("mousemove", this.updateByMousePosition), v || e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("click", this.onClick), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), 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.mode === "cursor" ? (this.five.on("wantsMoveToPano", u), this.five.on("wantsChangeMode", u), this.five.on("wantsTapGesture", u), m ? (e.addEventListener("touchstart", this.onTouchStart, { passive: !0 }), e.addEventListener("touchmove", this.onTouchMove), e.addEventListener("touchend", this.onTouchEnd)) : (e.addEventListener("click", this.onClick), e.addEventListener("mousemove", this.updateByMousePosition), e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave)), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), 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)
       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", u), this.five.off("wantsChangeMode", u), this.five.off("wantsTapGesture", u), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), e == null || e.removeEventListener("click", this.onClick), 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", u), this.five.off("wantsChangeMode", u), this.five.off("wantsTapGesture", u), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("touchstart", this.onTouchStart), e == null || e.removeEventListener("touchmove", this.onTouchMove), e == null || e.removeEventListener("touchend", this.onTouchEnd), e == null || e.removeEventListener("click", this.onClick), e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), 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();
@@ -241,5 +241,5 @@ class k extends N {
   }
 }
 export {
-  k as PointSelector
+  g as PointSelector
 };

package/package.json

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