@realsee/dnalogel 4.0.0-webgpu.16 → 4.0.0-webgpu.17

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 4.0.0-webgpu.17
+
+- 测量辅助线和面积预览先挂载到所属 Five 再更新标签，清空当前测量时先完成标签清理再移除几何体，避免 `Five not found`。
+- 增加预览与清空标签归属回归，以及移动端连续端点拖动松手确认测试。
+
 ## 4.0.0-webgpu.16
 
 - 全景 V2 的 Edit/Mixed 清空均重置工作上下文；加载数据先结束旧会话，避免待保存线段混入导入结果。

package/dist/floorplan.js

@@ -1 +1 @@
-export { l as FLOOR_PLAN_ATTACHED_TO, t as FLOOR_TYPE_MAP, i as FloorplanGuidePlugin, s as MapviewFloorplanPlugin, c as ModelFloorplanPlugin, a as PanoFloorplanRadarPlugin, n as ROOM_FETILE_TYPE_MAP, r as ROOM_TYPE_MAP, o as TopviewFloorplanPlugin } from "./internal/floorplan-CofR5nkn.js";
+export { l as FLOOR_PLAN_ATTACHED_TO, t as FLOOR_TYPE_MAP, i as FloorplanGuidePlugin, s as MapviewFloorplanPlugin, c as ModelFloorplanPlugin, a as PanoFloorplanRadarPlugin, n as ROOM_FETILE_TYPE_MAP, r as ROOM_TYPE_MAP, o as TopviewFloorplanPlugin } from "./internal/floorplan-B82VmXnE.js";

package/dist/index.js

@@ -15,41 +15,41 @@ import { t as I } from "./internal/tween.esm-CJDtohfp.js";
 import { n as L, t as R } from "./internal/BetterTween-DmptqE8m.js";
 import { i as z, n as B, r as V, t as H } from "./internal/animationFrame-CacKXN8l.js";
 import { t as U } from "./internal/equal-BiDAilPV.js";
-import { n as W, r as G, t as K } from "./internal/area-maker-CPQF8Zvc.js";
+import { n as W, r as G, t as K } from "./internal/area-maker-T7a6vfXC.js";
 import { a as q, c as se, i as ce, n as le, o as ue, r as de, s as fe, t as pe } from "./internal/boundingBox-CIqXgNXW.js";
 import { t as J } from "./internal/CSS3DRenderPlugin-BuQ7tgJe.js";
 import { t as me } from "./internal/lookObject-DuRab5wf.js";
 import { t as he } from "./internal/camera-movement-C1pwfMk_.js";
-import { r as ge } from "./internal/Work-BeXbgDwp.js";
-import { t as _e } from "./internal/object3d-helper-DFamC2FE.js";
-import { r as ve } from "./internal/sculpt-rEvaT1IE.js";
-import { t as ye } from "./internal/pano-tag-C6g7mXhw.js";
-import { n as be, t as xe } from "./internal/cruise-CVIrFchH.js";
-import { t as Se } from "./internal/current-pano-image-BaYriyS_.js";
+import { r as ge } from "./internal/Work-njB4pAsT.js";
+import { t as _e } from "./internal/object3d-helper-CxJ_Ju1y.js";
+import { r as ve } from "./internal/sculpt-heTYi32h.js";
+import { t as ye } from "./internal/pano-tag-BwRqx3wU.js";
+import { n as be, t as xe } from "./internal/cruise-rzsfiLn-.js";
+import { t as Se } from "./internal/current-pano-image-CAodOmyS.js";
 import { t as Ce } from "./internal/digital-performance-v2-Cspjjn51.js";
 import { t as we } from "./internal/digital-performance-B4DdvGbx.js";
 import { t as Te } from "./internal/item-label-DXeKI9sZ.js";
-import { t as Ee } from "./internal/measure-BEPx6Dxe.js";
+import { t as Ee } from "./internal/measure-KVSCjRnS.js";
 import { t as De } from "./internal/model-chassis-compass-rfKL38y2.js";
 import { t as Oe } from "./internal/model-entry-door-guide-DnGTLY2s.js";
 import { t as ke } from "./internal/model-item-label-BwJ5Dgnp.js";
-import { t as Ae } from "./internal/model-maker-ggAsocXZ.js";
+import { t as Ae } from "./internal/model-maker-BHPMSkqn.js";
 import { t as je } from "./internal/model-room-label-5NtOduW1.js";
 import { t as Me } from "./internal/model-tv-video-E71WR84A.js";
 import { t as Ne } from "./internal/model-view-BWUU0-uq.js";
-import { t as Pe } from "./internal/pano-compass-DGHhaCBJ.js";
+import { t as Pe } from "./internal/pano-compass-2S5mt7af.js";
 import { t as Fe } from "./internal/pano-cursor-raycaster-DydRx7wS.js";
-import { t as Ie } from "./internal/pano-door-label-CWY7Kxkk.js";
-import { t as Le } from "./internal/pano-measure-CQ_ZZzz5.js";
+import { t as Ie } from "./internal/pano-door-label-CK0sYPKY.js";
+import { t as Le } from "./internal/pano-measure-DEofgQkM.js";
 import { t as Re } from "./internal/pano-ruler-pro-D9yTbHJz.js";
 import { t as ze } from "./internal/pano-ruler-fzlUTkVu.js";
 import { t as Be } from "./internal/pano-spatial-tag-gwN_WDLJ.js";
-import { t as Ve } from "./internal/pano-video-DTbKV54W.js";
-import { t as He } from "./internal/pipeline-CkYhFOhG.js";
+import { t as Ve } from "./internal/pano-video-DF7h9OyJ.js";
+import { t as He } from "./internal/pipeline-Bcxx8i_q.js";
 import { t as Ue } from "./internal/components-Ed73WMB0.js";
-import { a as We, c as Ge, i as Y, o as Ke, s as qe } from "./internal/floorplan-CofR5nkn.js";
-import { t as Je } from "./internal/measure-v2-sRY76hly.js";
-import { t as Ye } from "./internal/pano-measure-v2-CzOdP5Yv.js";
+import { a as We, c as Ge, i as Y, o as Ke, s as qe } from "./internal/floorplan-B82VmXnE.js";
+import { t as Je } from "./internal/measure-v2-DqjBlSeF.js";
+import { t as Ye } from "./internal/pano-measure-v2-DVlj0AUQ.js";
 import * as X from "three/webgpu";
 //#region src/shared-utils/three/getCoords.ts
 function Xe(e, t) {

package/dist/internal/{BasePlugin-89hE8Cux.js → BasePlugin-BW03eBFv.js}

@@ -3,7 +3,7 @@ import { t } from "./FiveUtil-DyTBRHpM.js";
 import { n } from "./defaultUrls-CfMtGzqM.js";
 //#region src/base/BasePlugin.ts
 var r = class {
-	VERSION = "4.0.0-webgpu.16";
+	VERSION = "4.0.0-webgpu.17";
 	NAME;
 	five;
 	workUtil;
@@ -30,4 +30,4 @@ var r = class {
 //#endregion
 export { r as t };
 
-//# sourceMappingURL=BasePlugin-89hE8Cux.js.map
+//# sourceMappingURL=BasePlugin-BW03eBFv.js.map

package/dist/internal/{BasePlugin-89hE8Cux.js.map → BasePlugin-BW03eBFv.js.map}

@@ -1 +1 @@
-{"version":3,"file":"BasePlugin-89hE8Cux.js","names":["Subscribe","Controller","workCode","DEFAULT_STATIC_PREFIX","five","FiveUtil","config"],"sources":["../../src/base/BasePlugin.ts"],"sourcesContent":["import type { PlaybackManager } from '../shared-utils/playback'\nimport type { Five } from '@realsee/five-webgpu'\nimport { Subscribe } from '../shared-utils/Subscribe'\nimport { DEFAULT_STATIC_PREFIX } from '../shared-utils'\nimport type { WorkUtil } from '../shared-utils/Utils/WorkUtil'\nimport { FiveUtil } from '../shared-utils/Utils/FiveUtil'\n\n/**\n * 基本属性字段\n */\ninterface State {\n  /**\n   * 插件是否启用\n   */\n  enabled: boolean\n\n  /**\n   * 插件UI是否展示\n   */\n  visible?: boolean\n\n  /**\n   * 插件的配置项\n   */\n  config?: unknown\n}\n\ninterface BaseOptions {\n  /** 是否是用户行为 */\n  userAction?: boolean\n  [key: string]: unknown\n}\n\ninterface Config {\n  mediaManager?: PlaybackManager\n  /** 静态资源前缀 */\n  staticPrefix?: string\n\n  /** 国际化转换函数 */\n  i18n?: (key: string) => string\n}\n\n/**\n * 插件基本事件\n */\n\ntype EventMap<PluginState> = {\n  /**\n   * 插件被销毁\n   */\n  dispose: () => void\n\n  /**\n   * 插件状态变化\n   * @param params.state      最新的State\n   * @param params.prevState  上一个State\n   * @param params.userAction 是否是用户触发\n   */\n  stateChange: (params: { state: PluginState; prevState?: PluginState; userAction: boolean }) => void\n}\n\ndeclare const __DNALOGEL_VERSION__: string\n\n/**\n * plugin 的基本控制器\n */\nabstract class Controller<PluginState extends State = State, PluginEventMap extends EventMap<PluginState> = EventMap<PluginState>> {\n  /**\n   * @realsee/dnalogel 版本号\n   */\n  public readonly VERSION: string = __DNALOGEL_VERSION__\n\n  public NAME?: string\n\n  public five: Five\n\n  public workUtil: WorkUtil\n\n  public fiveUtil: FiveUtil\n\n  public set workCode(workCode: string) {\n    this.workUtil.workCode = workCode\n    this.onWorkCodeChange()\n  }\n\n  public get workCode() {\n    return this.workUtil.workCode\n  }\n\n  /**\n   * @description: 插件事件钩子\n   */\n  public hooks: Subscribe<PluginEventMap> = new Subscribe()\n\n  public readonly staticPrefix: string = DEFAULT_STATIC_PREFIX\n\n  /**\n   * 当前状态\n   * @description\n   * ```text\n   * 可以通过 plugin.state 和 plugin.setState 来获取和设置。\n   * 通过 state 设置后，plugin 会通过合适的动画运动来达到设置的效果。\n   * 来迎合一些通过数据驱动的场景。\n   * ```\n   */\n  public abstract state: PluginState\n\n  public constructor(five: Five, config?: Config) {\n    this.five = five\n    this.fiveUtil = new FiveUtil(five)\n    this.workUtil = this.fiveUtil.workUtil\n    if (config?.staticPrefix) this.staticPrefix = config.staticPrefix\n  }\n\n  public updateFive(five: Five) {\n    this.five = five\n    this.fiveUtil.five = five\n    this.workUtil.five = five\n  }\n\n  /**\n   * 获取当前的插件状态，如果当初插件内存在需要通过动画变更的 state 值，则通过此方法可以得到中间状态\n   */\n  public getCurrentState() {\n    return this.state\n  }\n\n  /**\n   * 插件自身DOM添加到父容器\n   * @param wrapper\n   */\n  public appendTo?(wrapper: Element): void\n\n  /**\n   * 展示UI\n   */\n  public show?(options?: BaseOptions): Promise<void> | void\n\n  /**\n   * 隐藏UI\n   */\n  public hide?(options?: BaseOptions): Promise<void> | void\n\n  /**\n   * 设置state\n   * @param state 插件的目标状态\n   * @param options 配置项\n   */\n  public setState?(state: Partial<PluginState>, options?: BaseOptions): void\n\n  protected onWorkCodeChange() {}\n\n  /**\n   * 启用插件，让插件能够响应交互\n   */\n  public abstract enable(options?: BaseOptions): void\n\n  /**\n   * 禁用插件，让插件停止响应交互\n   */\n  public abstract disable(options?: BaseOptions): void\n\n  /**\n   * 插件进行销毁\n   */\n  public abstract dispose(): void\n}\n\nexport type { State, Config, EventMap, BaseOptions }\nexport { Controller }\n"],"mappings":";;;;AAkEA,IAAeC,IAAf,MAAmI;CAIjI,UAAA;CAEA;CAEA;CAEA;CAEA;CAEA,IAAW,SAAS,GAAkB;EAEpC,AADA,KAAK,SAAS,WAAWC,GACzB,KAAK,iBAAiB;CACxB;CAEA,IAAW,WAAW;EACpB,OAAO,KAAK,SAAS;CACvB;CAKA,QAA0C,IAAIF,EAAU;CAExD,eAAuCG;CAavC,YAAmB,GAAY,GAAiB;EAI9C,AAHA,KAAK,OAAOC,GACZ,KAAK,WAAW,IAAIC,EAASD,CAAI,GACjC,KAAK,WAAW,KAAK,SAAS,UAC1BE,GAAQ,iBAAc,KAAK,eAAeA,EAAO;CACvD;CAEA,WAAkB,GAAY;EAG5B,AAFA,KAAK,OAAOF,GACZ,KAAK,SAAS,OAAOA,GACrB,KAAK,SAAS,OAAOA;CACvB;CAKA,kBAAyB;EACvB,OAAO,KAAK;CACd;CAyBA,mBAA6B,CAAC;AAgBhC"}
+{"version":3,"file":"BasePlugin-BW03eBFv.js","names":["Subscribe","Controller","workCode","DEFAULT_STATIC_PREFIX","five","FiveUtil","config"],"sources":["../../src/base/BasePlugin.ts"],"sourcesContent":["import type { PlaybackManager } from '../shared-utils/playback'\nimport type { Five } from '@realsee/five-webgpu'\nimport { Subscribe } from '../shared-utils/Subscribe'\nimport { DEFAULT_STATIC_PREFIX } from '../shared-utils'\nimport type { WorkUtil } from '../shared-utils/Utils/WorkUtil'\nimport { FiveUtil } from '../shared-utils/Utils/FiveUtil'\n\n/**\n * 基本属性字段\n */\ninterface State {\n  /**\n   * 插件是否启用\n   */\n  enabled: boolean\n\n  /**\n   * 插件UI是否展示\n   */\n  visible?: boolean\n\n  /**\n   * 插件的配置项\n   */\n  config?: unknown\n}\n\ninterface BaseOptions {\n  /** 是否是用户行为 */\n  userAction?: boolean\n  [key: string]: unknown\n}\n\ninterface Config {\n  mediaManager?: PlaybackManager\n  /** 静态资源前缀 */\n  staticPrefix?: string\n\n  /** 国际化转换函数 */\n  i18n?: (key: string) => string\n}\n\n/**\n * 插件基本事件\n */\n\ntype EventMap<PluginState> = {\n  /**\n   * 插件被销毁\n   */\n  dispose: () => void\n\n  /**\n   * 插件状态变化\n   * @param params.state      最新的State\n   * @param params.prevState  上一个State\n   * @param params.userAction 是否是用户触发\n   */\n  stateChange: (params: { state: PluginState; prevState?: PluginState; userAction: boolean }) => void\n}\n\ndeclare const __DNALOGEL_VERSION__: string\n\n/**\n * plugin 的基本控制器\n */\nabstract class Controller<PluginState extends State = State, PluginEventMap extends EventMap<PluginState> = EventMap<PluginState>> {\n  /**\n   * @realsee/dnalogel 版本号\n   */\n  public readonly VERSION: string = __DNALOGEL_VERSION__\n\n  public NAME?: string\n\n  public five: Five\n\n  public workUtil: WorkUtil\n\n  public fiveUtil: FiveUtil\n\n  public set workCode(workCode: string) {\n    this.workUtil.workCode = workCode\n    this.onWorkCodeChange()\n  }\n\n  public get workCode() {\n    return this.workUtil.workCode\n  }\n\n  /**\n   * @description: 插件事件钩子\n   */\n  public hooks: Subscribe<PluginEventMap> = new Subscribe()\n\n  public readonly staticPrefix: string = DEFAULT_STATIC_PREFIX\n\n  /**\n   * 当前状态\n   * @description\n   * ```text\n   * 可以通过 plugin.state 和 plugin.setState 来获取和设置。\n   * 通过 state 设置后，plugin 会通过合适的动画运动来达到设置的效果。\n   * 来迎合一些通过数据驱动的场景。\n   * ```\n   */\n  public abstract state: PluginState\n\n  public constructor(five: Five, config?: Config) {\n    this.five = five\n    this.fiveUtil = new FiveUtil(five)\n    this.workUtil = this.fiveUtil.workUtil\n    if (config?.staticPrefix) this.staticPrefix = config.staticPrefix\n  }\n\n  public updateFive(five: Five) {\n    this.five = five\n    this.fiveUtil.five = five\n    this.workUtil.five = five\n  }\n\n  /**\n   * 获取当前的插件状态，如果当初插件内存在需要通过动画变更的 state 值，则通过此方法可以得到中间状态\n   */\n  public getCurrentState() {\n    return this.state\n  }\n\n  /**\n   * 插件自身DOM添加到父容器\n   * @param wrapper\n   */\n  public appendTo?(wrapper: Element): void\n\n  /**\n   * 展示UI\n   */\n  public show?(options?: BaseOptions): Promise<void> | void\n\n  /**\n   * 隐藏UI\n   */\n  public hide?(options?: BaseOptions): Promise<void> | void\n\n  /**\n   * 设置state\n   * @param state 插件的目标状态\n   * @param options 配置项\n   */\n  public setState?(state: Partial<PluginState>, options?: BaseOptions): void\n\n  protected onWorkCodeChange() {}\n\n  /**\n   * 启用插件，让插件能够响应交互\n   */\n  public abstract enable(options?: BaseOptions): void\n\n  /**\n   * 禁用插件，让插件停止响应交互\n   */\n  public abstract disable(options?: BaseOptions): void\n\n  /**\n   * 插件进行销毁\n   */\n  public abstract dispose(): void\n}\n\nexport type { State, Config, EventMap, BaseOptions }\nexport { Controller }\n"],"mappings":";;;;AAkEA,IAAeC,IAAf,MAAmI;CAIjI,UAAA;CAEA;CAEA;CAEA;CAEA;CAEA,IAAW,SAAS,GAAkB;EAEpC,AADA,KAAK,SAAS,WAAWC,GACzB,KAAK,iBAAiB;CACxB;CAEA,IAAW,WAAW;EACpB,OAAO,KAAK,SAAS;CACvB;CAKA,QAA0C,IAAIF,EAAU;CAExD,eAAuCG;CAavC,YAAmB,GAAY,GAAiB;EAI9C,AAHA,KAAK,OAAOC,GACZ,KAAK,WAAW,IAAIC,EAASD,CAAI,GACjC,KAAK,WAAW,KAAK,SAAS,UAC1BE,GAAQ,iBAAc,KAAK,eAAeA,EAAO;CACvD;CAEA,WAAkB,GAAY;EAG5B,AAFA,KAAK,OAAOF,GACZ,KAAK,SAAS,OAAOA,GACrB,KAAK,SAAS,OAAOA;CACvB;CAKA,kBAAyB;EACvB,OAAO,KAAK;CACd;CAyBA,mBAA6B,CAAC;AAgBhC"}

package/dist/internal/BasePluginWithData-5iUuu45u.js

@@ -0,0 +1,7 @@
+import { t as e } from "./BasePlugin-BW03eBFv.js";
+//#region src/base/BasePluginWithData.ts
+var t = class extends e {};
+//#endregion
+export { t };
+
+//# sourceMappingURL=BasePluginWithData-5iUuu45u.js.map

package/dist/internal/{BasePluginWithData-BLOUilj_.js.map → BasePluginWithData-5iUuu45u.js.map}

@@ -1 +1 @@
-{"version":3,"file":"BasePluginWithData-BLOUilj_.js","names":["BasePlugin.Controller","Controller$1","Controller"],"sources":["../../src/base/BasePluginWithData.ts"],"sourcesContent":["import * as BasePlugin from './BasePlugin'\n\ntype State = BasePlugin.State\ntype Config = BasePlugin.Config\n\ninterface EventMap<PluginState, PluginData> extends BasePlugin.EventMap<PluginState> {\n  /** 数据变更 */\n  dataChange: (data: PluginData, prevData?: PluginData) => void\n  /** 数据加载完成 */\n  dataLoaded: (data: PluginData) => void\n}\n\nabstract class Controller<\n  PluginState extends State,\n  PluginEventMap extends EventMap<PluginState, PluginData>,\n  PluginServerData,\n  PluginData,\n> extends BasePlugin.Controller<PluginState, PluginEventMap> {\n  protected abstract data?: PluginData\n\n  /**\n   * 加载插件依赖数据\n   * @param serverData 插件数据\n   * @param state 插件 State\n   */\n  public abstract load(serverData: PluginServerData, state?: PluginState, userAction?: boolean): Promise<void>\n}\n\nexport type { State, EventMap, Config }\nexport type { BaseOptions } from './BasePlugin'\nexport { Controller }\n"],"mappings":";;AAYA,IAAeE,IAAf,cAKUF,EAAmD,CAS7D"}
+{"version":3,"file":"BasePluginWithData-5iUuu45u.js","names":["BasePlugin.Controller","Controller$1","Controller"],"sources":["../../src/base/BasePluginWithData.ts"],"sourcesContent":["import * as BasePlugin from './BasePlugin'\n\ntype State = BasePlugin.State\ntype Config = BasePlugin.Config\n\ninterface EventMap<PluginState, PluginData> extends BasePlugin.EventMap<PluginState> {\n  /** 数据变更 */\n  dataChange: (data: PluginData, prevData?: PluginData) => void\n  /** 数据加载完成 */\n  dataLoaded: (data: PluginData) => void\n}\n\nabstract class Controller<\n  PluginState extends State,\n  PluginEventMap extends EventMap<PluginState, PluginData>,\n  PluginServerData,\n  PluginData,\n> extends BasePlugin.Controller<PluginState, PluginEventMap> {\n  protected abstract data?: PluginData\n\n  /**\n   * 加载插件依赖数据\n   * @param serverData 插件数据\n   * @param state 插件 State\n   */\n  public abstract load(serverData: PluginServerData, state?: PluginState, userAction?: boolean): Promise<void>\n}\n\nexport type { State, EventMap, Config }\nexport type { BaseOptions } from './BasePlugin'\nexport { Controller }\n"],"mappings":";;AAYA,IAAeE,IAAf,cAKUF,EAAmD,CAS7D"}

package/dist/internal/{Controller-Bt2czarX.js → Controller-5BvatEWD.js}

@@ -527,6 +527,7 @@ var $ = class extends e {
 						cssStyle: "pointer-events: none;"
 					}), n.setPoints([e.points.at(-1), r.point]), r.isAdsorbed) a.removeFromParent(), o.removeFromParent(), s.removeFromParent(), c = null, l = !1;
 					else {
+						this.group.addIfNotExists(a, o, s);
 						let t = e.points.at(-1);
 						if (Math.abs(r.point.y - t.y) > .2) {
 							let e = new p.Vector3(r.point.x, t.y, r.point.z);
@@ -559,12 +560,11 @@ var $ = class extends e {
 								cssStyle: "pointer-events: none; opacity: 0.5;"
 							}), a.setPoints([t, e]), o.setPoints([e, r.point]), s.position.copy(e), c = e.clone(), l = !0;
 						}
-						this.group.addIfNotExists(a, o, s);
 					}
 				}
 				if (e.points.length >= 2) {
 					let t = [...e.points, r.point];
-					m(t) ? (i.setStyle({ ...this.polygonStyle }), i.setPoints(t), this.group.addIfNotExists(i)) : i.removeFromParent();
+					m(t) ? (this.group.addIfNotExists(i), i.setStyle({ ...this.polygonStyle }), i.setPoints(t)) : i.removeFromParent();
 				}
 			}
 		}, x = (t) => {
@@ -645,7 +645,8 @@ var $ = class extends e {
 		this.emit("undo");
 	};
 	clearCurrentMeasure = () => {
-		this.currentMeasureMesh?.removeFromParent(), this.currentMeasureMesh = null, this.pointSelector.disable();
+		let e = this.currentMeasureMesh;
+		this.pointSelector.disable(), e && (this.removeMeshEventListeners(e), e.removeFromParent(), this.publishInteraction(this.currentMeasureMesh ? "drawing" : "idle"));
 	};
 	clear = () => {
 		this.cleanupPendingPress?.(), this.cancelRepositioning(), this.currentMeasureMesh = null, this.pointSelector.disable(), this.group.children.forEach(this.removeMeshEventListeners), this.group.removeChildren(), this.cursor.removeDeleteButton(), this.publishInteraction("idle");
@@ -955,4 +956,4 @@ var $ = class extends e {
 //#endregion
 export { m as n, $ as t };
 
-//# sourceMappingURL=Controller-Bt2czarX.js.map
+//# sourceMappingURL=Controller-5BvatEWD.js.map