@realsee/dnalogel 3.30.0 → 3.30.2

package/libs/ModelMakerPlugin/Controller.js

@@ -1,28 +1,28 @@
-var D = Object.defineProperty;
-var k = (p, n, e) => n in p ? D(p, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[n] = e;
-var s = (p, n, e) => (k(p, typeof n != "symbol" ? n + "" : n, e), e);
-var M = (p, n, e) => new Promise((r, t) => {
+var P = Object.defineProperty;
+var D = (l, n, e) => n in l ? P(l, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[n] = e;
+var r = (l, n, e) => (D(l, typeof n != "symbol" ? n + "" : n, e), e);
+var M = (l, n, e) => new Promise((s, t) => {
   var m = (i) => {
     try {
       a(e.next(i));
-    } catch (h) {
-      t(h);
+    } catch (p) {
+      t(p);
     }
   }, o = (i) => {
     try {
       a(e.throw(i));
-    } catch (h) {
-      t(h);
+    } catch (p) {
+      t(p);
     }
-  }, a = (i) => i.done ? r(i.value) : Promise.resolve(i.value).then(m, o);
-  a((e = e.apply(p, n)).next());
+  }, a = (i) => i.done ? s(i.value) : Promise.resolve(i.value).then(m, o);
+  a((e = e.apply(l, n)).next());
 });
-import { Controller as I } from "../base/BasePluginWithData.js";
-import * as l from "three";
-import { ModelMakerBoxItem as T } from "./item/boxItem.js";
+import { Controller as A } from "../base/BasePluginWithData.js";
+import * as h from "three";
+import { ModelMakerBoxItem as C } from "./item/boxItem.js";
 import { PrismMesh as j } from "../Sculpt/Meshes/Prism.js";
-import { anyPositionToVector3 as H } from "../shared-utils/positionToVector3.js";
-import { PolygonWithEdgeMesh as A } from "../Sculpt/Meshes/PolygonWithEdge.js";
+import { anyPositionToVector3 as I } from "../shared-utils/positionToVector3.js";
+import { PolygonWithEdgeMesh as T } from "../Sculpt/Meshes/PolygonWithEdge.js";
 import "hammerjs";
 import "@realsee/five";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -30,11 +30,11 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "animejs";
 import { notNil as x } from "../shared-utils/isNil.js";
-import { tagRendererMap as C } from "./utils/tagRenderer.js";
+import { tagRendererMap as H } from "./utils/tagRenderer.js";
 import { ModelMakerPrismItem as F } from "./item/prismItem.js";
-import { ModelMakerPolygonItem as O } from "./item/polygonItem.js";
+import { ModelMakerPolygonItem as L } from "./item/polygonItem.js";
 import { boxVertex as c } from "../shared-utils/Object3DHelper/utils/boundingBox.js";
-import { getFiveDomEvent as z } from "./utils/getFiveDomEvent.js";
+import { getFiveDomEvent as O } from "./utils/getFiveDomEvent.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/Subscribe.js";
 import "../shared-utils/url/absoluteUrl.js";
@@ -75,45 +75,45 @@ import "../shared-utils/tag.js";
 import "../shared-utils/five/vector3ToScreen.js";
 import "../shared-utils/five/FiveDomEvents.js";
 import "../shared-utils/five/calculateThreeMouse.js";
-class Se extends I {
+class Se extends A {
   constructor(e) {
     super(e);
-    s(this, "state");
-    s(this, "items", []);
-    s(this, "data");
-    s(this, "group", new l.Group());
-    s(this, "tagRendererMap", {});
-    s(this, "fiveDomEvents");
-    s(this, "zFightingOffset", 0);
-    s(this, "handleEnable", () => {
+    r(this, "state");
+    r(this, "items", []);
+    r(this, "data");
+    r(this, "group", new h.Group());
+    r(this, "tagRendererMap", {});
+    r(this, "fiveDomEvents");
+    r(this, "zFightingOffset", 0);
+    r(this, "handleEnable", () => {
       this.items.forEach((e) => e.enable());
     });
-    s(this, "handleDisable", () => {
+    r(this, "handleDisable", () => {
       this.items.forEach((e) => e.disable());
     });
-    s(this, "updateTagRenderer", () => {
+    r(this, "updateTagRenderer", () => {
       this.items.forEach((e) => {
         var t;
-        const r = (t = this.tagRendererMap[e.type]) != null ? t : C[e.type];
-        r && e.__renderer !== r && (e.__renderer = r, typeof e.__disposeRenderer == "function" && e.__disposeRenderer(), e.tag.container.innerHTML = "", e.__disposeRenderer = r(e.tag.container, e));
+        const s = (t = this.tagRendererMap[e.type]) != null ? t : H[e.type];
+        s && e.__renderer !== s && (e.__renderer = s, typeof e.__disposeRenderer == "function" && e.__disposeRenderer(), e.tag.container.innerHTML = "", e.__disposeRenderer = s(e.tag.container, e));
       });
     });
-    this.group.name = "ModelMakerPluginGroup", this.state = { enabled: !0, visible: !0 }, this.fiveDomEvents = z(e), e.scene.add(this.group), this.handleEnable(), window.__MODELMAKER_DEBUG__ = this;
+    this.group.name = "ModelMakerPluginGroup", this.state = { enabled: !0, visible: !0 }, this.fiveDomEvents = O(e), e.scene.add(this.group), this.handleEnable(), window.__MODELMAKER_DEBUG__ = this;
   }
   load(e) {
     return M(this, null, function* () {
-      var r;
-      this.clear(), this.data = e, (r = e == null ? void 0 : e.list) == null || r.forEach((t) => {
+      var s;
+      this.clear(), this.data = e, (s = e == null ? void 0 : e.list) == null || s.forEach((t) => {
         var m;
         if (t.type === "triangles") {
-          const o = new A();
+          const o = new T();
           o.setPoints(t.object_data.points), o.setStyle({
             color: t.object_data.color,
             opacity: t.object_data.opacity,
             lineColor: t.object_data.color,
             occlusionVisibility: !1
           }), this.fiveDomEvents.addEventListener(o, "hover", () => o.highlight()), this.fiveDomEvents.addEventListener(o, "unHover", () => o.unhighlight());
-          const a = new O({
+          const a = new L({
             five: this.five,
             model: o,
             group: this.group,
@@ -125,10 +125,10 @@ class Se extends I {
           const o = new j();
           this.zFightingOffset += 1e-4, o.setPoints({
             points: t.object_data.points.map((i) => {
-              var h;
-              return [i[0], i[1] + ((h = t.object_data.fixedY) != null ? h : 0), i[2]];
+              var p;
+              return [i[0], i[1] + ((p = t.object_data.fixedY) != null ? p : 0), i[2]];
             }),
-            heightPoint: H(t.object_data.points[0]).add(new l.Vector3().setY(t.object_data.height + ((m = t.object_data.fixedHeight) != null ? m : 0))).add(new l.Vector3().setY(this.zFightingOffset))
+            heightPoint: I(t.object_data.points[0]).add(new h.Vector3().setY(t.object_data.height + ((m = t.object_data.fixedHeight) != null ? m : 0))).add(new h.Vector3().setY(this.zFightingOffset))
           }), o.setStyle({
             color: t.object_data.color,
             opacity: t.object_data.opacity,
@@ -144,22 +144,22 @@ class Se extends I {
           });
           this.items.push(a);
         } else if (t.type === "box") {
-          const o = new j(), { start: a, end: i, rotation: h, opacity: V, color: b } = t.object_data, f = new l.Vector3().fromArray(a), u = new l.Vector3().fromArray(i), R = new l.Euler().fromArray(h), g = new l.Quaternion().setFromEuler(R), y = g.clone().inverse(), _ = new l.Vector3().lerpVectors(f, u, 0.5), v = _.clone().negate(), w = f.clone().add(v).applyQuaternion(y), E = u.clone().add(v).applyQuaternion(y), d = new l.Box3(w.clone().max(E), w.clone().min(E));
+          const o = new j(), { start: a, end: i, rotation: p = [0, 0, 0, 0], opacity: V, color: b } = t.object_data, f = new h.Vector3().fromArray(a), u = new h.Vector3().fromArray(i), R = new h.Euler().fromArray(p), g = new h.Quaternion().setFromEuler(R), y = g.clone().inverse(), _ = new h.Vector3().lerpVectors(f, u, 0.5), w = _.clone().negate(), v = f.clone().add(w).applyQuaternion(y), E = u.clone().add(w).applyQuaternion(y), d = new h.Box3(v.clone().max(E), v.clone().min(E));
           o.setPoints({
             points: [c(d, 2), c(d, 3), c(d, 7), c(d, 6)],
             heightPoint: c(d, 0)
           }), o.position.copy(_), o.quaternion.copy(g), o.setStyle({ color: b, opacity: V, lineColor: b, occlusionVisibility: !1 });
-          const P = new T({ five: this.five, model: o, group: this.group, type: t.type, rawData: t });
-          this.items.push(P);
+          const k = new C({ five: this.five, model: o, group: this.group, type: t.type, rawData: t });
+          this.items.push(k);
         }
-      }), this.five.needsRender = !0, this.state.enabled ? this.handleEnable() : this.handleDisable(), this.state.visible ? this.handleShow() : this.handleHide(), this.updateTagRenderer();
+      }), this.five.needsRender = !0, this.state.enabled ? this.handleEnable() : this.handleDisable(), this.state.visible ? this.handleShow() : this.handleHide(), this.updateTagRenderer(), this.hooks.emit("dataLoaded", e);
     });
   }
   setState(e) {
-    x(e.enabled) && this.state.enabled !== e.enabled && (this.state.enabled = e.enabled, e.enabled ? this.handleEnable() : this.handleDisable(), this.hooks.emit(e.enabled ? "enable" : "disable", { userAction: "我不知道捏" })), x(e.visible) && this.state.visible !== e.visible && (this.state.visible = e.visible, e.visible ? this.handleShow() : this.handleHide(), this.hooks.emit(e.visible ? "show" : "hide", { userAction: "我不知道捏" }));
+    x(e.enabled) && this.state.enabled !== e.enabled && (this.state.enabled = e.enabled, e.enabled ? this.handleEnable() : this.handleDisable(), this.hooks.emit(e.enabled ? "enable" : "disable", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" })), x(e.visible) && this.state.visible !== e.visible && (this.state.visible = e.visible, e.visible ? this.handleShow() : this.handleHide(), this.hooks.emit(e.visible ? "show" : "hide", { userAction: "我不知道捏" }), this.hooks.emit("stateChange", { state: this.state, userAction: "我不知道捏" }));
   }
   getItemById(e) {
-    return this.items.find((r) => r.rawData.id === e);
+    return this.items.find((s) => s.rawData.id === e);
   }
   registerTagRenderer(e) {
     this.tagRendererMap = e, this.updateTagRenderer();
@@ -180,7 +180,7 @@ class Se extends I {
     this.zFightingOffset = 0, this.handleDisable(), this.items = [];
   }
   dispose() {
-    this.handleDisable();
+    this.hooks.emit("dispose"), this.handleDisable();
   }
   handleShow() {
     this.items.forEach((e) => e.show());

package/libs/ModelMakerPlugin/index.d.ts

@@ -1,4 +1,6 @@
 import type { Five } from '@realsee/five';
 import type * as ModelMakerPluginType from './typings';
+import { Controller } from './Controller';
 export declare const ModelMakerPlugin: (five: Five) => ModelMakerPluginType.ModelMakerController;
+export type { Controller as ModelMakerPluginInstance };
 export type { ModelMakerPluginType };

package/libs/ModelMakerPlugin/typings/data.d.ts

@@ -2,7 +2,9 @@ export interface ServerData {
     list: (ServerBoxItem | ServerTrianglesItem | ServerPrismItem)[];
 }
 export interface ServerBaseItem {
+    /** 唯一标识 */
     id?: number;
+    /** 标签名 */
     name?: string;
 }
 export interface ServerBoxItem extends ServerBaseItem {
@@ -13,29 +15,40 @@ export interface ServerBoxItem extends ServerBaseItem {
         /** start 对角位置的顶点坐标 */
         end: number[];
         /** box 的欧拉角旋转，旋转顺序是 [XYZ] */
-        rotation: number[];
+        rotation?: number[];
+        /** 标注颜色 */
         color?: string;
+        /** 透明度 */
         opacity?: number;
     };
 }
 export interface ServerTrianglesItem extends ServerBaseItem {
     type: 'triangles';
     object_data: {
-        panoIndex: number;
+        /** 多边形的顶点坐标数组 */
         points: number[][];
+        /** 标注颜色 */
         color?: string;
+        /** 透明度 */
         opacity?: number;
     };
 }
 export interface ServerPrismItem extends ServerBaseItem {
     type: 'prism';
     object_data: {
+        /** 绘制平面的三维世界坐标点数组 */
         points: number[][];
-        floorIndex?: number;
+        /** 楼层高度 */
         height: number;
+        /** 所在楼层 */
+        floorIndex?: number;
+        /** 人工设置的y坐标方向偏移 */
         fixedY?: number;
+        /** 人工设置的高度修正 */
         fixedHeight?: number;
-        color: string;
+        /** 标注颜色 */
+        color?: string;
+        /** 透明度 */
         opacity?: number;
     };
 }

package/libs/ModelMakerPlugin/typings/index.d.ts

@@ -1,5 +1,4 @@
 import type * as BasePlugin from '../../base/BasePluginWithData';
-import type * as THREE from 'three';
 import type { ModelMakerBaseItem } from '../item/baseItem';
 import type { ServerData } from './data';
 export type { Controller as ModelMakerController } from '../Controller';
@@ -37,16 +36,6 @@ export interface EventMap extends BasePlugin.EventMap<State, ServerData> {
     disable: (event: {
         userAction: boolean;
     }) => void;
-    /** 插件内容点击的回调
-     * @param event.target 点击的标注实例
-     * @param event.intersectObjects 射线与标注模型的交点集合
-     * @param event.wantsFiveTapGestureParams Five wantsFiveTapGesture 的回调参数
-     * @returns <boolean> | <void> 返回 false 会阻止 Five wantsFiveTapGesture 的回调，其余 return 值会被忽略
-     */
-    wantsTap: (event: {
-        target: any;
-        intersectObjects: THREE.Intersection[];
-    }) => boolean | void;
 }
 export type ItemType = ServerData['list'][number]['type'];
 export type ElementRenderer = (container: HTMLElement, item: ModelMakerBaseItem) => () => void;

package/libs/PanoTagPlugin/typings/tag/Utils.d.ts

@@ -66,7 +66,7 @@ export interface ImagePlaneGroup extends Group {
 export type AudioAppearance = TagInstance<'Audio'>['data']['appearance'];
 type _ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | `Any-Audio-${AudioAppearance}` | 'Any';
 export type ContentTypeConfigKeySplit = [StickType | 'Any', TagContentType | 'Any'] | [TagContentType] | [StickType | 'Any', 'Audio', AudioAppearance] | ['Any'] | [];
-type FiveModeType = `[${Exclude<Mode, 'DepthPanorama'> | 'PanoramaLike' | 'ModelLike'}]`;
+type FiveModeType = `[${Mode | 'PanoramaLike' | 'ModelLike'}]`;
 export type ContentTypeConfigKey = FiveModeType | `${FiveModeType}-${_ContentTypeConfigKey}` | _ContentTypeConfigKey;
 /**
  * @description 从 ContentTypeConfigKey 中提取 ContentTypeConfigKey 对应的 TagContentType 是啥

package/libs/base/BasePlugin.js

@@ -15,7 +15,7 @@ let C = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.30.0");
+    i(this, "VERSION", "3.30.2");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.30.0",
+    "%c %c@realsee/dnalogel %cv3.30.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/three/blink.d.ts

@@ -12,6 +12,16 @@ interface ReBlinkAnimeOptions extends BlinkAnimeOptions {
     maxOpacity?: number;
 }
 type Target = HTMLElement | THREE.Object3D;
+/**
+ * @description 闪烁一个物体/Dom
+ * @param animeOptions https://animejs.com/documentation/
+ */
 declare function blink(objects: Target | Target[], animeOptions?: BlinkAnimeOptions): Promise<void>;
-declare function reblink(objects: any, animeOptions?: BlinkAnimeOptions): Promise<void>;
+/**
+ * @description 闪烁一个不可见的物体/Dom
+ *
+ * 适用于物体/Dom在初始状态不可见的情况，闪烁完成后的状态为初始不可见的状态
+ * @param animeOptions https://animejs.com/documentation/
+ */
+declare function reblink(objects: Target | Target[], animeOptions?: BlinkAnimeOptions): Promise<void>;
 export { blink, reblink, type BlinkAnimeOptions, type ReBlinkAnimeOptions };

package/package.json

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