@realsee/dnalogel 2.30.3 → 3.0.0-2

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

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

@@ -14,17 +14,17 @@ var f = (t, c, n) => new Promise((e, r) => {
   }, u = (o) => o.done ? e(o.value) : Promise.resolve(o.value).then(a, i);
   u((n = n.apply(t, c)).next());
 });
-import { nearlyEqual as d } from "../nearlyEqual.js";
-import { to as l } from "../to.js";
-function h(t) {
+import { nearlyEqualRad as d, nearlyEqual as m } from "../nearlyEqual.js";
+import { to as h } from "../to.js";
+function w(t) {
   return Object.prototype.toString.call(t) === "[object Object]";
 }
-function m(t) {
-  return h(t) && !!t.isVector3;
+function l(t) {
+  return w(t) && !!t.isVector3;
 }
-function g(t, c) {
+function j(t, c) {
   return f(this, null, function* () {
-    const [n] = yield l(t.changeMode(...c));
+    const [n] = yield h(t.changeMode(...c));
     if (n)
       throw new Error("change mode canceled");
     yield new Promise((i) => {
@@ -36,16 +36,16 @@ function g(t, c) {
     if (!e)
       return !0;
     const r = t.getCurrentState();
-    if (!w(e, r))
+    if (!b(e, r))
       throw new Error("pose 与预期不符");
   });
 }
-function w(t, c) {
+function b(t, c) {
   return Object.keys(t).every((n) => {
     const e = c[n], r = t[n];
-    return e === void 0 || r === void 0 ? !0 : typeof e == "number" && typeof r == "number" ? d(e, r, 2) : m(r) && m(e) ? r.distanceTo(e) < 0.01 : e === r;
+    return e === void 0 || r === void 0 ? !0 : n === "longitude" || n === "latitude" ? d(e, r, 2) : typeof e == "number" && typeof r == "number" ? m(e, r, 2) : l(r) && l(e) ? r.distanceTo(e) < 0.01 : e === r;
   });
 }
 export {
-  g as changeMode
+  j as changeMode
 };

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/getPxmm.d.ts

@@ -9,7 +9,7 @@ export declare function getFloorY(five: Five, floorIndex: number): number;
  * * FLOOR_PLAN_ATTACHED_TO.FLOOR：当前楼层地板的 Y
  * * FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER：当前模型中心的 Y
  * * FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER：当前楼层天花板的 Y
-*/
+ */
 export declare function getAttachedY(five: Five, floorIndex: number, attachedTo?: FLOOR_PLAN_ATTACHED_TO): number;
 /**
  * 获取「在俯视图」状态下，模型 mm 与屏幕像素 px 的对应关系，即每 mm 对应多少 px

package/libs/shared-utils/getPxmm.js

@@ -2,9 +2,7 @@ import { FLOOR_PLAN_ATTACHED_TO as m } from "../floorplan/constant.js";
 import * as c from "three";
 function s(o, t) {
   const r = Math.max(...o.work.observers.map((n) => n.floorIndex));
-  return t > r ? o.model.bounding.max.y : Math.max(
-    ...o.work.observers.filter((n) => n.floorIndex === t).map((n) => n.standingPosition.y)
-  );
+  return t > r ? o.model.bounding.max.y : Math.max(...o.work.observers.filter((n) => n.floorIndex === t).map((n) => n.standingPosition.y));
 }
 function l(o, t, r = m.BOUNDING_CENTER) {
   const n = s(o, t), e = s(o, t + 1);

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 %cv2.30.3",
+    "%c %c@realsee/dnalogel %cv3.0.0-2",
     [
       "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/nearlyEqual.d.ts

@@ -5,3 +5,10 @@
  * @param accuracy 精度：精确到小数点后几位，默认精确到 小数点后四位
  */
 export default function nearlyEqual(num1: number, num2: number, accuracy?: number): boolean;
+/**
+ * 比较两个弧度近似相等
+ * @param rad1 弧度1
+ * @param rad2 弧度2
+ * @param accuracy 精度：精确到小数点后几位，默认精确到 小数点后四位
+ */
+export declare function nearlyEqualRad(rad1: number, rad2: number, accuracy?: number): boolean;

package/libs/shared-utils/nearlyEqual.js

@@ -1,6 +1,12 @@
-function a(t, r, o = 4) {
-  return Math.floor(t * Math.pow(10, o)) === Math.floor(r * Math.pow(10, o));
+function r(t, a, n = 4) {
+  return Math.abs(t - a) < Math.pow(10, -n);
 }
+function h(t, a, n = 4) {
+  const o = Math.PI * 2, s = t % o, e = a % o, i = Math.min(s, e), c = Math.max(s, e);
+  return r(i, c, n) || r(i + o, c, n);
+}
+Object.assign(window, { nearlyEqual: r, nearlyEqualRad: h });
 export {
-  a as nearlyEqual
+  r as nearlyEqual,
+  h as nearlyEqualRad
 };

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 s } from "three";
+function p(o, r = 1) {
+  if (o.length < 3)
+    return console.error("points.length < 3"), new s(0, 0, 0);
+  const [t, n, e] = o, l = t.clone().sub(n), c = e.clone().sub(n);
+  return l.cross(c).normalize().multiplyScalar(r);
+}
+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": "2.30.3",
+  "version": "3.0.0-2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "5.0.0-alpha.207",
+    "@realsee/five": "6.0.0-alpha.10",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^20.0.3",
@@ -84,9 +84,5 @@
     "earcut": "^2.2.4",
     "hammerjs": "^2.0.8",
     "tslib": "^2.6.0"
-  },
-  "peerDependencies": {
-    "@realsee/five": "^5.0.0",
-    "three": ">=0.115.0 <=0.117.1"
   }
 }

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
-};