@realsee/dnalogel 2.0.0-alpha.3 → 2.0.0-alpha.6

package/libs/index.d.ts

@@ -4,6 +4,7 @@ export type { PanoCursorRaycasterPluginExportType } from './PanoCursorRaycasterP
 export { default as PanoCursorRaycasterPlugin } from './PanoCursorRaycasterPlugin';
 export type { ModelRoomLabelController, ModelRoomLabelPluginData, RoomLabel, ModelRoomLabelPluginReturnType, ModelRoomLabelPluginParameters, } from './ModelRoomLabelPlugin';
 export { default as ModelRoomLabelPlugin } from './ModelRoomLabelPlugin';
+export * from './floorplan/constant';
 export type { TopviewFloorplanPluginReturnType, TopviewFloorplanPluginParameterType, } from './floorplan/TopviewFloorplanPlugin';
 export { default as TopviewFloorplanPlugin } from './floorplan/TopviewFloorplanPlugin';
 export type { PanoFloorplanRadarPluginReturnType, PanoFloorplanRadarPluginParameterType, } from './floorplan/PanoFloorplanRadarPlugin';
@@ -15,5 +16,7 @@ export { default as ModelChassisCompassPlugin } from './ModelChassisCompassPlugi
 export type { ModelEntryDoorGuidePluginParameterType, ModelEntryDoorGuidePluginData, ModelEntryDoorGuidePluginExportType, } from './ModelEntryDoorGuidePlugin';
 export { default as ModelEntryDoorGuidePlugin } from './ModelEntryDoorGuidePlugin';
 export { default as CameraMovementPlugin } from './CameraMovementPlugin';
+export type { PanoRulerPluginParameterType, PanoRulerPluginExportType, PanoRulerPluginOptions, } from './PanoRulerPlugin';
+export { default as PanoRulerPlugin } from './PanoRulerPlugin';
 export type { PanoCompassPluginParameterType, PanoCompassPluginExportType, PanoCompassPluginData, } from './PanoCompassPlugin';
-export { default as PanoCompassPluginPlugin } from './PanoCompassPlugin';
+export { default as PanoCompassPlugin } from './PanoCompassPlugin';

package/libs/index.js

@@ -2,10 +2,13 @@ export { default as ModelViewPlugin } from './ModelViewPlugin';
 export { default as CSS3DRenderPlugin } from './CSS3DRenderPlugin';
 export { default as PanoCursorRaycasterPlugin } from './PanoCursorRaycasterPlugin';
 export { default as ModelRoomLabelPlugin } from './ModelRoomLabelPlugin';
+// floorplan
+export * from './floorplan/constant';
 export { default as TopviewFloorplanPlugin } from './floorplan/TopviewFloorplanPlugin';
 export { default as PanoFloorplanRadarPlugin } from './floorplan/PanoFloorplanRadarPlugin';
 export { default as ModelFloorplanPlugin } from './floorplan/ModelFloorplanPlugin';
 export { default as ModelChassisCompassPlugin } from './ModelChassisCompassPlugin';
 export { default as ModelEntryDoorGuidePlugin } from './ModelEntryDoorGuidePlugin';
 export { default as CameraMovementPlugin } from './CameraMovementPlugin';
-export { default as PanoCompassPluginPlugin } from './PanoCompassPlugin';
+export { default as PanoRulerPlugin } from './PanoRulerPlugin';
+export { default as PanoCompassPlugin } from './PanoCompassPlugin';

package/libs/shared-utils/getPxmm.d.ts

@@ -1,6 +1,11 @@
 import type { Five } from '@realsee/five';
+import { FLOOR_PLAN_ATTACHED_TO } from '../floorplan/constant';
+interface GetPxmmOption {
+    attachedTo: FLOOR_PLAN_ATTACHED_TO;
+}
 /**
  * 获取「在俯视图」状态下，模型 mm 与屏幕像素 px 的对应关系，即每 mm 对应多少 px
  * @param five five
  */
-export default function getPxmm(five: Five, container: Element): number;
+export default function getPxmm(five: Five, container: Element, floorIndex: number, options?: GetPxmmOption): number;
+export {};

package/libs/shared-utils/getPxmm.js

@@ -1,20 +1,34 @@
+import { FLOOR_PLAN_ATTACHED_TO } from '../floorplan/constant';
 import * as THREE from 'three';
 /**
  * 获取「在俯视图」状态下，模型 mm 与屏幕像素 px 的对应关系，即每 mm 对应多少 px
  * @param five five
  */
-export default function getPxmm(five, container) {
-    const boundingCenter = new THREE.Vector3(0, 0, 0);
-    five.model.bounding.getCenter(boundingCenter);
-    const { y: boundingCenterY } = boundingCenter;
-    const { longitude } = five.getCurrentState();
-    // 因为模型可能经过旋转，所以屏幕水平方向上的 1m 对应 X 轴距离需要转换
-    const X = 1 / Math.abs(Math.cos(longitude));
-    // 模型绕 (boundingCenterX, boundingCenterY, boundingCenterZ) 旋转
-    const originPosition = new THREE.Vector3(0, boundingCenterY, 0);
-    const originPositionXUnit = new THREE.Vector3(X, boundingCenterY, 0);
-    const mouse = originPosition.project(five.camera);
-    const xUnitMouse = originPositionXUnit.project(five.camera);
+export default function getPxmm(five, container, floorIndex, options) {
+    const maxFloorIndex = Math.max(...five.work.observers.map((ob) => ob.floorIndex));
+    function getFloorY(floorIndex) {
+        return floorIndex > maxFloorIndex
+            ? five.model.bounding.max.y
+            : Math.max(...five.work.observers
+                .filter((ob) => ob.floorIndex === floorIndex)
+                .map((ob) => ob.standingPosition.y));
+    }
+    function getY() {
+        const currentFloorY = getFloorY(floorIndex);
+        const nextFloorY = getFloorY(floorIndex + 1);
+        const attachedTo = options?.attachedTo || FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER;
+        if (attachedTo === FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER)
+            return (five.model.bounding.max.y + five.model.bounding.min.y) / 2;
+        else if (attachedTo === FLOOR_PLAN_ATTACHED_TO.CEILING)
+            return nextFloorY;
+        else
+            return currentFloorY;
+    }
+    const y = getY();
+    const originPosition = new THREE.Vector3(0, y, 0);
+    const originPositionXUnit = new THREE.Vector3(1, y, 0);
+    const mouse = originPosition.clone().project(five.camera);
+    const xUnitMouse = originPositionXUnit.clone().project(five.camera);
     const pxmm = Math.abs((xUnitMouse.x - mouse.x) / 1000) * (container.getBoundingClientRect().width / 2);
     return pxmm;
 }

package/package.json

@@ -5,7 +5,7 @@
   "author": "REALSEE-DEVELOPER",
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "private": false,
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.6",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build:dev": "yarn tsb && vite build --watch",
@@ -18,7 +18,9 @@
   },
   "files": [
     "libs",
-    "dist"
+    "dist",
+    "docs",
+    "TERMS.txt"
   ],
   "devDependencies": {
     "@babel/core": "^7.17.5",