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

package/libs/PanoCompassPlugin/index.js

@@ -1,171 +1,7 @@
-import * as THREE from 'three';
-import { getRoomInfoInstance } from './getRoomInfoInstance';
-import { loadTexture } from '../shared-utils/three/loadTexture';
-import CSS3DRenderPlugin from '../CSS3DRenderPlugin';
-import { tweenProgress } from '../shared-utils/animationFrame/BetterTween';
+import PanoCompassPlugin from './Plugin';
+export { PanoCompassPlugin };
+export default PanoCompassPlugin;
 export const panoCompassPluginServerParams = {
     name: 'PanoCompassPlugin',
     version: 0,
 };
-export const PanoCompassPlugin = function (five, config) {
-    return new PanoCompassController(five, config);
-};
-export default PanoCompassPlugin;
-class PanoCompassController {
-    five;
-    data;
-    config;
-    group = new THREE.Group();
-    modelLoaded = false;
-    roomInfoInstance;
-    roomInfoWrapperInstance;
-    compassMeshTween;
-    compassMesh;
-    entryDoorMesh;
-    constructor(five, config) {
-        this.five = five;
-        this.config = config;
-        this.five.scene.add(this.group);
-        five.once('dispose', this.dispose);
-        five.once('modelLoaded', this.onFiveFistPanoLoaded);
-        this.five.on('panoArrived', this.onFivePanoArrived);
-        this.five.on('panoWillArrive', this.onFivePanoWillArrive);
-        this.five.on('cameraDirectionUpdate', this.onFiveCameraDirectionUpdate);
-    }
-    load(data) {
-        this.data = data;
-        if (this.modelLoaded)
-            this.init();
-    }
-    dispose = () => {
-        this.five.scene.remove(this.group);
-        this.group.remove(...this.group.children);
-        this.compassMesh?.material.map?.dispose();
-        this.entryDoorMesh?.material.map?.dispose();
-        this.five.off('panoArrived', this.onFivePanoArrived);
-        this.five.off('panoWillArrive', this.onFivePanoWillArrive);
-    };
-    onFiveFistPanoLoaded = () => {
-        this.modelLoaded = true;
-        if (this.data)
-            this.init();
-    };
-    async init() {
-        if (!this.data || !this.modelLoaded)
-            return;
-        const northRad = this.data.north_rad;
-        if (northRad != null) {
-            this.compassMesh = await this.loadCompassMesh();
-            this.compassMesh.rotateX(-Math.PI / 2);
-            this.compassMesh.rotateZ(northRad - Math.PI / 2);
-            this.group.add(this.compassMesh);
-        }
-        if (this.data.entrance != null) {
-            this.entryDoorMesh = await this.loadEntryDoorMesh();
-            this.roomInfoWrapperInstance = this.loadRoomInfo();
-            this.roomInfoInstance = getRoomInfoInstance();
-            this.entryDoorMesh.rotateX(-Math.PI / 2);
-            if (this.roomInfoWrapperInstance)
-                this.roomInfoInstance.appendTo(this.roomInfoWrapperInstance.container);
-            this.group.add(this.entryDoorMesh);
-        }
-        this.onFivePanoArrived(this.five.panoIndex || 0);
-        this.five.needsRender = true;
-    }
-    async loadCompassMesh() {
-        const compassImageUrl = this.config?.compassImageUrl ||
-            '//vrlab-image4.ljcdn.com/release/web/v3/north-point-circle.96498e69.png';
-        const compassTexture = await loadTexture(compassImageUrl);
-        const compassGeometry = new THREE.CircleGeometry(0.7, 32);
-        const compassMaterial = new THREE.MeshBasicMaterial({
-            map: compassTexture,
-            transparent: true,
-            opacity: 0,
-            depthTest: false,
-        });
-        const compassMesh = new THREE.Mesh(compassGeometry, compassMaterial);
-        compassMesh.name = 'pano-compass-mesh';
-        return compassMesh;
-    }
-    async loadEntryDoorMesh() {
-        const entryDoorImageUrl = this.config?.entryDoorImageUrl ||
-            '//vrlab-image4.ljcdn.com/release/web/enterDoor.831b8208.png';
-        const entryDoorTexture = await loadTexture(entryDoorImageUrl);
-        const entryDoorGeometry = new THREE.PlaneGeometry(0.2, 0.16);
-        const entryDoorMaterial = new THREE.MeshBasicMaterial({
-            map: entryDoorTexture,
-            transparent: true,
-            opacity: 0.8,
-            depthTest: false,
-        });
-        const entryDoorMesh = new THREE.Mesh(entryDoorGeometry, entryDoorMaterial);
-        entryDoorMesh.name = 'pano-compass-entry-door';
-        return entryDoorMesh;
-    }
-    loadRoomInfo() {
-        const points = [
-            new THREE.Vector3(-0.7, 0, -0.7),
-            new THREE.Vector3(0.7, 0, -0.7),
-            new THREE.Vector3(0.7, 0, 0.7),
-            new THREE.Vector3(-0.7, 0, 0.7),
-        ];
-        const roomInfo = CSS3DRenderPlugin(this.five).create3DDomContainer(points);
-        return roomInfo;
-    }
-    onFivePanoWillArrive = (panoIndex) => {
-        if (panoIndex === this.five.panoIndex)
-            return;
-        this.compassMeshTween?.dispose();
-        this.compassMesh?.material.setValues({ opacity: 0 });
-    };
-    onFivePanoArrived = (panoIndex) => {
-        // ======== fix compass position ========
-        const standingPosition = this.five.work.observers[panoIndex].standingPosition;
-        if (this.compassMesh) {
-            // 指南针上移 0.01m，防止与地板重合
-            this.compassMesh.position.copy(standingPosition.clone().setY(standingPosition.y + 0.01));
-            if (this.compassMesh.material.opacity !== 0)
-                return;
-            this.compassMeshTween?.dispose();
-            this.compassMeshTween = tweenProgress(1000)
-                .onUpdate(({ progress }) => {
-                this.compassMesh?.material.setValues({ opacity: progress });
-                this.five.needsRender = true;
-            })
-                .play();
-        }
-        // ======== fix entry door label position and rotation ========
-        if (this.entryDoorMesh) {
-            const entryDoorPosition = new THREE.Vector3(this.data.entrance.position.x, this.data.entrance.position.y, this.data.entrance.position.z);
-            const panoToEntryDoorVector = entryDoorPosition
-                .clone()
-                .setY(standingPosition.y)
-                .sub(standingPosition)
-                .normalize();
-            const compassEntryDoorPosition = standingPosition
-                .clone()
-                .add(panoToEntryDoorVector.clone().multiplyScalar(0.7))
-                .setY(standingPosition.y + 0.01);
-            this.entryDoorMesh.rotation.z = new THREE.Vector3(0, 0, -1).angleTo(panoToEntryDoorVector);
-            this.entryDoorMesh.position.copy(compassEntryDoorPosition);
-            // 不是客厅时，隐藏入户门指引
-            this.data?.room_observers[panoIndex].room.type === 1
-                ? this.entryDoorMesh?.material.setValues({ opacity: 1 })
-                : this.entryDoorMesh?.material.setValues({ opacity: 0 });
-        }
-        // ======== fix room info ========
-        if (this.roomInfoInstance && this.roomInfoWrapperInstance) {
-            this.roomInfoWrapperInstance.css3DObject.position.copy(standingPosition.clone().setY(standingPosition.y + 0.01));
-            this.roomInfoInstance.setRoom(this.data.room_observers[panoIndex].room);
-        }
-        this.five.needsRender = true;
-    };
-    onFiveCameraDirectionUpdate = ({ longitude, latitude, }) => {
-        if (!this.roomInfoWrapperInstance)
-            return;
-        this.roomInfoWrapperInstance.css3DObject.rotation.z = longitude;
-        latitude > 0.66 && this.five.getCurrentState().mode === 'Panorama'
-            ? this.roomInfoInstance?.show()
-            : this.roomInfoInstance?.hide();
-    };
-}

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;