@realsee/dnalogel 3.75.0 → 3.76.0-alpha.0

package/libs/components/AreaLabel/LabelItem.js

@@ -1,20 +1,20 @@
-import { SvelteComponent as Y, init as Z, safe_not_equal as J, append_styles as K, element as B, attr as M, set_style as o, insert as k, noop as R, detach as v, onMount as Q, onDestroy as V, text as X, space as x, append as $, listen as ee, is_function as ie, set_data as ne, binding_callbacks as p } from "../../vendor/svelte/internal/index.js";
-import { ROOM_LABEL_PC_BG as T, ROOM_LABEL_MOBILE_BG as U } from "./Assets/roomLabelBg.js";
+import { SvelteComponent as Y, init as Z, safe_not_equal as J, append_styles as K, element as M, attr as N, set_style as o, insert as v, noop as T, detach as S, onMount as Q, onDestroy as V, text as X, space as x, append as $, listen as ee, is_function as ie, set_data as ne, binding_callbacks as B } from "../../vendor/svelte/internal/index.js";
+import { ROOM_LABEL_PC_BG as U, ROOM_LABEL_MOBILE_BG as C } from "./Assets/roomLabelBg.js";
 import { rad2Deg as te } from "../../shared-utils/math/rad2Deg.js";
 import { FONT_SIZE_MAP as re } from "./Assets/fontSize.js";
-import { px2rem as m } from "../../shared-utils/px2rem.js";
+import { px2rem as s } from "../../shared-utils/px2rem.js";
 function oe(i) {
-  K(i, "svelte-c02qws", ".room-label-item.svelte-c02qws{position:absolute;font-size:0.625rem;transform:none;cursor:pointer;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;color:#fff}.room-label-item__text.svelte-c02qws{position:absolute;left:0;transform:translate(-50%, 0);display:flex;justify-content:center;align-items:center;pointer-events:all;white-space:nowrap;position:relative;box-shadow:0 0.1875rem 0.8125rem 0 #00000033;font-weight:500;border-radius:var(--border-radius);-o-border-image:var(--bg-image) var(--border-radius-num) / var(--border-radius) / 0rem stretch;border-image:var(--bg-image) var(--border-radius-num) fill / var(--border-radius) / 0rem stretch;box-sizing:border-box}.room-label-item__bar.svelte-c02qws{position:absolute;transform-origin:top;height:3rem;width:0.0625rem;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0))}");
+  K(i, "svelte-c40h79", ".room-label-item.svelte-c40h79{position:absolute;font-size:0.625rem;transform:none;cursor:pointer;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;color:#fff}.room-label-item__text.svelte-c40h79{position:absolute;left:0;transform:translate(-50%, 0);display:flex;justify-content:center;align-items:center;pointer-events:none;white-space:nowrap;position:relative;box-shadow:0 0.1875rem 0.8125rem 0 #00000033;font-weight:500;border-radius:var(--border-radius);-o-border-image:var(--bg-image) var(--border-radius-num) / var(--border-radius) / 0rem stretch;border-image:var(--bg-image) var(--border-radius-num) fill / var(--border-radius) / 0rem stretch;box-sizing:border-box}.room-label-item__bar.svelte-c40h79{position:absolute;transform-origin:top;height:3rem;width:0.0625rem;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0))}");
 }
-function C(i) {
-  let e, n, s, r, _, u;
+function F(i) {
+  let e, n, l, r, h, u;
   return {
     c() {
-      var f, l, b, a;
-      e = B("span"), n = X(
+      var m, f, b, a;
+      e = M("span"), n = X(
         /*content*/
         i[0]
-      ), s = x(), r = B("div"), M(e, "class", "room-label-item__text svelte-c02qws"), o(
+      ), l = x(), r = M("div"), N(e, "class", "room-label-item__text svelte-c40h79"), o(
         e,
         "font-size",
         /*nameSize*/
@@ -33,97 +33,97 @@ function C(i) {
         e,
         "--bg-image",
         /*fontConfig*/
-        ((f = i[6]) == null ? void 0 : f.name) >= 16 ? `url(${T})` : `url(${U})`
-      ), o(e, "min-width", m(
+        ((m = i[6]) == null ? void 0 : m.name) >= 16 ? `url(${U})` : `url(${C})`
+      ), o(e, "min-width", s(
         /*fontConfig*/
-        (l = i[6]) == null ? void 0 : l.minWidth
+        (f = i[6]) == null ? void 0 : f.minWidth
       )), o(
         e,
         "--border-radius",
         /*fontConfig*/
-        ((b = i[6]) == null ? void 0 : b.name) >= 16 ? m(4) : m(2)
+        ((b = i[6]) == null ? void 0 : b.name) >= 16 ? s(4) : s(2)
       ), o(
         e,
         "--border-radius-num",
         /*fontConfig*/
         ((a = i[6]) == null ? void 0 : a.name) >= 16 ? 8 : 4
-      ), M(r, "class", "room-label-item__bar svelte-c02qws"), o(r, "top", m(
+      ), N(r, "class", "room-label-item__bar svelte-c40h79"), o(r, "top", s(
         /*barTopPosition*/
         i[10]
       ));
     },
-    m(f, l) {
-      k(f, e, l), $(e, n), i[22](e), k(f, s, l), k(f, r, l), i[23](r), _ || (u = ee(e, "click", function() {
+    m(m, f) {
+      v(m, e, f), $(e, n), i[22](e), v(m, l, f), v(m, r, f), i[23](r), h || (u = ee(e, "click", function() {
         ie(
           /*onClick*/
           i[4]
         ) && i[4].apply(this, arguments);
-      }), _ = !0);
+      }), h = !0);
     },
-    p(f, l) {
-      var b, a, g, h;
-      i = f, l & /*content*/
+    p(m, f) {
+      var b, a, _, g;
+      i = m, f & /*content*/
       1 && ne(
         n,
         /*content*/
         i[0]
-      ), l & /*nameSize*/
+      ), f & /*nameSize*/
       8192 && o(
         e,
         "font-size",
         /*nameSize*/
         i[13]
-      ), l & /*paddingStyle*/
+      ), f & /*paddingStyle*/
       4096 && o(
         e,
         "padding",
         /*paddingStyle*/
         i[12]
-      ), l & /*textLineHeightRem*/
+      ), f & /*textLineHeightRem*/
       2048 && o(
         e,
         "line-height",
         /*textLineHeightRem*/
         i[11]
-      ), l & /*fontConfig*/
+      ), f & /*fontConfig*/
       64 && o(
         e,
         "--bg-image",
         /*fontConfig*/
-        ((b = i[6]) == null ? void 0 : b.name) >= 16 ? `url(${T})` : `url(${U})`
-      ), l & /*fontConfig*/
-      64 && o(e, "min-width", m(
+        ((b = i[6]) == null ? void 0 : b.name) >= 16 ? `url(${U})` : `url(${C})`
+      ), f & /*fontConfig*/
+      64 && o(e, "min-width", s(
         /*fontConfig*/
         (a = i[6]) == null ? void 0 : a.minWidth
-      )), l & /*fontConfig*/
+      )), f & /*fontConfig*/
       64 && o(
         e,
         "--border-radius",
         /*fontConfig*/
-        ((g = i[6]) == null ? void 0 : g.name) >= 16 ? m(4) : m(2)
-      ), l & /*fontConfig*/
+        ((_ = i[6]) == null ? void 0 : _.name) >= 16 ? s(4) : s(2)
+      ), f & /*fontConfig*/
       64 && o(
         e,
         "--border-radius-num",
         /*fontConfig*/
-        ((h = i[6]) == null ? void 0 : h.name) >= 16 ? 8 : 4
-      ), l & /*barTopPosition*/
-      1024 && o(r, "top", m(
+        ((g = i[6]) == null ? void 0 : g.name) >= 16 ? 8 : 4
+      ), f & /*barTopPosition*/
+      1024 && o(r, "top", s(
         /*barTopPosition*/
         i[10]
       ));
     },
-    d(f) {
-      f && v(e), i[22](null), f && v(s), f && v(r), i[23](null), _ = !1, u();
+    d(m) {
+      m && S(e), i[22](null), m && S(l), m && S(r), i[23](null), h = !1, u();
     }
   };
 }
-function le(i) {
+function fe(i) {
   let e, n = !/*rendererIfNeed*/
-  i[5] && C(i);
+  i[5] && F(i);
   return {
     c() {
-      e = B("div"), n && n.c(), M(e, "class", "room-label-item svelte-c02qws"), o(
+      e = M("div"), n && n.c(), N(e, "class", "room-label-item svelte-c40h79"), o(
         e,
         "z-index",
         /*zIndex*/
@@ -145,122 +145,122 @@ function le(i) {
         i[14]
       );
     },
-    m(s, r) {
-      k(s, e, r), n && n.m(e, null), i[24](e);
+    m(l, r) {
+      v(l, e, r), n && n.m(e, null), i[24](e);
     },
-    p(s, [r]) {
+    p(l, [r]) {
       /*rendererIfNeed*/
-      s[5] ? n && (n.d(1), n = null) : n ? n.p(s, r) : (n = C(s), n.c(), n.m(e, null)), r & /*zIndex*/
+      l[5] ? n && (n.d(1), n = null) : n ? n.p(l, r) : (n = F(l), n.c(), n.m(e, null)), r & /*zIndex*/
       4 && o(
         e,
         "z-index",
         /*zIndex*/
-        s[2]
+        l[2]
       ), r & /*transform*/
       8 && o(
         e,
         "transform",
         /*transform*/
-        s[3]
+        l[3]
       ), r & /*opacity*/
       2 && o(
         e,
         "opacity",
         /*opacity*/
-        s[1]
+        l[1]
       ), r & /*visibility*/
       16384 && o(
         e,
         "visibility",
         /*visibility*/
-        s[14]
+        l[14]
       );
     },
-    i: R,
-    o: R,
-    d(s) {
-      s && v(e), n && n.d(), i[24](null);
+    i: T,
+    o: T,
+    d(l) {
+      l && S(e), n && n.d(), i[24](null);
     }
   };
 }
-function se(i, e, n) {
-  let s, r, _, u, f, l, b, a, g, { content: h } = e, { five: d = void 0 } = e, { visible: S = !0 } = e, { opacity: N = 1 } = e, { zIndex: E = 0 } = e, { transform: H = void 0 } = e, { onClick: P = () => {
-  } } = e, { rendererIfNeed: w = void 0 } = e, { rendererData: q = void 0 } = e, { fontSize: L } = e, y, c, z, I;
-  const D = (t) => {
+function le(i, e, n) {
+  let l, r, h, u, m, f, b, a, _, { content: g } = e, { five: d = void 0 } = e, { visible: w = !0 } = e, { opacity: E = 1 } = e, { zIndex: H = 0 } = e, { transform: P = void 0 } = e, { onClick: A = () => {
+  } } = e, { rendererIfNeed: I = void 0 } = e, { rendererData: L = void 0 } = e, { fontSize: D } = e, y, c, z, k;
+  const O = (t) => {
     if (d.state.mode !== "Panorama") {
-      const A = -(10 + 54 * (1 - te(t.latitude) / 90)), O = A + a, j = O >= 0 ? 0 : -O / -g;
-      n(8, c.style.transform = `scaleY(${j})`, c), n(8, c.style.top = m(O), c), n(9, z.style.top = m(A), z);
+      const R = -(10 + 54 * (1 - te(t.latitude) / 90)), p = R + a, q = p >= 0 ? 0 : -p / -_;
+      n(8, c.style.transform = `scaleY(${q})`, c), n(8, c.style.top = s(p), c), n(9, z.style.top = s(R), z);
     }
   };
   Q(() => {
-    y && typeof w == "function" && (I = w(y, q)), d && (D(d.camera.pose), d.on("cameraUpdate", D));
+    y && typeof I == "function" && (k = I(y, L)), d && (O(d.camera.pose), d.on("cameraUpdate", O));
   }), V(() => {
-    I == null || I(), d == null || d.off("cameraUpdate", D);
+    k == null || k(), d == null || d.off("cameraUpdate", O);
   });
-  function F(t) {
-    p[t ? "unshift" : "push"](() => {
+  function G(t) {
+    B[t ? "unshift" : "push"](() => {
       z = t, n(9, z);
     });
   }
-  function G(t) {
-    p[t ? "unshift" : "push"](() => {
+  function W(t) {
+    B[t ? "unshift" : "push"](() => {
       c = t, n(8, c);
     });
   }
-  function W(t) {
-    p[t ? "unshift" : "push"](() => {
+  function j(t) {
+    B[t ? "unshift" : "push"](() => {
       y = t, n(7, y);
     });
   }
   return i.$$set = (t) => {
-    "content" in t && n(0, h = t.content), "five" in t && n(15, d = t.five), "visible" in t && n(16, S = t.visible), "opacity" in t && n(1, N = t.opacity), "zIndex" in t && n(2, E = t.zIndex), "transform" in t && n(3, H = t.transform), "onClick" in t && n(4, P = t.onClick), "rendererIfNeed" in t && n(5, w = t.rendererIfNeed), "rendererData" in t && n(17, q = t.rendererData), "fontSize" in t && n(18, L = t.fontSize);
+    "content" in t && n(0, g = t.content), "five" in t && n(15, d = t.five), "visible" in t && n(16, w = t.visible), "opacity" in t && n(1, E = t.opacity), "zIndex" in t && n(2, H = t.zIndex), "transform" in t && n(3, P = t.transform), "onClick" in t && n(4, A = t.onClick), "rendererIfNeed" in t && n(5, I = t.rendererIfNeed), "rendererData" in t && n(17, L = t.rendererData), "fontSize" in t && n(18, D = t.fontSize);
   }, i.$$.update = () => {
     var t;
     i.$$.dirty & /*visible*/
-    65536 && n(14, s = S ? "visible" : "hidden"), i.$$.dirty & /*fontSize*/
-    262144 && n(6, r = re[L]), i.$$.dirty & /*fontConfig*/
-    64 && n(13, _ = m(r == null ? void 0 : r.name)), i.$$.dirty & /*fontConfig*/
+    65536 && n(14, l = w ? "visible" : "hidden"), i.$$.dirty & /*fontSize*/
+    262144 && n(6, r = re[D]), i.$$.dirty & /*fontConfig*/
+    64 && n(13, h = s(r == null ? void 0 : r.name)), i.$$.dirty & /*fontConfig*/
     64 && n(20, u = (t = r == null ? void 0 : r.padding) == null ? void 0 : t.room), i.$$.dirty & /*padding*/
-    1048576 && n(12, f = `${m(u[1])} ${m(u[0])}`), i.$$.dirty & /*fontConfig*/
-    64 && n(21, l = r == null ? void 0 : r.lineHeight), i.$$.dirty & /*textLineHeight*/
-    2097152 && n(11, b = m(l)), i.$$.dirty & /*textLineHeight, padding*/
-    3145728 && n(19, a = l + u[1] * 2), i.$$.dirty & /*textHeight*/
-    524288 && n(10, g = -(64 - a));
+    1048576 && n(12, m = `${s(u[1])} ${s(u[0])}`), i.$$.dirty & /*fontConfig*/
+    64 && n(21, f = r == null ? void 0 : r.lineHeight), i.$$.dirty & /*textLineHeight*/
+    2097152 && n(11, b = s(f)), i.$$.dirty & /*textLineHeight, padding*/
+    3145728 && n(19, a = f + u[1] * 2), i.$$.dirty & /*textHeight*/
+    524288 && n(10, _ = -(64 - a));
   }, [
-    h,
-    N,
+    g,
     E,
     H,
     P,
-    w,
+    A,
+    I,
     r,
     y,
     c,
     z,
-    g,
-    b,
-    f,
     _,
-    s,
+    b,
+    m,
+    h,
+    l,
     d,
-    S,
-    q,
+    w,
     L,
+    D,
     a,
     u,
-    l,
-    F,
+    f,
     G,
-    W
+    W,
+    j
   ];
 }
-class _e extends Y {
+class he extends Y {
   constructor(e) {
     super(), Z(
       this,
       e,
-      se,
       le,
+      fe,
       J,
       {
         content: 0,
@@ -279,5 +279,5 @@ class _e extends Y {
   }
 }
 export {
-  _e as LabelItem
+  he as LabelItem
 };

package/libs/shared-utils/logger.js

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

@@ -1,6 +1,6 @@
 import type { Five } from '@realsee/five';
 import { PointSelectorHelper, type PointIntersection, type PointSelectorHelperConfig } from './utils/PointSelectorHelper';
-import type { Vector3 } from 'three';
+import type { Intersection, Vector3 } from 'three';
 import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
@@ -39,6 +39,10 @@ interface Config {
      * @default false
      */
     skipPanorama: boolean;
+    /**
+     * five 6.7.0 特性，可配置是否自定义拾取点过滤函数
+     */
+    hitFilter: (intersect: Intersection) => boolean;
 }
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {

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

@@ -16,10 +16,10 @@ import { isTouchDevice as k } from "../../isTouchDevice.js";
 import * as o from "three";
 import { Subscribe as j } from "../../Subscribe.js";
 import { getIntersectByRaycaster as A, getVirtualIntersectByRaycaster as G } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as W } from "../../five/getRaycasterByNdcPosition.js";
+import { getRaycasterByNdcPosition as g } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as V } from "./utils/contents.js";
-import { rayOnLine as z } from "../../../Sculpt/utils/three/rayOnLine.js";
-import { THREERaycaster as K } from "../core/Raycaster.js";
+import { rayOnLine as W } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { THREERaycaster as z } from "../core/Raycaster.js";
 const _ = new o.Vector3(), w = () => !1;
 class se extends j {
   constructor(e, t) {
@@ -181,7 +181,8 @@ class se extends j {
      */
     i(this, "updateByNdcPosition", (e) => {
       var c, u, d;
-      const t = W(this.five, e);
+      const t = g(this.five, e);
+      console.log("updateByNdcPosition"), this.config.hitFilter && (t.hitFilter = this.config.hitFilter);
       let s = A(this.five, t);
       if (s) {
         if (this.plane && this.planeMode === "vertical" && (s = T(P({}, s), {
@@ -251,8 +252,8 @@ class se extends j {
             if (a.distanceTo(e.point) < this.adhereRadius)
               (!this.plane || this.plane.distanceToPoint(a) < 0.01) && (a = (d = (u = this.plane) == null ? void 0 : u.projectPoint(a, new o.Vector3())) != null ? d : a, t.point = a.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
             else {
-              const p = z({
-                raycaster: new K(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+              const p = W({
+                raycaster: new z(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
                 line: r,
                 clampToLine: !1
               }), v = p.clone().project(this.five.camera);

package/package.json

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