@realsee/dnalogel 3.0.0-10 → 3.0.0-11

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

@@ -1,73 +1,80 @@
-var b = Object.defineProperty;
+var O = Object.defineProperty, L = Object.defineProperties;
+var x = Object.getOwnPropertyDescriptors;
 var m = Object.getOwnPropertySymbols;
-var O = Object.prototype.hasOwnProperty, g = Object.prototype.propertyIsEnumerable;
-var f = (d, e, t) => e in d ? b(d, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[e] = t, p = (d, e) => {
+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) => {
   for (var t in e || (e = {}))
-    O.call(e, t) && f(d, t, e[t]);
+    g.call(e, t) && f(s, t, e[t]);
   if (m)
     for (var t of m(e))
-      g.call(e, t) && f(d, t, e[t]);
-  return d;
-};
-var u = (d, e, t) => (f(d, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as H } from "../three/getObjectVisible.js";
-class I {
+      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 {
   constructor(e) {
-    u(this, "five");
-    u(this, "boundObject", {});
-    u(this, "handleWantsTapGesture", (e) => {
-      var s;
+    r(this, "five");
+    r(this, "boundObject", {});
+    r(this, "extraObjects", []);
+    r(this, "handleWantsTapGesture", (e) => {
+      var o;
       const t = "click", n = this.boundObject[t];
       if (!n || (n == null ? void 0 : n.length) === 0)
         return;
-      const o = this.five.model.intersectRaycaster(e), i = e.intersectObjects(n, !0);
-      if (o.length > 0 && i.length > 0 && o[0].distance < i[0].distance)
-        return;
-      const r = (s = i[0]) == null ? void 0 : s.object;
-      if (!r || !this.objectIsBound(r))
+      console.debug("射线检测");
+      const i = (o = e.intersectObjects([...n, ...this.extraObjects], !0)[0]) == null ? void 0 : o.object;
+      if (!i || !this.objectIsBound(i))
         return;
-      if (this.notify(t, r))
+      if (this.notify(t, i))
         return !1;
     });
-    u(this, "objectIsBound", (e) => {
+    r(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
-    u(this, "notify", (e, t, n, o) => {
-      let i = !1, r = [];
-      const l = [t];
-      let s = t;
-      for (; s.parent; )
-        s = s.parent, l.push(s);
-      for (const a of l) {
+    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)
           break;
-        const h = a._domEvent;
-        if (!h)
+        const c = a._domEvent;
+        if (!c)
           continue;
-        const E = h[`${e}Handler`];
+        const E = c[`${e}Handler`];
         if (E)
           for (const [_, v] of E) {
-            if (v != null && v.checkVisible && !H(a))
+            if (v != null && v.checkVisible && !F(a))
               continue;
-            const c = _({
+            const l = _({
               type: e,
               target: a,
               origDomEvent: n,
-              intersect: o,
+              intersect: u,
               stopPropagation: () => {
                 i = !0;
               }
             });
-            r.push(c != null ? c : !0);
+            h.push(l != null ? l : !0);
           }
       }
-      return r.some((a) => a === !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);
+      });
     });
-    this.five = e, e.on("wantsTapGesture", this.handleWantsTapGesture);
+    this.five = e, this.updateFiveMeshes(), e.on("modelLoaded", this.updateFiveMeshes), e.on("wantsTapGesture", this.handleWantsTapGesture);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
@@ -91,24 +98,24 @@ class I {
    * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
    * @return {void}
    */
-  addEventListener(e, t, n, o) {
+  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, p({ checkVisible: !0 }, o)]), (i = this.boundObject[t]) == null || i.push(e);
+    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);
   }
-  removeEventListener(e, t, n, ...o) {
-    var r, l;
+  removeEventListener(e, t, n, ...u) {
+    var h, o;
     if (!e._domEvent || !e._domEvent[`${t}Handler`])
       return;
-    const i = e._domEvent[`${t}Handler`].findIndex((s) => s[0] === n);
+    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 s = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((a) => a === e);
-      s !== -1 && ((l = this.boundObject[t]) == null || l.splice(s, 1));
+      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));
     }
   }
   dispose() {
-    this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {};
+    this.five.off("modelLoaded", this.updateFiveMeshes), this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {}, this.extraObjects = [];
   }
 }
 export {
-  I as FiveDomEvents
+  B as FiveDomEvents
 };

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

@@ -1,10 +1,10 @@
-function n(e) {
-  return e.toLowerCase().includes("panorama");
+function n(a) {
+  return a === "Panorama" || a === "DepthPanorama" || a === "VRPanorama" || a === "XRPanorama";
 }
-function o(e) {
-  return !n(e);
+function r(a) {
+  return !n(a);
 }
 export {
-  o as isModelLike,
+  r 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 './url/absoluteUrl';
+export * from './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 "./url/absoluteUrl.js";
+import { absoluteUrl as F, isAbsoluteURL as P } from "./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-10",
+    "%c %c@realsee/dnalogel %cv3.0.0-11",
     [
       "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/package.json

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

package/dist/PanoTagPlugin/utils/tag/adaptConfig.d.ts

@@ -1,2 +0,0 @@
-import type { Tag, TagConfig } from '../..';
-export default function adaptConfig(config: TagConfig, tag?: Tag): void;

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

@@ -1,9 +0,0 @@
-/**
- * @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/dist/shared-utils/five/fiveModelLoad.d.ts

@@ -1,9 +0,0 @@
-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/dist/shared-utils/three/getNormal.d.ts

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

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

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

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

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