@realsee/dnalogel 2.0.0-alpha.12 → 2.0.0-alpha.13

package/libs/PanoCompassPlugin/index.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import * as THREE from 'three';
 import { getRoomInfoInstance } from './getRoomInfoInstance';
 import { loadTexture } from '../shared-utils/three/loadTexture';
@@ -12,17 +21,166 @@ export const PanoCompassPlugin = function (five, config) {
 };
 export default PanoCompassPlugin;
 class PanoCompassController {
-    five;
-    data;
-    config;
-    group = new THREE.Group();
-    modelLoaded = false;
-    roomInfoInstance;
-    roomInfoWrapperInstance;
-    compassMeshTween;
-    compassMesh;
-    entryDoorMesh;
     constructor(five, config) {
+        Object.defineProperty(this, "five", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "config", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "group", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new THREE.Group()
+        });
+        Object.defineProperty(this, "modelLoaded", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "roomInfoInstance", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "roomInfoWrapperInstance", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "compassMeshTween", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "compassMesh", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "entryDoorMesh", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "dispose", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                var _a, _b, _c, _d;
+                this.five.scene.remove(this.group);
+                this.group.remove(...this.group.children);
+                (_b = (_a = this.compassMesh) === null || _a === void 0 ? void 0 : _a.material.map) === null || _b === void 0 ? void 0 : _b.dispose();
+                (_d = (_c = this.entryDoorMesh) === null || _c === void 0 ? void 0 : _c.material.map) === null || _d === void 0 ? void 0 : _d.dispose();
+                this.five.off('panoArrived', this.onFivePanoArrived);
+                this.five.off('panoWillArrive', this.onFivePanoWillArrive);
+            }
+        });
+        Object.defineProperty(this, "onFiveFistPanoLoaded", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.modelLoaded = true;
+                if (this.data)
+                    this.init();
+            }
+        });
+        Object.defineProperty(this, "onFivePanoWillArrive", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (panoIndex) => {
+                var _a, _b;
+                if (panoIndex === this.five.panoIndex)
+                    return;
+                (_a = this.compassMeshTween) === null || _a === void 0 ? void 0 : _a.dispose();
+                (_b = this.compassMesh) === null || _b === void 0 ? void 0 : _b.material.setValues({ opacity: 0 });
+            }
+        });
+        Object.defineProperty(this, "onFivePanoArrived", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (panoIndex) => {
+                var _a, _b, _c, _d;
+                // ======== 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;
+                    (_a = this.compassMeshTween) === null || _a === void 0 ? void 0 : _a.dispose();
+                    this.compassMeshTween = tweenProgress(1000)
+                        .onUpdate(({ progress }) => {
+                        var _a;
+                        (_a = this.compassMesh) === null || _a === void 0 ? void 0 : _a.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);
+                    // 不是客厅时，隐藏入户门指引
+                    ((_b = this.data) === null || _b === void 0 ? void 0 : _b.room_observers[panoIndex].room.type) === 1
+                        ? (_c = this.entryDoorMesh) === null || _c === void 0 ? void 0 : _c.material.setValues({ opacity: 1 })
+                        : (_d = this.entryDoorMesh) === null || _d === void 0 ? void 0 : _d.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;
+            }
+        });
+        Object.defineProperty(this, "onFiveCameraDirectionUpdate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ({ longitude, latitude, }) => {
+                var _a, _b;
+                if (!this.roomInfoWrapperInstance)
+                    return;
+                this.roomInfoWrapperInstance.css3DObject.rotation.z = longitude;
+                latitude > 0.66 && this.five.getCurrentState().mode === 'Panorama'
+                    ? (_a = this.roomInfoInstance) === null || _a === void 0 ? void 0 : _a.show()
+                    : (_b = this.roomInfoInstance) === null || _b === void 0 ? void 0 : _b.hide();
+            }
+        });
         this.five = five;
         this.config = config;
         this.five.scene.add(this.group);
@@ -37,70 +195,65 @@ class PanoCompassController {
         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;
+    init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.data || !this.modelLoaded)
+                return;
+            const northRad = this.data.north_rad;
+            if (northRad != null) {
+                this.compassMesh = yield 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 = yield 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;
+    loadCompassMesh() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const compassImageUrl = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.compassImageUrl) ||
+                '//vrlab-image4.ljcdn.com/release/web/v3/north-point-circle.96498e69.png';
+            const compassTexture = yield 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;
+    loadEntryDoorMesh() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const entryDoorImageUrl = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.entryDoorImageUrl) ||
+                '//vrlab-image4.ljcdn.com/release/web/enterDoor.831b8208.png';
+            const entryDoorTexture = yield 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 = [
@@ -112,60 +265,4 @@ class PanoCompassController {
         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.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.js

@@ -1,16 +1,74 @@
 import { preventDefault } from '../utils/ironbox';
 export default class BaseController {
-    five;
-    group;
-    model;
-    disposed = false;
-    mouseGroup;
-    container;
-    fiveHelper;
-    hook;
-    magnifier;
-    userDistanceItemCreator;
     constructor(params) {
+        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, "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;
@@ -33,9 +91,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;