@realsee/dnalogel 3.0.0-11 → 3.0.0-13

package/libs/shared-utils/five/FiveDomEvents.d.ts

@@ -6,14 +6,25 @@
  * 3. 基于第二点，废弃了之前使用浏览器原生事件监听点击的方式，改为使用 wantsTapGesture 的方式
  * 4. 重构之后只会在 wantsTapGesture 事件触发的时候做射线检测
  */
-import { type Five } from '@realsee/five';
+import type { Five } from '@realsee/five';
 import type * as THREE from 'three';
-type EventName = 'click';
+interface EventMap {
+    /**
+     * @description 点击事件
+     * @return {PreventFiveEvent} 返回 false 可以不阻止 five 的 tap 事件; default: true
+     */
+    click: (event: CallbackEvent) => PreventFiveEvent | void;
+    /**
+     * @description 鼠标移入事件
+     */
+    hover: (event: CallbackEvent) => void;
+    /**
+     * @description 鼠标移出事件
+     */
+    unHover: (event: CallbackEvent) => void;
+}
+type EventName = keyof EventMap;
 type PreventFiveEvent = boolean;
-/**
- * @return {PreventFiveEvent} 返回 false 可以不阻止 five 的 tap 事件; default: true
- */
-type Callback = (event: CallbackEvent) => PreventFiveEvent | void;
 interface EventHandlerConfig {
     /**
      * @default true
@@ -29,20 +40,20 @@ interface CallbackEvent {
 }
 type Object3DWithEvent = THREE.Object3D & {
     _domEvent?: {
-        [key in `${EventName}Handler`]?: Array<[Function, EventHandlerConfig]>;
+        [key in `${EventName}Handler`]?: Array<[EventMap[EventName], EventHandlerConfig]>;
     };
+    _hovered?: boolean;
 };
 export declare class FiveDomEvents {
     private five;
     private boundObject;
-    private extraObjects;
     constructor(five: Five);
     /**
      * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
      * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
      * @todo: added 和 removed 还是不太智能
      */
-    addAutoBindEventListener(...params: Parameters<InstanceType<typeof FiveDomEvents>['addEventListener']>): void;
+    addAutoBindEventListener<T extends EventName>(object: Object3DWithEvent, event: T, callback: EventMap[T], config?: EventHandlerConfig): () => void;
     /**
      * @description: add event listener
      * @param params.object: object
@@ -50,12 +61,12 @@ export declare class FiveDomEvents {
      * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
      * @return {void}
      */
-    addEventListener(object: Object3DWithEvent, event: EventName, callback: Callback, config?: EventHandlerConfig): void;
+    addEventListener<T extends EventName>(object: Object3DWithEvent, event: T, callback: EventMap[T], config?: EventHandlerConfig): void;
     removeEventListener(object: Object3DWithEvent, event: EventName, callback: (e: CallbackEvent) => any, ...args: any[]): void;
     dispose(): void;
-    private handleWantsTapGesture;
+    private handleWantsGesture;
+    private onDomEvent;
     private objectIsBound;
     private notify;
-    private updateFiveMeshes;
 }
 export {};

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

@@ -1,95 +1,117 @@
-var O = Object.defineProperty, L = Object.defineProperties;
-var x = Object.getOwnPropertyDescriptors;
-var m = Object.getOwnPropertySymbols;
-var g = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
-var f = (s, e, t) => e in s ? O(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, p = (s, e) => {
+var L = Object.defineProperty;
+var p = Object.getOwnPropertySymbols;
+var H = Object.prototype.hasOwnProperty, g = Object.prototype.propertyIsEnumerable;
+var E = (u, e, t) => e in u ? L(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t, b = (u, e) => {
   for (var t in e || (e = {}))
-    g.call(e, t) && f(s, t, e[t]);
-  if (m)
-    for (var t of m(e))
-      H.call(e, t) && f(s, t, e[t]);
-  return s;
-}, b = (s, e) => L(s, x(e));
-var r = (s, e, t) => (f(s, typeof e != "symbol" ? e + "" : e, t), t);
-import { PBMMesh as $ } from "@realsee/five";
-import { getObjectVisible as F } from "../three/getObjectVisible.js";
-class B {
+    H.call(e, t) && E(u, t, e[t]);
+  if (p)
+    for (var t of p(e))
+      g.call(e, t) && E(u, t, e[t]);
+  return u;
+};
+var h = (u, e, t) => (E(u, typeof e != "symbol" ? e + "" : e, t), t);
+import { getObjectVisible as $ } from "../three/getObjectVisible.js";
+class I {
   constructor(e) {
-    r(this, "five");
-    r(this, "boundObject", {});
-    r(this, "extraObjects", []);
-    r(this, "handleWantsTapGesture", (e) => {
-      var o;
-      const t = "click", n = this.boundObject[t];
+    h(this, "five");
+    h(this, "boundObject", {});
+    h(this, "handleWantsGesture", (e, t) => {
+      if (t.length !== 1)
+        return;
+      const n = t[0];
+      if (n) {
+        if (e === "mouseMove")
+          return this.onDomEvent("hover", n.raycaster);
+        if (e === "tap")
+          return this.onDomEvent("click", n.raycaster);
+      }
+    });
+    h(this, "onDomEvent", (e, t) => {
+      var i;
+      const n = this.boundObject[e];
       if (!n || (n == null ? void 0 : n.length) === 0)
         return;
-      console.debug("射线检测");
-      const i = (o = e.intersectObjects([...n, ...this.extraObjects], !0)[0]) == null ? void 0 : o.object;
-      if (!i || !this.objectIsBound(i))
+      const d = (() => {
+        var f;
+        const r = t.intersectObjects(n, !0);
+        if (r.length === 0)
+          return;
+        const s = this.five.model.intersectRaycaster(t);
+        if (!(s.length > 0 && r.length > 0 && s[0].distance < r[0].distance))
+          return (f = r[0]) == null ? void 0 : f.object;
+      })();
+      if (!d || !this.objectIsBound(d)) {
+        for (const r of (i = this.boundObject.hover) != null ? i : [])
+          r._hovered && this.notify("unHover", r);
         return;
-      if (this.notify(t, i))
+      }
+      if (this.notify(e, d))
         return !1;
     });
-    r(this, "objectIsBound", (e) => {
+    h(this, "objectIsBound", (e) => {
       let t = e._domEvent, n = e.parent;
       for (; typeof t == "undefined" && n; )
         t = n._domEvent, n = n.parent;
       return !!t;
     });
     // eslint-disable-next-line max-params
-    r(this, "notify", (e, t, n, u) => {
-      let i = !1, h = [];
-      const o = [t];
-      let d = t;
-      for (; d.parent; )
-        d = d.parent, o.push(d);
-      for (const a of o) {
-        if (i)
+    h(this, "notify", (e, t, n, d) => {
+      var f;
+      let o = !1, i = [];
+      const r = [];
+      let s = t;
+      for (r.push(s); s.parent; )
+        s = s.parent, r.push(s);
+      for (const v of r) {
+        if (o)
           break;
-        const c = a._domEvent;
-        if (!c)
+        const m = v._domEvent;
+        if (!m)
           continue;
-        const E = c[`${e}Handler`];
-        if (E)
-          for (const [_, v] of E) {
-            if (v != null && v.checkVisible && !F(a))
+        const _ = m[`${e}Handler`];
+        if (_)
+          for (const [O, l] of _) {
+            if (l != null && l.checkVisible && !$(v))
               continue;
-            const l = _({
+            if (e === "hover") {
+              if (v._hovered)
+                continue;
+              v._hovered = !0;
+              for (const a of (f = this.boundObject.hover) != null ? f : [])
+                a !== v && a._hovered && this.notify("unHover", a);
+            }
+            if (e === "unHover") {
+              if (!v._hovered)
+                continue;
+              v._hovered = !1;
+            }
+            const c = O({
               type: e,
-              target: a,
+              target: v,
               origDomEvent: n,
-              intersect: u,
+              intersect: d,
               stopPropagation: () => {
-                i = !0;
+                o = !0;
               }
             });
-            h.push(l != null ? l : !0);
+            i.push(c != null ? c : !0);
           }
       }
-      return h.some((a) => a === !0);
-    });
-    r(this, "updateFiveMeshes", () => {
-      var e;
-      this.extraObjects = [], (e = this.five.model) == null || e.traverse((t) => {
-        t instanceof $ && this.extraObjects.push(t);
-      });
+      if (e === "click")
+        return i.some((v) => v === !0);
     });
-    this.five = e, this.updateFiveMeshes(), e.on("modelLoaded", this.updateFiveMeshes), e.on("wantsTapGesture", this.handleWantsTapGesture);
+    this.five = e, e.on("wantsGesture", this.handleWantsGesture);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
    * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
    * @todo: added 和 removed 还是不太智能
    */
-  addAutoBindEventListener(...e) {
-    const t = e[0];
-    t.addEventListener("added", () => {
-      this.addEventListener(...e);
-    }), t.addEventListener("removed", () => {
-      this.removeEventListener(...e);
-    }), t.addEventListener("dispose", () => {
-      this.removeEventListener(...e);
-    });
+  addAutoBindEventListener(e, t, n, d) {
+    const o = () => this.addEventListener(e, t, n, d), i = () => this.removeEventListener(e, t, n, d);
+    return e.addEventListener("added", o), e.addEventListener("removed", i), e.addEventListener("dispose", i), () => {
+      e.removeEventListener("added", o), e.removeEventListener("removed", i), e.removeEventListener("dispose", i);
+    };
   }
   /**
    * @description: add event listener
@@ -98,24 +120,25 @@ class B {
    * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
    * @return {void}
    */
-  addEventListener(e, t, n, u) {
-    var i;
-    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, b(p({}, u), { checkVisible: !0 })]), (i = this.boundObject[t]) == null || i.push(e);
+  addEventListener(e, t, n, d) {
+    var o;
+    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, b({ checkVisible: !0 }, d)]), (o = this.boundObject[t]) == null || o.push(e);
   }
-  removeEventListener(e, t, n, ...u) {
-    var h, o;
+  removeEventListener(e, t, n, ...d) {
+    var i, r;
     if (!e._domEvent || !e._domEvent[`${t}Handler`])
       return;
-    const i = e._domEvent[`${t}Handler`].findIndex((d) => d[0] === n);
-    if (i !== -1 && (e._domEvent[`${t}Handler`].splice(i, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
-      const d = (h = this.boundObject[t]) == null ? void 0 : h.findIndex((a) => a === e);
-      d !== -1 && ((o = this.boundObject[t]) == null || o.splice(d, 1));
+    const o = e._domEvent[`${t}Handler`].findIndex((s) => s[0] === n);
+    if (o !== -1 && (e._domEvent[`${t}Handler`].splice(o, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
+      const s = (i = this.boundObject[t]) == null ? void 0 : i.findIndex((f) => f === e);
+      s !== -1 && ((r = this.boundObject[t]) == null || r.splice(s, 1));
     }
   }
   dispose() {
-    this.five.off("modelLoaded", this.updateFiveMeshes), this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {}, this.extraObjects = [];
+    var e;
+    (e = this.five) == null || e.off("wantsGesture", this.handleWantsGesture), this.boundObject = {};
   }
 }
 export {
-  B as FiveDomEvents
+  I as FiveDomEvents
 };

package/libs/shared-utils/five/adapt.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @description: 一些函数，来适配 Five@5.x 和 Five@6.x 的差异
+ */
+import type { Five } from '@realsee/five';
+export declare function adaptPanoId(five: Five, func: (params?: {
+    panoIndex: number;
+    panoId: string;
+    derivedId: number;
+}, ...args: any[]) => any): (panoIdOrPanoIndex: string | number, ...args: any[]) => void;

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

@@ -0,0 +1,16 @@
+function k(t, p) {
+  return function(n, ...s) {
+    var e, a;
+    if (typeof n == "number") {
+      const o = n, d = t.work.observers[n], c = (e = d == null ? void 0 : d.panoId) != null ? e : `${t.work.workCode}[${o}]`, i = d == null ? void 0 : d.derivedId;
+      p({ panoIndex: o, panoId: c, derivedId: i }, ...s);
+    } else if (typeof n == "string") {
+      const o = n, d = t.work.observers.find((f) => f.panoId === o), c = (a = d == null ? void 0 : d.index) != null ? a : d == null ? void 0 : d.panoIndex, i = d == null ? void 0 : d.derivedId;
+      p({ panoIndex: c, panoId: o, derivedId: i }, ...s);
+    } else
+      console.error(`adaptPano error: panoIdOrPanoIndex is ${n}`);
+  };
+}
+export {
+  k as adaptPanoId
+};

package/libs/shared-utils/five/fiveModelLoad.d.ts

@@ -0,0 +1,9 @@
+import type { Five } from '@realsee/five';
+/**
+ * @description: 等待 five model 加载完成
+ */
+export declare function waitFiveModelLoaded(five: Five): Promise<void>;
+/**
+ * @note five 6.0 修复了 多次 load work 时，`five.model.loaded` 不会变为 `false` 的问题，不再需要 `five.model.name === five.work?.model.file` 的判断了
+ */
+export declare function fiveModelIsLoaded(five: Five): boolean;

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

@@ -0,0 +1,29 @@
+var l = (d, o, n) => new Promise((r, t) => {
+  var c = (e) => {
+    try {
+      a(n.next(e));
+    } catch (i) {
+      t(i);
+    }
+  }, u = (e) => {
+    try {
+      a(n.throw(e));
+    } catch (i) {
+      t(i);
+    }
+  }, a = (e) => e.done ? r(e.value) : Promise.resolve(e.value).then(c, u);
+  a((n = n.apply(d, o)).next());
+});
+function s(d) {
+  return l(this, null, function* () {
+    return new Promise((o) => {
+      f(d) ? o() : d.once("modelLoaded", () => o());
+    });
+  });
+}
+function f(d) {
+  return d.model.loaded;
+}
+export {
+  s as waitFiveModelLoaded
+};

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

@@ -1,10 +1,10 @@
-function n(a) {
-  return a === "Panorama" || a === "DepthPanorama" || a === "VRPanorama" || a === "XRPanorama";
+function n(e) {
+  return e.toLowerCase().includes("panorama");
 }
-function r(a) {
-  return !n(a);
+function o(e) {
+  return !n(e);
 }
 export {
-  r as isModelLike,
+  o as isModelLike,
   n as isPanoramaLike
 };

package/libs/shared-utils/index.d.ts

@@ -3,6 +3,6 @@ export * from './five';
 export * from './three';
 export * from './isNil';
 export * from './uuid';
-export * from './absoluteUrl';
+export * from './url/absoluteUrl';
 export * from './animationFrame';
 export { default as equal } from './equal';

package/libs/shared-utils/index.js

@@ -12,7 +12,7 @@ import { Object3D as s } from "./three/core/Object3D.js";
 import { LineSegments as g } from "./three/objects/LineSegments.js";
 import { isNil as c, notNil as d } from "./isNil.js";
 import { uuid as u } from "./uuid.js";
-import { absoluteUrl as F, isAbsoluteURL as P } from "./absoluteUrl.js";
+import { absoluteUrl as F, isAbsoluteURL as P } from "./url/absoluteUrl.js";
 import { getFrameTime as b, nextFrame as v, requestAnimationFrameInterval as L } from "./animationFrame/index.js";
 import { equal as M } from "./equal.js";
 import { isModelLike as R, isPanoramaLike as S } from "./five/mode.js";

package/libs/shared-utils/logger.js

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

@@ -0,0 +1,2 @@
+import { Vector3 } from 'three';
+export default function getNormal(points: Vector3[], length?: number): Vector3;

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

@@ -0,0 +1,10 @@
+import { Vector3 as u } from "three";
+function p(o, r) {
+  if (o.length < 3)
+    return console.error("points.length < 3"), new u(0, 0, 0);
+  const [n, t, c] = o, l = n.clone().sub(t), s = n.clone().sub(c), e = l.cross(s).normalize();
+  return typeof r == "number" ? e.multiplyScalar(r) : e;
+}
+export {
+  p as getNormal
+};

package/libs/shared-utils/typescript/entries.d.ts

@@ -0,0 +1,2 @@
+import type { ObjectEntries } from 'type-fest/source/entries';
+export default function entries<T>(obj: T): ObjectEntries<T>;

package/libs/shared-utils/typescript/entries.js

@@ -0,0 +1,6 @@
+function t(e) {
+  return Object.entries(e);
+}
+export {
+  t as entries
+};

package/libs/shared-utils/url/getUrl.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @description 获取文件路径后缀
+ */
+export declare function getUrlExt(url: string): string;

package/libs/shared-utils/url/getUrl.js

@@ -0,0 +1,7 @@
+function o(e) {
+  const t = e.split("?")[0].split(".").pop();
+  return t ? t.toLowerCase() : "";
+}
+export {
+  o as getUrlExt
+};

package/package.json

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

package/dist/PanoTagPlugin/utils/actionAfterFiveModelLoad.d.ts

@@ -1,4 +0,0 @@
-import type { Five } from '@realsee/five';
-export declare function actionAfterFiveModelLoad(five: Five, fuc: () => any): void;
-export declare function waitFiveModelLoaded(five: Five): Promise<void>;
-export declare function fiveModelLoaded(five: Five): boolean;

package/libs/PanoTagPlugin/utils/actionAfterFiveModelLoad.d.ts

@@ -1,4 +0,0 @@
-import type { Five } from '@realsee/five';
-export declare function actionAfterFiveModelLoad(five: Five, fuc: () => any): void;
-export declare function waitFiveModelLoaded(five: Five): Promise<void>;
-export declare function fiveModelLoaded(five: Five): boolean;

package/libs/PanoTagPlugin/utils/actionAfterFiveModelLoad.js

@@ -1,16 +0,0 @@
-function n(e, o) {
-  d(e) ? o() : e.once("modelLoaded", () => o());
-}
-function l(e) {
-  return new Promise((o) => {
-    d(e) ? o() : e.once("modelLoaded", () => o());
-  });
-}
-function d(e) {
-  return e.model.name === e.work.model.file && e.model.loaded;
-}
-export {
-  n as actionAfterFiveModelLoad,
-  d as fiveModelLoaded,
-  l as waitFiveModelLoaded
-};