@realsee/dnalogel 4.0.0-webgpu.10 → 4.0.0-webgpu.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 4.0.0-webgpu.12
+
+- 测量插件新增 `interactionState` 与 `interactionChange`，通知绘制、长按等待、端点调整和确认／取消状态，供宿主按当前操作更新提示。
+- 提供已完成测量数与当前绘制点数，覆盖选点、撤销、载入、清空和删除后的可用操作。
+- 保持既有手势和数据格式，新增状态转换回归测试。
+
+## 4.0.0-webgpu.11
+
+- 修复测量端点命中区域过大导致空白拖动误编辑的问题，按屏幕像素识别端点。
+- 统一端点编辑的指针事件；松手结束编辑，取消、失焦或丢失捕获时还原，悬停不再修改端点。
+- 保留长按 500ms 编辑方式，支持延迟挂载画布，补充测量交互说明与回归测试。
+
 ## 4.0.0-webgpu.10
 
 - 只读 View 标尺不处理编辑快捷键，保留浏览器和宿主键盘行为；编辑模式快捷键保持原有行为。

package/README.md

@@ -110,3 +110,19 @@ The root exports named plugin factories and instance types. Import data, configu
 # License
 
 [TERMS](https://github.com/realsee-developer/dnalogel/blob/main/TERMS.txt)
+
+## 测量工具的手势
+
+- 转动视角：避开测量点，按住画面拖动。
+- 调整测量点：按住测量线一端的圆点不动，等约半秒，再拖到新位置；松开确认。
+- 桌面端按 Esc 取消本次调整。触摸设备沿用长按选点的绘制方式。
+
+
+### 按操作状态更新提示
+
+读取 `measure.interactionState` 初始化 UI，订阅 `measure.on('interactionChange', state => ...)` 后续变化。销毁 UI 前调用订阅返回的取消函数。
+
+- `phase` 为 `idle`、`drawing`、`holding` 或 `editing`，分别表示浏览、绘制、按住端点等待和调整端点。
+- `measurementCount` 为已完成的测量数量；`pointCount` 为正在绘制的点数。
+- 确认或取消调整后回到 `idle`，`result` 分别为 `confirmed` 或 `cancelled`。事件在坐标提交或还原、指针监听清理后发出。
+- 绘制选点、撤销、载入、清空和删除测量都会同步状态，宿主可以据此展示当前可用操作。

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-BOdqCcAc.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-Bi8r_6Gk.js";

package/dist/index.js

@@ -15,39 +15,39 @@ 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-B8zUUhVk.js";
+import { n as W, r as G, t as K } from "./internal/area-maker-BeBn65zc.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-BqpiX1z5.js";
-import { t as _e } from "./internal/object3d-helper-DHPCLk5D.js";
-import { r as ve } from "./internal/sculpt-Cqspd_4E.js";
-import { t as ye } from "./internal/pano-tag-NjpQygy3.js";
-import { n as be, t as xe } from "./internal/cruise-DeRGFGQ7.js";
-import { t as Se } from "./internal/current-pano-image-sc2LFrya.js";
+import { r as ge } from "./internal/Work-BhhN7u0F.js";
+import { t as _e } from "./internal/object3d-helper-CpTwFvfA.js";
+import { r as ve } from "./internal/sculpt-9Mn330l3.js";
+import { t as ye } from "./internal/pano-tag-BJ4_t4J4.js";
+import { n as be, t as xe } from "./internal/cruise-D473G5eR.js";
+import { t as Se } from "./internal/current-pano-image-CVkGFOqe.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-D6kvLcMk.js";
+import { t as Ee } from "./internal/measure-y2GbIzBe.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-p7IecfuB.js";
+import { t as Ae } from "./internal/model-maker-CwyCnEOs.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-B_gNSkDR.js";
+import { t as Pe } from "./internal/pano-compass-AD-jrS_J.js";
 import { t as Fe } from "./internal/pano-cursor-raycaster-DydRx7wS.js";
-import { t as Ie } from "./internal/pano-door-label-BllgT6o-.js";
-import { t as Le } from "./internal/pano-measure-CoyU2j3g.js";
+import { t as Ie } from "./internal/pano-door-label-yE2L5n-c.js";
+import { t as Le } from "./internal/pano-measure-COBz9Fp1.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-DGQi5GPp.js";
-import { t as He } from "./internal/pipeline-D3S3Qt7T.js";
+import { t as Ve } from "./internal/pano-video-D7q3cxv8.js";
+import { t as He } from "./internal/pipeline-BRRIQUds.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-BOdqCcAc.js";
+import { a as We, c as Ge, i as Y, o as Ke, s as qe } from "./internal/floorplan-Bi8r_6Gk.js";
 import * as X from "three/webgpu";
 //#region src/shared-utils/three/getCoords.ts
 function Je(e, t) {

package/dist/internal/{BasePlugin-Bcnwb_Wp.js → BasePlugin-BW_ljJJD.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.10";
+	VERSION = "4.0.0-webgpu.12";
 	NAME;
 	five;
 	workUtil;
@@ -30,4 +30,4 @@ var r = class {
 //#endregion
 export { r as t };
 
-//# sourceMappingURL=BasePlugin-Bcnwb_Wp.js.map
+//# sourceMappingURL=BasePlugin-BW_ljJJD.js.map

package/dist/internal/{BasePlugin-Bcnwb_Wp.js.map → BasePlugin-BW_ljJJD.js.map}

@@ -1 +1 @@
-{"version":3,"file":"BasePlugin-Bcnwb_Wp.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-BW_ljJJD.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-D0fXwQd_.js

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

package/dist/internal/{BasePluginWithData-veD_f0Qf.js.map → BasePluginWithData-D0fXwQd_.js.map}

@@ -1 +1 @@
-{"version":3,"file":"BasePluginWithData-veD_f0Qf.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-D0fXwQd_.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-DMHTzGm7.js → Controller-DG3aerF4.js}

@@ -8,7 +8,7 @@ import { n as s, t as c } from "./isNil-CQNA0Sbe.js";
 import { t as l } from "./rayOnLine-CrCXTByv.js";
 import { n as u, r as d, s as f } from "./boundingBox-CIqXgNXW.js";
 import { t as p } from "./CSS3DRender-Du8bC8b8.js";
-import { t as m } from "./BasePlugin-Bcnwb_Wp.js";
+import { t as m } from "./BasePlugin-BW_ljJJD.js";
 import { t as h } from "./rad2Deg-DutG55Wb.js";
 import { t as g } from "./vectorIsEqual-BXdJrP0J.js";
 import * as _ from "three/webgpu";
@@ -2495,4 +2495,4 @@ var Q = "Object3DHelperPlugin", $ = Q, Te = () => {
 //#endregion
 export { Oe as t };
 
-//# sourceMappingURL=Controller-DMHTzGm7.js.map
+//# sourceMappingURL=Controller-DG3aerF4.js.map