@realsee/dnalogel 2.0.1 → 2.0.2-alpha

package/libs/PanoMeasurePlugin/Controller/BaseController.d.ts

@@ -1,16 +1,18 @@
-import type Line from '../Model/line';
 import type Magnifier from '../Modules/Magnifier';
 import type FiveHelper from '../Modules/FiveHelper';
 import type { Group } from 'three';
 import type { Model } from '../Model';
+import type { Config } from '../typings';
 import type { PanoMeasurePluginEvent } from '../typings/event.type';
 import type { UserDistanceItem } from '../utils/distanceDom';
 import type { Five, Intersection, IntersectMeshInterface, Subscribe } from '@realsee/five';
 import type { OpenParameter } from '../typings/data';
+import Line from '../Model/line';
 export interface IControllerParams {
     five: Five;
     group: Group;
     model: Model;
+    config: Config;
     mouseGroup: Group;
     container: Element;
     magnifier: Magnifier;
@@ -19,10 +21,12 @@ export interface IControllerParams {
     hook: Subscribe<PanoMeasurePluginEvent>;
     userDistanceItemCreator?: () => UserDistanceItem;
 }
-export default abstract class BaseController {
+export default class BaseController {
+    model: Model;
     protected five: Five;
     protected group: Group;
-    protected model: Model;
+    protected config: Config;
+    protected dashed: Line;
     protected disposed: boolean;
     protected isMobile: boolean;
     protected mouseGroup: Group;
@@ -32,8 +36,8 @@ export default abstract class BaseController {
     protected magnifier: IControllerParams['magnifier'];
     protected userDistanceItemCreator: IControllerParams['userDistanceItemCreator'];
     constructor(params: IControllerParams);
+    updateDistanceUI: () => void;
     protected removeLine(line: Line): void;
-    protected updateDistanceUI: () => void;
     protected updateMouseGroup(intersection: Intersection, mesh?: IntersectMeshInterface): Group;
     protected dispose(): void;
 }

package/libs/PanoMeasurePlugin/Controller/BaseController.js

@@ -1,7 +1,15 @@
+import Line from '../Model/line';
+import Point from '../Model/point';
 import { preventDefault } from '../utils/ironbox';
 export default class BaseController {
     constructor(params) {
         var _a, _b;
+        Object.defineProperty(this, "model", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "five", {
             enumerable: true,
             configurable: true,
@@ -14,7 +22,13 @@ export default class BaseController {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "model", {
+        Object.defineProperty(this, "config", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "dashed", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -73,6 +87,7 @@ export default class BaseController {
             configurable: true,
             writable: true,
             value: () => {
+                this.dashed.distanceItem.update(this.five);
                 this.model.lines.forEach((line) => line.distanceItem.update(this.five));
             }
         });
@@ -80,6 +95,7 @@ export default class BaseController {
         this.five = params.five;
         this.hook = params.hook;
         this.model = params.model;
+        this.config = params.config;
         this.magnifier = params.magnifier;
         this.container = params.container;
         this.fiveHelper = params.fiveHelper;
@@ -88,6 +104,10 @@ export default class BaseController {
         // ==================== Groups ====================
         this.group = params.group;
         this.mouseGroup = params.mouseGroup;
+        // ==================== 虚线 ====================
+        this.dashed = new Line(new Point([0, 0, 0]), new Point([0, 0, 0]), this.model);
+        this.dashed.mesh.setMaterial({ dashed: true, dashScale: 100 });
+        this.dashed.mesh.name = 'dashLine';
         const fiveElement = this.five.getElement();
         if (fiveElement) {
             fiveElement.addEventListener('touchstart', preventDefault);

package/libs/PanoMeasurePlugin/Controller/EditController.d.ts

@@ -1,5 +1,4 @@
 import type { LineJson } from '../typings/data';
-import { Model } from '../Model';
 import Line from '../Model/line';
 import BaseController, { IControllerParams } from './BaseController';
 export interface EditEvent {
@@ -7,15 +6,12 @@ export interface EditEvent {
 }
 export default class EditController extends BaseController {
     type: string;
-    model: Model;
     private pressPoint?;
     private hasAppendDashed;
     private hasAppendMouseGroup;
     private fiveElement?;
     /** 上一个端点位置 */
     private lastPoint;
-    /** 鼠标点到上一个端点连接的虚线 */
-    private dashed;
     private hammer?;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -15,12 +15,6 @@ export default class EditController extends BaseController {
             writable: true,
             value: 'edit'
         });
-        Object.defineProperty(this, "model", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new Model({ userDistanceItemCreator: this.userDistanceItemCreator })
-        });
         Object.defineProperty(this, "pressPoint", {
             enumerable: true,
             configurable: true,
@@ -52,13 +46,6 @@ export default class EditController extends BaseController {
             writable: true,
             value: null
         });
-        /** 鼠标点到上一个端点连接的虚线 */
-        Object.defineProperty(this, "dashed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "hammer", {
             enumerable: true,
             configurable: true,
@@ -271,9 +258,7 @@ export default class EditController extends BaseController {
                 this.dashed.distanceItem.update(this.five);
             }
         });
-        // ==================== 虚线 ====================
-        this.dashed = new Line(new Point([0, 0, 0]), new Point([0, 0, 0]), this.model);
-        this.dashed.mesh.setMaterial({ dashed: true, dashScale: 100 });
+        this.model = new Model(this.config);
         // ==================== 事件监听 ====================
         // five
         this.five.on('cameraUpdate', this.onCameraUpdate);

package/libs/PanoMeasurePlugin/Controller/MixedController.d.ts

@@ -15,8 +15,6 @@ export default class MixedController extends BaseController {
     private mobileNowPoint;
     private highlightedLines;
     private deleteDom;
-    /** 圆环点到上一个端点连接的虚线 */
-    private dashed;
     constructor(params: IControllerParams);
     dispose(): void;
     highlightLine(line: Line): void;

package/libs/PanoMeasurePlugin/Controller/MixedController.js

@@ -1,6 +1,5 @@
 import { Model } from '../Model';
 import Line from '../Model/line';
-import Point from '../Model/point';
 import BaseController from './BaseController';
 import DeleteDom from '../Modules/DeleteDom';
 import { findAssociatedLines } from '../utils/findAssociatedLines';
@@ -20,7 +19,7 @@ export default class MixedController extends BaseController {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new Model({ userDistanceItemCreator: this.userDistanceItemCreator })
+            value: new Model(this.config)
         });
         Object.defineProperty(this, "hasAppendDashed", {
             enumerable: true,
@@ -58,13 +57,6 @@ export default class MixedController extends BaseController {
             writable: true,
             value: void 0
         });
-        /** 圆环点到上一个端点连接的虚线 */
-        Object.defineProperty(this, "dashed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         /** 编辑线条发生改变时通知外部 */
         Object.defineProperty(this, "onLineChanged", {
             enumerable: true,
@@ -267,10 +259,6 @@ export default class MixedController extends BaseController {
             onClick: this.deleteDomClickCallback,
             cancelDelete: this.cancelDeleteClickCallback,
         }).appendTo(this.container);
-        // ==================== 虚线 ====================
-        this.dashed = new Line(new Point([0, 0, 0]), new Point([0, 0, 0]), this.model);
-        this.dashed.mesh.setMaterial({ dashed: true, dashScale: 100 });
-        this.dashed.mesh.name = 'dashLine';
         // ==================== 事件监听 ====================
         // five
         this.five.on('cameraUpdate', this.onCameraUpdate);

package/libs/PanoMeasurePlugin/Controller/index.d.ts

@@ -1,10 +1,11 @@
+import type { Config } from '../typings';
 import type { OpenParameter, PluginData } from '../typings/data';
 import type { PanoMeasurePluginEvent } from '../typings/event.type';
 import type { UserDistanceItem } from '../utils/distanceDom';
 import Magnifier, { MagnifierParameter } from '../Modules/Magnifier';
 import { Five, Subscribe } from '@realsee/five';
 export declare type Mode = 'Watch' | 'Edit' | 'Mixed' | 'View';
-export interface PanoMeasureParameterType {
+export interface PanoMeasureParameterType extends Partial<Config> {
     openParams?: OpenParameter;
     magnifierParams?: MagnifierParameter;
     useUIController?: boolean;
@@ -18,6 +19,7 @@ export default class MeasureController {
     private five;
     private model;
     private group;
+    private config;
     private fiveHelper;
     private useUIController?;
     private params;
@@ -67,4 +69,5 @@ export default class MeasureController {
      * @param isMobile true为移动端模式，false为pc端
      */
     changeIsMobile(isMobile: boolean): void;
+    changeConfigs(config: Partial<Config>): void;
 }

package/libs/PanoMeasurePlugin/Controller/index.js

@@ -4,6 +4,7 @@ import EditController from './EditController';
 import ViewController from './ViewController';
 import WatchController from './WatchController';
 import MixedController from './MixedController';
+import { omit } from '../../shared-utils/filter';
 import { Group } from 'three';
 import { Model } from '../Model';
 import { Subscribe } from '@realsee/five';
@@ -51,6 +52,12 @@ export default class MeasureController {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "config", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "fiveHelper", {
             enumerable: true,
             configurable: true,
@@ -149,7 +156,14 @@ export default class MeasureController {
         });
         this.five = five;
         this.params = params;
-        this.model = new Model({ userDistanceItemCreator: this.params.userDistanceItemCreator });
+        const defaultConfig = {
+            userDistanceItemCreator: undefined,
+            getDistanceText(distance) {
+                return distance.toFixed(2) + 'm';
+            },
+        };
+        this.config = Object.assign(Object.assign({}, defaultConfig), omit(params, ['openParams', 'magnifierParams']));
+        this.model = new Model(this.config);
         this.fiveHelper = new FiveHelper(five);
         // magnifier
         this.magnifier = new Magnifier(five, (_a = params.magnifierParams) !== null && _a !== void 0 ? _a : { width: 190, height: 190, scale: 2 });
@@ -171,6 +185,7 @@ export default class MeasureController {
             hook: this.hook,
             group: this.group,
             model: this.model,
+            config: this.config,
             magnifier: this.magnifier,
             container: this.container,
             fiveHelper: this.fiveHelper,
@@ -305,4 +320,12 @@ export default class MeasureController {
             (_b = this.useUIController) === null || _b === void 0 ? void 0 : _b.dispose();
         this.useUIController = new UIController(this, this.controllerParams);
     }
+    changeConfigs(config) {
+        var _a;
+        if (config.getDistanceText && config.getDistanceText !== this.config.getDistanceText) {
+            const getDistanceText = config.getDistanceText;
+            this.config.getDistanceText = getDistanceText;
+            (_a = this.controller) === null || _a === void 0 ? void 0 : _a.updateDistanceUI();
+        }
+    }
 }

package/libs/PanoMeasurePlugin/Model/index.d.ts

@@ -1,5 +1,5 @@
+import type { Config } from '../typings';
 import type { PluginData } from '../typings/data';
-import type { UserDistanceItem } from '../utils/distanceDom';
 import Line from './line';
 import Point from './point';
 import { Subscribe, SubscribeEventMap } from '@realsee/five';
@@ -14,16 +14,13 @@ interface IModelEvent extends SubscribeEventMap {
      */
     lineRemoved: (lines: Line) => void;
 }
-export interface ModelParams {
-    userDistanceItemCreator?: () => UserDistanceItem;
-}
 export declare class Model {
     readonly lines: Line[];
     readonly points: Point[];
-    readonly params: ModelParams;
+    readonly params: Config;
     readonly polylines: Polyline[];
     readonly hook: Subscribe<IModelEvent>;
-    constructor(params: ModelParams);
+    constructor(params: Config);
     addLine(line: Line): this;
     removeLineByID(lineID: string): void;
     removeLine(line: Line): this;

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

@@ -0,0 +1,8 @@
+import type { UserDistanceItem } from '../utils/distanceDom';
+export interface Config {
+    userDistanceItemCreator: undefined | (() => UserDistanceItem);
+    /** 展示 distance DOM 时，使用的转换函数
+     * @param distance 单位是 m
+     */
+    getDistanceText: (distance: number) => string;
+}

package/libs/PanoMeasurePlugin/typings/index.js

@@ -0,0 +1 @@
+export {};

package/libs/PanoMeasurePlugin/utils/distanceDom.d.ts

@@ -12,12 +12,12 @@ export interface UserDistanceItem {
         polyline: PolylineCompletelyJson;
     }) => void;
 }
-export interface IDistanceItemProps {
+export interface CreateDistanceItemProps {
     line: Line;
     userDistanceItem?: UserDistanceItem;
     clickCallback?: (item: DistanceItem) => unknown;
 }
-export declare function createDistanceItem(props: IDistanceItemProps): {
+export declare function createDistanceItem(props: CreateDistanceItemProps): {
     lineID: string;
     ndcPosition: Vector3;
     update: (five: Five) => void;

package/libs/PanoMeasurePlugin/utils/distanceDom.js

@@ -89,7 +89,8 @@ export function createDistanceItem(props) {
         if (userDistanceItem) {
             userDistanceItem.update({ line: line.toCompletelyJson(), polyline: line.getPolyline().toCompletelyJson() });
         }
-        const distanceString = startPoint.position.clone().distanceTo(endPoint.position).toFixed(2) + 'm';
+        const distance = startPoint.position.clone().distanceTo(endPoint.position);
+        const distanceString = props.line.model.params.getDistanceText(distance);
         contentDom.innerText !== distanceString && (contentDom.innerText = distanceString);
     }
     function appendTo(container) {

package/libs/PanoRulerPlugin/Plugin.d.ts

@@ -1,7 +1,9 @@
 import type { FivePlugin } from '@realsee/five';
 import type { RoomInfo, RoomRules } from './typings';
-export interface PanoRulerPluginOptions {
-    distanceText?: (distance: number) => string;
+interface PanoRulerPluginConfig {
+    distanceText: (distance: number) => string;
+}
+export interface PanoRulerPluginOptions extends Partial<PanoRulerPluginConfig> {
     className?: string;
 }
 interface PanoRulerPluginPluginState {
@@ -19,6 +21,7 @@ export interface PanoRulerPluginExportType {
     disable: () => void;
     load: (roomInfo?: RoomInfo, roomRules?: RoomRules, options?: PanoRulerPluginOptions) => Promise<boolean>;
     state: PanoRulerPluginPluginState;
+    changeConfigs: (config: Partial<PanoRulerPluginConfig>) => void;
 }
 /**
  * 全景标尺插件

package/libs/PanoRulerPlugin/Plugin.js

@@ -387,11 +387,28 @@ export const PanoRulerPlugin = (five, params) => {
         state.enable = false;
         return true;
     };
+    function changeConfigs(config) {
+        if (config.distanceText && config.distanceText !== state.options.distanceText) {
+            const distanceText = config.distanceText;
+            state.options.distanceText = distanceText;
+            Object.values(__rule).forEach((item) => {
+                item.rules.forEach((rule) => {
+                    const [origin, vertical] = rule.rule;
+                    const distance = origin.distanceTo(vertical);
+                    const textEle = rule.$element.querySelector('.PanoRulerPlugin-rule-label-name');
+                    if (!textEle)
+                        return;
+                    textEle.innerText = distanceText(distance);
+                });
+            });
+        }
+    }
     return {
         enable,
         disable,
         load,
         state,
+        changeConfigs,
     };
 };
 export const panoRulerPluginServerParams = {

package/libs/floorplan/Components/CurrentFloor.js

@@ -33,7 +33,7 @@ function add_css(target) {
 	append_styles(target, "svelte-bl8zrz", ".floorplan-plugin__floor.svelte-bl8zrz{position:absolute;left:0;top:0;width:100%;height:100%;opacity:0;pointer-events:none}.floorplan-plugin__floor--is-current.svelte-bl8zrz{opacity:1;pointer-events:auto}");
 }
 
-// (20:2) {#if hoverEnable}
+// (22:2) {#if hoverEnable}
 function create_if_block_2(ctx) {
 	let roomhighlight;
 	let current;
@@ -42,7 +42,7 @@ function create_if_block_2(ctx) {
 		{
 			floorIndex: /*floorIndex*/ ctx[1],
 			floorplanData: /*floorplanData*/ ctx[5],
-			hoveredRoom: /*hoveredRoom*/ ctx[8]
+			hoveredRoom: /*hoveredRoom*/ ctx[10]
 		}
 	];
 
@@ -63,12 +63,12 @@ function create_if_block_2(ctx) {
 			current = true;
 		},
 		p(ctx, dirty) {
-			const roomhighlight_changes = (dirty & /*floorIndex, floorplanData, hoveredRoom*/ 290)
+			const roomhighlight_changes = (dirty & /*floorIndex, floorplanData, hoveredRoom*/ 1058)
 			? get_spread_update(roomhighlight_spread_levels, [
 					{
 						floorIndex: /*floorIndex*/ ctx[1],
 						floorplanData: /*floorplanData*/ ctx[5],
-						hoveredRoom: /*hoveredRoom*/ ctx[8]
+						hoveredRoom: /*hoveredRoom*/ ctx[10]
 					}
 				])
 			: {};
@@ -90,7 +90,7 @@ function create_if_block_2(ctx) {
 	};
 }
 
-// (24:2) {#if roomLabelsEnable}
+// (26:2) {#if roomLabelsEnable}
 function create_if_block_1(ctx) {
 	let roomlabels;
 	let current;
@@ -99,9 +99,10 @@ function create_if_block_1(ctx) {
 		{
 			floorplanData: /*floorplanData*/ ctx[5],
 			floorIndex: /*floorIndex*/ ctx[1],
-			getLabelElement: /*getLabelElement*/ ctx[6],
-			hoveredRoom: /*hoveredRoom*/ ctx[8],
-			adaptiveRoomLabelVisibleEnable: /*adaptiveRoomLabelVisibleEnable*/ ctx[7]
+			getRoomAreaText: /*getRoomAreaText*/ ctx[6],
+			getLabelElement: /*getLabelElement*/ ctx[7],
+			hoveredRoom: /*hoveredRoom*/ ctx[10],
+			adaptiveRoomLabelVisibleEnable: /*adaptiveRoomLabelVisibleEnable*/ ctx[9]
 		}
 	];
 
@@ -122,14 +123,15 @@ function create_if_block_1(ctx) {
 			current = true;
 		},
 		p(ctx, dirty) {
-			const roomlabels_changes = (dirty & /*floorplanData, floorIndex, getLabelElement, hoveredRoom, adaptiveRoomLabelVisibleEnable*/ 482)
+			const roomlabels_changes = (dirty & /*floorplanData, floorIndex, getRoomAreaText, getLabelElement, hoveredRoom, adaptiveRoomLabelVisibleEnable*/ 1762)
 			? get_spread_update(roomlabels_spread_levels, [
 					{
 						floorplanData: /*floorplanData*/ ctx[5],
 						floorIndex: /*floorIndex*/ ctx[1],
-						getLabelElement: /*getLabelElement*/ ctx[6],
-						hoveredRoom: /*hoveredRoom*/ ctx[8],
-						adaptiveRoomLabelVisibleEnable: /*adaptiveRoomLabelVisibleEnable*/ ctx[7]
+						getRoomAreaText: /*getRoomAreaText*/ ctx[6],
+						getLabelElement: /*getLabelElement*/ ctx[7],
+						hoveredRoom: /*hoveredRoom*/ ctx[10],
+						adaptiveRoomLabelVisibleEnable: /*adaptiveRoomLabelVisibleEnable*/ ctx[9]
 					}
 				])
 			: {};
@@ -151,7 +153,7 @@ function create_if_block_1(ctx) {
 	};
 }
 
-// (27:2) {#if ruleLabelsEnable}
+// (38:2) {#if ruleLabelsEnable}
 function create_if_block(ctx) {
 	let rulelabels;
 	let current;
@@ -159,7 +161,8 @@ function create_if_block(ctx) {
 	const rulelabels_spread_levels = [
 		{
 			floorplanData: /*floorplanData*/ ctx[5],
-			floorIndex: /*floorIndex*/ ctx[1]
+			floorIndex: /*floorIndex*/ ctx[1],
+			getRuleDistanceText: /*getRuleDistanceText*/ ctx[8]
 		}
 	];
 
@@ -180,11 +183,12 @@ function create_if_block(ctx) {
 			current = true;
 		},
 		p(ctx, dirty) {
-			const rulelabels_changes = (dirty & /*floorplanData, floorIndex*/ 34)
+			const rulelabels_changes = (dirty & /*floorplanData, floorIndex, getRuleDistanceText*/ 290)
 			? get_spread_update(rulelabels_spread_levels, [
 					{
 						floorplanData: /*floorplanData*/ ctx[5],
-						floorIndex: /*floorIndex*/ ctx[1]
+						floorIndex: /*floorIndex*/ ctx[1],
+						getRuleDistanceText: /*getRuleDistanceText*/ ctx[8]
 					}
 				])
 			: {};
@@ -413,7 +417,9 @@ function instance($$self, $$props, $$invalidate) {
 	let { roomLabelsEnable } = $$props;
 	let { ruleLabelsEnable } = $$props;
 	let { floorplanData } = $$props;
+	let { getRoomAreaText } = $$props;
 	let { getLabelElement } = $$props;
+	let { getRuleDistanceText } = $$props;
 	let { adaptiveRoomLabelVisibleEnable } = $$props;
 	const hoveredRoom = writable(undefined);
 
@@ -424,8 +430,10 @@ function instance($$self, $$props, $$invalidate) {
 		if ('roomLabelsEnable' in $$props) $$invalidate(3, roomLabelsEnable = $$props.roomLabelsEnable);
 		if ('ruleLabelsEnable' in $$props) $$invalidate(4, ruleLabelsEnable = $$props.ruleLabelsEnable);
 		if ('floorplanData' in $$props) $$invalidate(5, floorplanData = $$props.floorplanData);
-		if ('getLabelElement' in $$props) $$invalidate(6, getLabelElement = $$props.getLabelElement);
-		if ('adaptiveRoomLabelVisibleEnable' in $$props) $$invalidate(7, adaptiveRoomLabelVisibleEnable = $$props.adaptiveRoomLabelVisibleEnable);
+		if ('getRoomAreaText' in $$props) $$invalidate(6, getRoomAreaText = $$props.getRoomAreaText);
+		if ('getLabelElement' in $$props) $$invalidate(7, getLabelElement = $$props.getLabelElement);
+		if ('getRuleDistanceText' in $$props) $$invalidate(8, getRuleDistanceText = $$props.getRuleDistanceText);
+		if ('adaptiveRoomLabelVisibleEnable' in $$props) $$invalidate(9, adaptiveRoomLabelVisibleEnable = $$props.adaptiveRoomLabelVisibleEnable);
 	};
 
 	return [
@@ -435,7 +443,9 @@ function instance($$self, $$props, $$invalidate) {
 		roomLabelsEnable,
 		ruleLabelsEnable,
 		floorplanData,
+		getRoomAreaText,
 		getLabelElement,
+		getRuleDistanceText,
 		adaptiveRoomLabelVisibleEnable,
 		hoveredRoom
 	];
@@ -458,8 +468,10 @@ class Component extends SvelteComponent {
 				roomLabelsEnable: 3,
 				ruleLabelsEnable: 4,
 				floorplanData: 5,
-				getLabelElement: 6,
-				adaptiveRoomLabelVisibleEnable: 7
+				getRoomAreaText: 6,
+				getLabelElement: 7,
+				getRuleDistanceText: 8,
+				adaptiveRoomLabelVisibleEnable: 9
 			},
 			add_css
 		);