@realsee/dnalogel 3.9.0 → 3.10.1

package/libs/AreaMakerPlugin/typing.d.ts

@@ -115,6 +115,11 @@ export interface ServerAreaMakerItem {
     floor_index: number;
     /** 标注物体 */
     object_data: {
+        /**
+         * @description: 是否加载标注模型
+         * @default true
+         */
+        visible?: boolean;
         /** 标注底面形状，THREE.Shape().toJSON() 的结果 */
         shape: Record<string, any>;
         /** 标注底面 y 坐标 */
@@ -133,6 +138,11 @@ export interface ServerAreaMakerItemV1 {
     id: number;
     name: string;
     object_data: {
+        /**
+         * @description: 是否加载标注模型
+         * @default true
+         */
+        visible?: boolean;
         /** 绘制平面的三维世界坐标点集合 */
         points: number[][];
         /** 楼层索引 */

package/libs/AreaMakerPlugin/utils/Item.js

@@ -1,18 +1,18 @@
-var d = Object.defineProperty;
-var f = (a, e, t) => e in a ? d(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
-var i = (a, e, t) => (f(a, typeof e != "symbol" ? e + "" : e, t), t);
+var f = Object.defineProperty;
+var b = (a, e, t) => e in a ? f(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
+var i = (a, e, t) => (b(a, typeof e != "symbol" ? e + "" : e, t), t);
 import * as n from "three";
 import "hammerjs";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { Object3D as b } from "../../shared-utils/three/core/Object3D.js";
-import { LineSegments as k } from "../../shared-utils/three/objects/LineSegments.js";
-import { BetterTween as y } from "../../shared-utils/animationFrame/BetterTween.js";
-import { LabelItem as T } from "../../components/AreaLabel/LabelItem.js";
-import { getCenterPointOfPoints as C } from "../../shared-utils/math/planimetry.js";
-import { Subscribe as O } from "../../shared-utils/Subscribe.js";
+import { Object3D as k } from "../../shared-utils/three/core/Object3D.js";
+import { LineSegments as y } from "../../shared-utils/three/objects/LineSegments.js";
+import { BetterTween as T } from "../../shared-utils/animationFrame/BetterTween.js";
+import { LabelItem as C } from "../../components/AreaLabel/LabelItem.js";
+import { getCenterPointOfPoints as O } from "../../shared-utils/math/planimetry.js";
+import { Subscribe as v } from "../../shared-utils/Subscribe.js";
 import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -29,7 +29,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../shared-utils/animationFrame/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../components/AreaLabel/Assets/roomLabelBg.js";
-class v extends b {
+class M extends k {
   constructor(t) {
     super();
     i(this, "areaMakerItem");
@@ -39,7 +39,7 @@ class v extends b {
     this.areaMakerItem.makerObject.raycast(t, s);
   }
 }
-class Q {
+class tt {
   constructor(e, t) {
     i(this, "id");
     /** 标注名称 */
@@ -85,7 +85,7 @@ class Q {
     /** 标注标签的显示层级 */
     i(this, "tagZIndex", 0);
     /** 标注实例的事件处理器 */
-    i(this, "hooks", new O());
+    i(this, "hooks", new v());
     /** 自定义 Dom */
     i(this, "itemRenderer");
     /** 数据 */
@@ -126,7 +126,7 @@ class Q {
         return;
       }
       return new Promise((p) => {
-        this.opacityAnime = new y({ makerObjectOpacity: s, outlineOpacity: r }).to({
+        this.opacityAnime = new T({ makerObjectOpacity: s, outlineOpacity: r }).to({
           makerObjectOpacity: o,
           outlineOpacity: l
         }).onUpdate(({ makerObjectOpacity: m, outlineOpacity: c }) => {
@@ -146,8 +146,13 @@ class Q {
     });
     /** 更新标注可见性 */
     i(this, "updateVisible", () => {
+      var o;
       const { result: e, msg: t } = this.checkVisible();
-      this.checkMsg.checkVisibleMsg = t, this.visible !== e && (this.visible = e, this.modelGroup.visible = e, this.plugin.five.needsRender = !0);
+      if (this.checkMsg.checkVisibleMsg = t, this.visible === e)
+        return;
+      this.visible = e;
+      const s = (o = this.data.object_data.visible) != null ? o : !0;
+      this.modelGroup.visible = e && s, this.plugin.five.needsRender = !0;
     });
     /** 检测标注是否可见 */
     i(this, "checkVisible", () => {
@@ -203,12 +208,12 @@ class Q {
       };
       this.containerResizeTimeoutID && clearTimeout(this.containerResizeTimeoutID), this.containerResizeTimeoutID = setTimeout(t, 100);
     });
-    var p, m, c;
+    var p, m, c, g;
     const s = t.object_data, o = s.bottom_y, r = s.height, l = new n.Color((p = s.color) != null ? p : "#FFFFFF"), h = (m = s.opacity) != null ? m : 0.4;
-    this.data = t, this.id = t.id, this.name = (c = t.name) != null ? c : "", this.plugin = e, this.height = r, this.bottomY = o, this.opacity = h, this.shape = new n.Shape().fromJSON(s.shape), this.floorIndex = t.floor_index, this.makerObject = new n.Mesh(g(this.shape, r), M(l, h)), u(this.makerObject, o), this.makerObject.material.depthTest = this.plugin.config.modelDepthTest, this.outline = new k(
+    this.data = t, this.id = t.id, this.name = (c = t.name) != null ? c : "", this.plugin = e, this.height = r, this.bottomY = o, this.opacity = h, this.shape = new n.Shape().fromJSON(s.shape), this.floorIndex = t.floor_index, this.makerObject = new n.Mesh(d(this.shape, r), P(l, h)), u(this.makerObject, o), this.makerObject.material.depthTest = this.plugin.config.modelDepthTest, this.outline = new y(
       new n.EdgesGeometry(this.makerObject.geometry),
       new n.LineBasicMaterial({ color: l, transparent: !0 })
-    ), u(this.outline, o), this.outline.material.depthTest = this.plugin.config.modelDepthTest, this.setHeight(r), this.modelGroup = new v(this);
+    ), u(this.outline, o), this.outline.material.depthTest = this.plugin.config.modelDepthTest, this.setHeight(r), this.modelGroup = new M(this), this.modelGroup.visible = (g = s.visible) != null ? g : !0;
   }
   /** 挂载标注 */
   mount() {
@@ -222,7 +227,7 @@ class Q {
         transform: `translate(${this.tagTransform.left}px, ${this.tagTransform.top}px)`,
         onClick: (r) => this.hooks.emit("tagClick", { target: this, nativeEvent: r })
       };
-      this.tagApp = new T({ target: s, props: o }), this.updateTag();
+      this.tagApp = new C({ target: s, props: o }), this.updateTag();
     }
     this.plugin.five.needsRender = !0, this.plugin.hooks.on("stateChange", this.onPluginStateChange), this.plugin.hooks.on("configChange", this.onPluginConfigChange), this.plugin.five.on("modeChange", this.updateVisible), this.plugin.five.on("modelShownFloorChange", this.updateVisible), this.plugin.five.on("cameraUpdate", this.onFiveCameraUpdate), (t = this.plugin.resizeIframe.contentWindow) == null || t.addEventListener("resize", this.onContainerResize);
   }
@@ -252,8 +257,8 @@ class Q {
   setHeight(e) {
     if (e <= 0)
       throw new Error("高度必须大于 0");
-    this.height = e, this.makerObject.geometry = g(this.shape, e), this.outline.geometry = new n.EdgesGeometry(this.makerObject.geometry);
-    const t = this.shape.extractPoints(10).shape.slice(0, -1), s = C(t), o = new n.Vector3(s.x, s.y, e);
+    this.height = e, this.makerObject.geometry = d(this.shape, e), this.outline.geometry = new n.EdgesGeometry(this.makerObject.geometry);
+    const t = this.shape.extractPoints(10).shape.slice(0, -1), s = O(t), o = new n.Vector3(s.x, s.y, e);
     u(o, this.bottomY), this.tagPosition.copy(o), this.updateTag(), this.plugin.five.needsRender = !0;
   }
   /** 更改标注标签的显示层级
@@ -269,13 +274,13 @@ class Q {
     this.tagZIndex !== e && ((t = this.tagApp) == null || t.$set({ zIndex: e }));
   }
 }
-function g(a, e) {
+function d(a, e) {
   return new n.ExtrudeBufferGeometry(a, {
     depth: e,
     bevelEnabled: !1
   });
 }
-function M(a, e) {
+function P(a, e) {
   return new n.MeshBasicMaterial({
     color: a,
     opacity: e,
@@ -287,5 +292,5 @@ function u(a, e) {
   t.multiply(s), t.multiply(o), t.multiply(r), a.applyMatrix4(t);
 }
 export {
-  Q as AreaMakerItem
+  tt as AreaMakerItem
 };

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -12,7 +12,7 @@ var M = (b, e, i) => e in b ? $(b, e, { enumerable: !0, configurable: !0, writab
 }, D = (b, e) => w(b, E(e));
 import * as F from "three";
 import { is3DTag as z, isMediaModelTag as R } from "../utils/tag/tagCheck.js";
-import { getTagCenterPosition as I, getTagPosition as O } from "../utils/tagPosition.js";
+import { getTagCenterPosition as C, getTagPosition as O } from "../utils/tagPosition.js";
 import { checkRange as h } from "../utils/checkRange.js";
 import { isPanoramaLike as y, isModelLike as Z } from "../../shared-utils/five/mode.js";
 import "hammerjs";
@@ -64,7 +64,8 @@ import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
 import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/transformPosition.js";
-const C = new F.Raycaster();
+const I = new F.Raycaster();
+I.params.Points.threshold = 0.1;
 class Je extends H {
   constructor(e) {
     super(e);
@@ -254,7 +255,7 @@ class Je extends H {
    * @description 一个点的标签
    */
   getTagProject(e) {
-    const i = I(e);
+    const i = C(e);
     if (!i)
       return;
     const { x: f, y: t, z: o } = i.project(this.five.camera);
@@ -271,20 +272,20 @@ class Je extends H {
       (() => {
         var g;
         const v = (g = f.checkPoints) != null ? g : "center";
-        return v === "center" ? I(e) : v === "corner" ? O(e) : Array.isArray(v) ? v : [];
+        return v === "center" ? C(e) : v === "corner" ? O(e) : Array.isArray(v) ? v : [];
       })()
     );
     let s = 0, c = 0;
     for (const v of d) {
       const g = new F.Vector3().subVectors(v, o).normalize();
-      C.set(o, g);
-      const P = o.distanceTo(v), [l] = this.five.model.intersectRaycaster(C), p = (() => {
+      I.set(o, g);
+      const P = o.distanceTo(v), [l] = this.five.model.intersectRaycaster(I), p = (() => {
         if (!R(e))
           return;
         const V = this.tags.filter(R).map((A) => {
           var T;
           return (T = A.model) == null ? void 0 : T.object;
-        }).filter(q), [B] = C.intersectObjects(V, !0);
+        }).filter(q), [B] = I.intersectObjects(V, !0);
         return B;
       })(), S = (r = f.distanceAccuracy) != null ? r : 0.01;
       Math.min((a = l == null ? void 0 : l.distance) != null ? a : 1 / 0, (u = p == null ? void 0 : p.distance) != null ? u : 1 / 0) + S >= P ? s++ : c++;
@@ -306,7 +307,7 @@ class Je extends H {
     var o, d, s, c, n, r, a;
     let i = 0;
     const f = (o = e.fiveState) == null ? void 0 : o.panoIndex;
-    f !== void 0 ? i = (d = this.work.observers[f]) == null ? void 0 : d.floorIndex : i = N(this.work, (a = (r = (c = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : c.position) != null ? r : (n = e.mediaPlane) == null ? void 0 : n.position) != null ? a : I(e));
+    f !== void 0 ? i = (d = this.work.observers[f]) == null ? void 0 : d.floorIndex : i = N(this.work, (a = (r = (c = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : c.position) != null ? r : (n = e.mediaPlane) == null ? void 0 : n.position) != null ? a : C(e));
     const t = this.five.model.shownFloor;
     return t === null || t === i;
   }

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.9.0");
+    i(this, "VERSION", "3.10.1");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.9.0",
+    "%c %c@realsee/dnalogel %cv3.10.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/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.9.0",
+  "version": "3.10.1",
   "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": "6.0.0-alpha.52",
+    "@realsee/five": "6.0.0-alpha.57",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^20.0.3",