@realsee/dnalogel 2.0.0-alpha.9 → 2.0.0-beta.36

package/libs/PanoCursorRaycasterPlugin/index.d.ts

@@ -1,5 +1,5 @@
-import { Group, Vector3 } from 'three';
 import type { FivePlugin, Intersection } from '@realsee/five';
+import { Group, Vector3 } from 'three';
 export interface PanoCursorRaycasterPluginParameterType {
 }
 export interface PanoCursorRaycasterPluginExportType {

package/libs/PanoCursorRaycasterPlugin/index.js

@@ -40,20 +40,22 @@ export const PanoCursorRaycasterPlugin = (five) => {
         return { clear, pointAxesHelperMesh };
     };
     const canSeePoint = (point, distanceError = 0) => {
-        const cameraPosition = five?.camera?.position;
+        var _a, _b;
+        const cameraPosition = (_a = five === null || five === void 0 ? void 0 : five.camera) === null || _a === void 0 ? void 0 : _a.position;
         if (!cameraPosition)
             return false;
         const distance = point.distanceTo(cameraPosition);
         const direction = point.sub(cameraPosition).normalize();
         const raycaster = new Raycaster(cameraPosition, direction);
-        const intersection = five.model.intersectRaycaster(raycaster)?.[0];
+        const intersection = (_b = five.model.intersectRaycaster(raycaster)) === null || _b === void 0 ? void 0 : _b[0];
         return !(intersection && intersection.distance + distanceError < distance);
     };
     const intersection = () => {
         return state.intersection;
     };
     const destroy = () => {
-        state.disposers?.forEach?.((d) => d?.());
+        var _a, _b;
+        (_b = (_a = state.disposers) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, (d) => d === null || d === void 0 ? void 0 : d());
         five.off('intersectionOnModelUpdate', updateIntersection);
         five.off('intersectionHidden', clearIntersection);
     };

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

@@ -1,11 +1,12 @@
-import Line from '../Model/line';
-import Magnifier from '../Modules/Magnifier';
-import FiveHelper from '../Modules/FiveHelper';
-import { Group } from 'three';
-import { Model } from '../Model';
-import { PluginEvent } from '../typings/event.type';
-import { Five, Intersection, IntersectMeshInterface, Subscribe } from '@realsee/five';
-import { UserDistanceItem } from '../utils/distanceDom';
+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 { 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';
 export interface IControllerParams {
     five: Five;
     group: Group;
@@ -14,7 +15,8 @@ export interface IControllerParams {
     container: Element;
     magnifier: Magnifier;
     fiveHelper: FiveHelper;
-    hook: Subscribe<PluginEvent>;
+    openParams: OpenParameter;
+    hook: Subscribe<PanoMeasurePluginEvent>;
     userDistanceItemCreator?: () => UserDistanceItem;
 }
 export default abstract class BaseController {
@@ -22,6 +24,7 @@ export default abstract class BaseController {
     protected group: Group;
     protected model: Model;
     protected disposed: boolean;
+    protected isMobile: boolean;
     protected mouseGroup: Group;
     protected container: Element;
     protected fiveHelper: FiveHelper;

package/libs/PanoMeasurePlugin/Controller/BaseController.js

@@ -1,16 +1,81 @@
 import { preventDefault } from '../utils/ironbox';
 export default class BaseController {
-    five;
-    group;
-    model;
-    disposed = false;
-    mouseGroup;
-    container;
-    fiveHelper;
-    hook;
-    magnifier;
-    userDistanceItemCreator;
     constructor(params) {
+        var _a, _b;
+        Object.defineProperty(this, "five", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "group", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "model", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "disposed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "isMobile", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "mouseGroup", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "container", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "fiveHelper", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "hook", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "magnifier", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "userDistanceItemCreator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "updateDistanceUI", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.model.lines.forEach((line) => line.distanceItem.update(this.five));
+            }
+        });
         // ==================== Params ====================
         this.five = params.five;
         this.hook = params.hook;
@@ -18,6 +83,7 @@ export default class BaseController {
         this.magnifier = params.magnifier;
         this.container = params.container;
         this.fiveHelper = params.fiveHelper;
+        this.isMobile = (_b = (_a = params.openParams) === null || _a === void 0 ? void 0 : _a.isMobile) !== null && _b !== void 0 ? _b : false;
         this.userDistanceItemCreator = params.userDistanceItemCreator;
         // ==================== Groups ====================
         this.group = params.group;
@@ -33,9 +99,6 @@ export default class BaseController {
         line.distanceItem.remove();
         this.five.needsRender = true;
     }
-    updateDistanceUI = () => {
-        this.model.lines.forEach((line) => line.distanceItem.update(this.five));
-    };
     updateMouseGroup(intersection, mesh) {
         if (!intersection)
             return this.mouseGroup;
@@ -58,7 +121,7 @@ export default class BaseController {
     }
     dispose() {
         this.disposed = true;
-        this.magnifier.dispose();
+        this.magnifier.remove();
         this.model.lines.forEach((line) => this.removeLine(line));
         const fiveElement = this.five.getElement();
         if (fiveElement) {

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

@@ -1,6 +1,6 @@
+import type { LineJson } from '../typings/data';
 import { Model } from '../Model';
 import Line from '../Model/line';
-import { LineJson } from '../typings/data';
 import BaseController, { IControllerParams } from './BaseController';
 export interface EditEvent {
     editedLineChange: (lines: LineJson[]) => void;

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -1,4 +1,4 @@
-import * as Hammer from 'hammerjs';
+import Hammer from 'hammerjs';
 import { Model } from '../Model';
 import Line from '../Model/line';
 import Point from '../Model/point';
@@ -6,32 +6,271 @@ import throttle from '../../shared-utils/throttle';
 import BaseController from './BaseController';
 import { getIntersectionFromEvent } from '../utils/getIntersectionFromEvent';
 export default class EditController extends BaseController {
-    type = 'edit';
-    model = new Model({ userDistanceItemCreator: this.userDistanceItemCreator });
-    pressPoint;
-    hasAppendDashed = false;
-    hasAppendMouseGroup = false;
-    fiveElement;
-    /** 上一个端点位置 */
-    lastPoint = null;
-    /** 鼠标点到上一个端点连接的虚线 */
-    dashed;
-    hammer;
-    /** 根据 intersection 更新放大镜和吸附点 */
-    onIntersectionUpdate = throttle((intersection, mesh) => {
-        if (this.hasAppendMouseGroup === false) {
-            this.group.add(this.mouseGroup);
-            this.magnifier.appendTo(this.container);
-            this.hasAppendMouseGroup = true;
-        }
-        const position = this.updateMouseGroup(intersection, mesh).position;
-        this.pressPoint?.position.copy(position);
-        this.updateDashed();
-        requestAnimationFrame(() => this.magnifier.updateWithPoint(this.mouseGroup.position));
-        this.five.needsRender = true;
-    }, 20);
     constructor(params) {
+        var _a;
         super(params);
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            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,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "hasAppendDashed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "hasAppendMouseGroup", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "fiveElement", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /** 上一个端点位置 */
+        Object.defineProperty(this, "lastPoint", {
+            enumerable: true,
+            configurable: true,
+            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,
+            writable: true,
+            value: void 0
+        });
+        /** 根据 intersection 更新放大镜和吸附点 */
+        Object.defineProperty(this, "onIntersectionUpdate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: throttle((intersection, mesh) => {
+                var _a;
+                if (this.hasAppendMouseGroup === false) {
+                    this.group.add(this.mouseGroup);
+                    this.magnifier.appendTo(this.container);
+                    this.hasAppendMouseGroup = true;
+                }
+                const position = this.updateMouseGroup(intersection, mesh).position;
+                (_a = this.pressPoint) === null || _a === void 0 ? void 0 : _a.position.copy(position);
+                this.updateDashed();
+                requestAnimationFrame(() => this.magnifier.renderWithPoint(this.mouseGroup.position));
+                this.five.needsRender = true;
+            }, 20)
+        });
+        /** 撤销编辑 */
+        Object.defineProperty(this, "revoke", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                // ============ revoke points ============
+                // 如果当前没有虚线，只有起始点，需要删除起始点，重置起始状态。并删除虚线实例
+                if (this.model.lines.length === 0 && this.lastPoint) {
+                    this.lastPoint = null;
+                    this.hasAppendDashed = false;
+                    this.dashed.distanceItem.remove();
+                    this.group.remove(this.dashed.mesh);
+                    this.hook.emit('anchorChange', null);
+                    this.five.needsRender = true;
+                    return;
+                }
+                if (this.model.lines.length === 0 && !this.lastPoint)
+                    return;
+                if (!this.lastPoint)
+                    return;
+                const revokedLine = this.model.lines[this.model.lines.length - 1];
+                const lastPoint = revokedLine.findAnotherPoint(this.lastPoint);
+                if (!lastPoint)
+                    return;
+                this.lastPoint = lastPoint;
+                this.hook.emit('anchorChange', lastPoint.position);
+                // ============ revoke lines ============
+                this.group.remove(revokedLine.mesh);
+                this.model.removeLine(revokedLine);
+                // ============ revoke mouse group ============
+                this.hasAppendMouseGroup = false;
+                this.mouseGroup.position.copy(this.lastPoint.position);
+                this.group.remove(this.mouseGroup);
+                // ============ revoke lineDistance ============
+                revokedLine.distanceItem.remove();
+                // ============ revoke dashed ============
+                this.updateDashed();
+                // ============ revoke magnifier ============
+                this.magnifier.remove();
+                this.five.needsRender = true;
+            }
+        });
+        Object.defineProperty(this, "onMouseLeave", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.magnifier.remove();
+                this.group.remove(this.mouseGroup);
+                this.hasAppendMouseGroup = false;
+                if (this.lastPoint) {
+                    this.mouseGroup.position.copy(this.lastPoint.position);
+                    this.updateDashed();
+                }
+            }
+        });
+        /** 编辑线条发生改变时通知外部 */
+        Object.defineProperty(this, "onLineChanged", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.hook.emit('editedLineChange', this.model.lines.map((line) => line.toCompletelyJson()));
+            }
+        });
+        Object.defineProperty(this, "onPress", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (e) => {
+                const [intersection] = getIntersectionFromEvent(this.five, e);
+                if (!intersection || !intersection.face)
+                    return;
+                const nowPoint = new Point(intersection.point);
+                this.pressPoint = nowPoint;
+                this.onIntersectionUpdate(intersection);
+            }
+        });
+        /**
+         * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
+         * 2. 如果有长按点，把长按点位置更新为当前位置
+         */
+        Object.defineProperty(this, "onPan", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (e) => {
+                if (!this.pressPoint)
+                    return;
+                const [intersection] = getIntersectionFromEvent(this.five, e);
+                if (!intersection || !intersection.face)
+                    return;
+                this.onIntersectionUpdate(intersection);
+            }
+        });
+        Object.defineProperty(this, "onPanEnd", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (e) => {
+                if (!this.pressPoint)
+                    return;
+                this.onTap(e);
+            }
+        });
+        /**
+         * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
+         * 2. 把上一个点的位置更新为当前点的位置
+         * 3. 清除 mouseGroup 和 magnifier
+         */
+        Object.defineProperty(this, "onTap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (e) => {
+                if (!this.hasAppendDashed) {
+                    this.dashed.distanceItem.appendTo(this.container);
+                    this.group.add(this.dashed.mesh);
+                }
+                this.hasAppendDashed = true;
+                const [intersection] = getIntersectionFromEvent(this.five, e);
+                this.updateMouseGroup(intersection);
+                const nowPoint = new Point(this.mouseGroup.position);
+                const lastPoint = this.lastPoint;
+                if (nowPoint)
+                    this.lastPoint = nowPoint;
+                if (nowPoint && lastPoint) {
+                    const line = new Line(lastPoint, nowPoint, this.model);
+                    line.distanceItem.appendTo(this.container);
+                    this.model.addLine(line);
+                    this.group.add(line.mesh);
+                    line.distanceItem.update(this.five);
+                }
+                this.pressPoint = undefined;
+                this.hasAppendMouseGroup = false;
+                this.magnifier.remove();
+                this.group.remove(this.mouseGroup);
+                this.updateDashed();
+                this.five.needsRender = true;
+                this.hook.emit('anchorChange', nowPoint.position);
+            }
+        });
+        Object.defineProperty(this, "onWantsTapGesture", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => false
+        });
+        /** 编辑时取消走点 */
+        Object.defineProperty(this, "onWantsToMoveToPano", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => false
+        });
+        /** 存在长按点时不能移动全景 */
+        Object.defineProperty(this, "onWantsPanGesture", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => (this.pressPoint ? false : undefined)
+        });
+        /** 移动全景时更新 distanceItem 在屏幕上的位置 */
+        Object.defineProperty(this, "onCameraUpdate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.updateDistanceUI();
+                this.dashed.distanceItem.update(this.five);
+            }
+        });
+        /** 更新虚线 */
+        Object.defineProperty(this, "updateDashed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (!this.lastPoint)
+                    return;
+                this.dashed.points[0].position.copy(this.lastPoint.position);
+                this.dashed.points[1].position.copy(this.mouseGroup.position);
+                this.dashed.mesh.setPoints(this.lastPoint.position, this.mouseGroup.position);
+                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 });
@@ -57,12 +296,13 @@ export default class EditController extends BaseController {
             hammer.on('panend', this.onPanEnd);
         }
         // fiveElement
-        this.fiveElement?.addEventListener('mouseleave', this.onMouseLeave);
+        (_a = this.fiveElement) === null || _a === void 0 ? void 0 : _a.addEventListener('mouseleave', this.onMouseLeave);
         // ==================== 其他 ====================
         this.hook.emit('anchorChange', null);
         this.five.refresh();
     }
     dispose() {
+        var _a, _b;
         super.dispose();
         this.group.remove(this.mouseGroup, this.dashed.mesh);
         // ==================== 解除事件监听 ====================
@@ -76,9 +316,9 @@ export default class EditController extends BaseController {
         this.model.hook.off('lineAdded', this.onLineChanged);
         this.model.hook.off('lineRemoved', this.onLineChanged);
         // hammer
-        this.hammer?.destroy();
+        (_a = this.hammer) === null || _a === void 0 ? void 0 : _a.destroy();
         // fiveElement
-        this.fiveElement?.removeEventListener('mouseleave', this.onMouseLeave);
+        (_b = this.fiveElement) === null || _b === void 0 ? void 0 : _b.removeEventListener('mouseleave', this.onMouseLeave);
         this.magnifier.dispose();
         this.dashed.distanceItem.remove();
         this.five.needsRender = true;
@@ -86,131 +326,4 @@ export default class EditController extends BaseController {
     getEditingLines() {
         return this.model.lines;
     }
-    /** 撤销编辑 */
-    revoke = () => {
-        // ============ revoke points ============
-        // 如果当前没有虚线，只有起始点，需要删除起始点，重置起始状态。并删除虚线实例
-        if (this.model.lines.length === 0 && this.lastPoint) {
-            this.lastPoint = null;
-            this.hasAppendDashed = false;
-            this.dashed.distanceItem.remove();
-            this.group.remove(this.dashed.mesh);
-            this.hook.emit('anchorChange', null);
-            this.five.needsRender = true;
-            return;
-        }
-        if (this.model.lines.length === 0 && !this.lastPoint)
-            return;
-        if (!this.lastPoint)
-            return;
-        const revokedLine = this.model.lines[this.model.lines.length - 1];
-        const lastPoint = revokedLine.findAnotherPoint(this.lastPoint);
-        if (!lastPoint)
-            return;
-        this.lastPoint = lastPoint;
-        this.hook.emit('anchorChange', lastPoint.position);
-        // ============ revoke lines ============
-        this.group.remove(revokedLine.mesh);
-        this.model.removeLine(revokedLine);
-        // ============ revoke mouse group ============
-        this.hasAppendMouseGroup = false;
-        this.mouseGroup.position.copy(this.lastPoint.position);
-        this.group.remove(this.mouseGroup);
-        // ============ revoke lineDistance ============
-        revokedLine.distanceItem.remove();
-        // ============ revoke dashed ============
-        this.updateDashed();
-        // ============ revoke magnifier ============
-        this.magnifier.dispose();
-        this.five.needsRender = true;
-    };
-    onMouseLeave = () => {
-        this.magnifier.dispose();
-        this.group.remove(this.mouseGroup);
-        this.hasAppendMouseGroup = false;
-        if (this.lastPoint) {
-            this.mouseGroup.position.copy(this.lastPoint.position);
-            this.updateDashed();
-        }
-    };
-    /** 编辑线条发生改变时通知外部 */
-    onLineChanged = () => {
-        this.hook.emit('editedLineChange', this.model.lines.map((line) => line.toCompletelyJson()));
-    };
-    onPress = (e) => {
-        const [intersection] = getIntersectionFromEvent(this.five, e);
-        if (!intersection || !intersection.face)
-            return;
-        const nowPoint = new Point(intersection.point);
-        this.pressPoint = nowPoint;
-        this.onIntersectionUpdate(intersection);
-    };
-    /**
-     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
-     * 2. 如果有长按点，把长按点位置更新为当前位置
-     */
-    onPan = (e) => {
-        if (!this.pressPoint)
-            return;
-        const [intersection] = getIntersectionFromEvent(this.five, e);
-        if (!intersection || !intersection.face)
-            return;
-        this.onIntersectionUpdate(intersection);
-    };
-    onPanEnd = (e) => {
-        if (!this.pressPoint)
-            return;
-        this.onTap(e);
-    };
-    /**
-     * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
-     * 2. 把上一个点的位置更新为当前点的位置
-     * 3. 清除 mouseGroup 和 magnifier
-     */
-    onTap = (e) => {
-        if (!this.hasAppendDashed) {
-            this.dashed.distanceItem.appendTo(this.container);
-            this.group.add(this.dashed.mesh);
-        }
-        this.hasAppendDashed = true;
-        const [intersection] = getIntersectionFromEvent(this.five, e);
-        this.updateMouseGroup(intersection);
-        const nowPoint = new Point(this.mouseGroup.position);
-        const lastPoint = this.lastPoint;
-        if (nowPoint)
-            this.lastPoint = nowPoint;
-        if (nowPoint && lastPoint) {
-            const line = new Line(lastPoint, nowPoint, this.model);
-            line.distanceItem.appendTo(this.container);
-            this.model.addLine(line);
-            this.group.add(line.mesh);
-            line.distanceItem.update(this.five);
-        }
-        this.pressPoint = undefined;
-        this.hasAppendMouseGroup = false;
-        this.magnifier.dispose();
-        this.group.remove(this.mouseGroup);
-        this.updateDashed();
-        this.five.needsRender = true;
-        this.hook.emit('anchorChange', nowPoint.position);
-    };
-    onWantsTapGesture = () => false;
-    /** 编辑时取消走点 */
-    onWantsToMoveToPano = () => false;
-    /** 存在长按点时不能移动全景 */
-    onWantsPanGesture = () => (this.pressPoint ? false : undefined);
-    /** 移动全景时更新 distanceItem 在屏幕上的位置 */
-    onCameraUpdate = () => {
-        this.updateDistanceUI();
-        this.dashed.distanceItem.update(this.five);
-    };
-    /** 更新虚线 */
-    updateDashed = () => {
-        if (!this.lastPoint)
-            return;
-        this.dashed.points[0].position.copy(this.lastPoint.position);
-        this.dashed.points[1].position.copy(this.mouseGroup.position);
-        this.dashed.mesh.setPoints(this.lastPoint.position, this.mouseGroup.position);
-        this.dashed.distanceItem.update(this.five);
-    };
 }