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

package/libs/floorplan/ModelFloorplanPlugin/Components/Camera.svelte

@@ -23,7 +23,10 @@ const domSizeStyle = `${size / 16}rem`;
     class="floorplan__camera-rotate"
     style:width="{domSizeStyle}"
     style:height="{domSizeStyle}"
+    style:left="{'-' + domSizeStyle}"
+    style:top="{'-' + domSizeStyle}"
     style:transform="{`rotate(${rotate}deg)`}"
+    style:transform-origin="{`${domSizeStyle} ${domSizeStyle}`}"
     style="background-image: {`url(${cameraImageUrl || CAMERA_IMAGE})`}"
   ></div>
 </div>
@@ -37,9 +40,6 @@ const domSizeStyle = `${size / 16}rem`;
 
   .floorplan__camera-rotate {
     position: absolute;
-    left: 15px;
-    top: 15px;
-    transform-origin: 15px 15px;
     background-repeat: no-repeat;
     background-size: 100%;
   }

package/libs/floorplan/ModelFloorplanPlugin/Components/Camera.svelte.map

@@ -1 +1 @@
-{"version":3,"mappings":"AAAA,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;;;;AAuBjB,CAAC,CAAC,MAAM;;AAER,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AAC7F,EAAE,CAAC;AACH,IAAI,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM;AACnC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC;AAC/B,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC;AAChC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7C,IAAI,KAAK,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AACvE,EAAE,CAAC,CAAC,CAAC,GAAG;AACR,CAAC,CAAC,GAAG;;AAEL,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;AACrB,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC;AAC9B,IAAI,QAAQ,CAAC,CAAC,QAAQ;AACtB,IAAI,KAAK,CAAC,CAAC,CAAC;AACZ,IAAI,MAAM,CAAC,CAAC,CAAC;AACb,EAAE;;AAEF,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;AAC5B,IAAI,QAAQ,CAAC,CAAC,QAAQ;AACtB,IAAI,IAAI,CAAC,CAAC,IAAI;AACd,IAAI,GAAG,CAAC,CAAC,IAAI;AACb,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI;AAC/B,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,MAAM;AAChC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;AACzB,EAAE;AACF,CAAC,CAAC,KAAK;","names":[],"sources":["Camera.svelte"]}
+{"version":3,"mappings":"AAAA,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;;;;AAuBjB,CAAC,CAAC,MAAM;;AAER,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AAC7F,EAAE,CAAC;AACH,IAAI,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM;AACnC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC;AAC/B,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC;AAChC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AACpC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AACnC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7C,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AACvE,EAAE,CAAC,CAAC,CAAC,GAAG;AACR,CAAC,CAAC,GAAG;;AAEL,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;AACrB,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC;AAC9B,IAAI,QAAQ,CAAC,CAAC,QAAQ;AACtB,IAAI,KAAK,CAAC,CAAC,CAAC;AACZ,IAAI,MAAM,CAAC,CAAC,CAAC;AACb,EAAE;;AAEF,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;AAC5B,IAAI,QAAQ,CAAC,CAAC,QAAQ;AACtB,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,MAAM;AAChC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;AACzB,EAAE;AACF,CAAC,CAAC,KAAK;","names":[],"sources":["Camera.svelte"]}

package/libs/floorplan/ModelFloorplanPlugin/Controller.d.ts

@@ -2,6 +2,7 @@ import { Five, Subscribe } from '@realsee/five';
 import type { FloorplanEventHandlers } from './typings/events.type';
 import type { FloorplanServerData } from '../typings/floorplanServerData';
 import type { FloorplanRoomItem } from '../typings/floorplanData';
+import { FLOOR_PLAN_ATTACHED_TO } from '../constant';
 export interface ModelFloorplanParameterType {
     selector?: string | Element;
     scale?: number;
@@ -12,6 +13,7 @@ export interface ModelFloorplanParameterType {
     ruleLabelsEnable?: boolean;
     roomLabelsEnable?: boolean;
     cameraImageUrl?: string;
+    attachedTo?: FLOOR_PLAN_ATTACHED_TO;
     getLabelElement?: (room: FloorplanRoomItem) => Element | null;
 }
 export declare type ModelFloorplanPluginsConfigs = Omit<ModelFloorplanParameterType, 'selector' | 'scale'>;

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -98,7 +98,8 @@ export default class ModelFloorplanPluginController {
         const width = max.x - min.x;
         const height = max.y - min.y;
         // 每毫米对应的 px 值
-        const pxmm = getPxmm(this.five, this.wrapper);
+        const options = this.configs.attachedTo ? { attachedTo: this.configs.attachedTo } : undefined;
+        const pxmm = getPxmm(this.five, this.wrapper, this.floorIndex, options);
         const _width = Math.ceil(width * pxmm);
         const _height = Math.ceil(height * pxmm);
         if (this.size.width === _width && this.size.height === _height)
@@ -225,6 +226,7 @@ export default class ModelFloorplanPluginController {
         if (shownFloor === null)
             return;
         this.floorIndex = shownFloor;
+        this.updateSize();
         this.render();
     };
     handleModelLoaded = () => {

package/libs/floorplan/TopviewFloorplanPlugin/Controller.d.ts

@@ -1,6 +1,7 @@
 import type { Five } from '@realsee/five';
 import type { FloorplanServerData } from '../typings/floorplanServerData';
 import type { FloorplanRoomItem } from '../typings/floorplanData';
+import { FLOOR_PLAN_ATTACHED_TO } from '../constant';
 export interface TopviewFloorplanPluginParameterType {
     selector?: string | Element;
     scale?: number;
@@ -12,6 +13,7 @@ export interface TopviewFloorplanPluginParameterType {
     ruleLabelsEnable?: boolean;
     roomLabelsEnable?: boolean;
     preventRoomClick?: boolean;
+    attachedTo?: FLOOR_PLAN_ATTACHED_TO;
     getLabelElement?: (room: FloorplanRoomItem) => Element | null;
 }
 export declare type TopviewFloorplanPluginReturnType = TopviewFloorplanPluginController;

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -62,6 +62,7 @@ export class TopviewFloorplanPluginController {
         if (shownFloor === null)
             return;
         this.floorIndex = shownFloor;
+        this.updateSize();
         this.render();
     };
     /** panoIndex 改变时，更新 floorIndex */
@@ -109,8 +110,8 @@ export class TopviewFloorplanPluginController {
     };
     show() {
         this.visible = true;
-        this.updateSize();
         this.five.model.show(this.floorIndex);
+        this.updateSize();
         const renderDuration = 500;
         const modelOpacity = this.configs.modelOpacity;
         if (typeof modelOpacity === 'number') {
@@ -142,7 +143,8 @@ export class TopviewFloorplanPluginController {
         const width = max.x - min.x;
         const height = max.y - min.y;
         // 每毫米对应的 px 值
-        const pxmm = getPxmm(this.five, this.wrapper);
+        const options = this.configs.attachedTo ? { attachedTo: this.configs.attachedTo } : undefined;
+        const pxmm = getPxmm(this.five, this.wrapper, this.floorIndex, options);
         const _width = Math.ceil(width * pxmm);
         const _height = Math.ceil(height * pxmm);
         this.pxmm = pxmm;
@@ -157,7 +159,6 @@ export class TopviewFloorplanPluginController {
             return;
         const { getLabelElement, cameraImageUrl, preventRoomClick, hoverEnable, compassEnable, roomLabelsEnable, ruleLabelsEnable, } = this.configs;
         const handleClick = preventRoomClick ? () => false : undefined;
-        console.log('🚀 ~ TopviewFloorplanPluginController ~ handleClick', handleClick);
         const props = {
             five: this.five,
             pxmm: this.pxmm,

package/libs/floorplan/constant.d.ts

@@ -0,0 +1,5 @@
+export declare enum FLOOR_PLAN_ATTACHED_TO {
+    FLOOR = 1,
+    CEILING = 2,
+    BOUNDING_CENTER = 3
+}

package/libs/floorplan/constant.js

@@ -0,0 +1,6 @@
+export var FLOOR_PLAN_ATTACHED_TO;
+(function (FLOOR_PLAN_ATTACHED_TO) {
+    FLOOR_PLAN_ATTACHED_TO[FLOOR_PLAN_ATTACHED_TO["FLOOR"] = 1] = "FLOOR";
+    FLOOR_PLAN_ATTACHED_TO[FLOOR_PLAN_ATTACHED_TO["CEILING"] = 2] = "CEILING";
+    FLOOR_PLAN_ATTACHED_TO[FLOOR_PLAN_ATTACHED_TO["BOUNDING_CENTER"] = 3] = "BOUNDING_CENTER";
+})(FLOOR_PLAN_ATTACHED_TO || (FLOOR_PLAN_ATTACHED_TO = {}));

package/libs/floorplan/typings/floorplanServerData.d.ts

@@ -79,6 +79,10 @@ export interface FloorplanServerRoomItem {
      * @description 单位是平方毫米
      */
     size: number;
+    /** 房屋类型
+     * @description 对应关系参考上方 ROOM_DETAILS_TYPE_MAP
+     */
+    type: number;
     name: string;
     /** 围成房间区域的坐标路径
      * @description 坐标类型是户型图坐标

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';

package/libs/index.js

@@ -2,6 +2,8 @@ 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';

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.5",
+  "version": "2.0.0-alpha.6",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build:dev": "yarn tsb && vite build --watch",
@@ -19,6 +19,7 @@
   "files": [
     "libs",
     "dist",
+    "docs",
     "TERMS.txt"
   ],
   "devDependencies": {