@realsee/dnalogel 2.1.0-alpha.13 → 2.1.0-alpha.16

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/Main.svelte

@@ -0,0 +1,64 @@
+<script>import { onMount } from 'svelte';
+import Camera from './Camera.svelte';
+import CurrentFloor from './CurrentFloor/CurrentFloor.svelte';
+export let five;
+export let visible;
+export let hoverEnable;
+export let floorplanData;
+export let cameraImageUrl;
+export let extraObjects = [];
+let pxmm = 0;
+let floorIndex = 0;
+let clientWidth = 0;
+let clientHeight = 0;
+let contentWidth = 0;
+let contentHeight = 0;
+$: {
+    const size = Math.min(clientWidth, clientHeight);
+    const { max, min } = floorplanData.bounding;
+    const boundingWidth = max.x - min.x;
+    const boundingHeight = max.y - min.y;
+    const contentSize = (function getSize() {
+        if (boundingWidth > boundingHeight)
+            return [size, (size / boundingWidth) * boundingHeight];
+        return [(size / boundingHeight) * boundingWidth, size];
+    })();
+    contentWidth = contentSize[0];
+    contentHeight = contentSize[1];
+    pxmm = contentWidth / boundingWidth;
+}
+function handlePanoArrived(panoIndex) {
+    floorIndex = five.work.observers[panoIndex].floorIndex;
+}
+onMount(() => {
+    five.on('panoArrived', handlePanoArrived);
+    return () => {
+        five.off('panoArrived', handlePanoArrived);
+    };
+});
+</script>
+
+{#if visible}
+  <div class="plugin-floorplan-radar" bind:clientWidth bind:clientHeight>
+    {#if clientWidth !== 0}
+      <div class="plugin-floorplan-radar-container" style:width="{contentWidth}px" style:height="{contentHeight}px">
+        <CurrentFloor {...{ five, pxmm, floorIndex, floorplanData, hoverEnable, extraObjects }} />
+        <Camera {...{ pxmm, five, floorplanData, cameraImageUrl }} />
+      </div>
+    {/if}
+  </div>
+{/if}
+
+<style>
+  .plugin-floorplan-radar {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .plugin-floorplan-radar-container {
+    position: relative;
+  }
+</style>

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -1,4 +1,4 @@
-import Main from './Components/Main';
+import Main from './Components/Main.svelte';
 import equal from '../../shared-utils/equal';
 import { CAMERA_IMAGE } from '../Assets/camera';
 import * as BasePlugin from '../../base/BasePluginWithData';

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

@@ -1,7 +1,8 @@
+import type { PartialDeep } from 'type-fest';
 import type { BaseOptions } from '../../base/BasePlugin';
 import type { Five } from '@realsee/five';
 import type { FloorplanServerData } from '../typings/floorplanServerData';
-import type { State, EventMap, Parameters, PluginData, PluginServerData } from './typing';
+import type { State, Config, EventMap, Parameters, PluginData, PluginServerData } from './typing';
 import * as BasePlugin from '../../base/BasePluginWithData';
 export declare class Controller extends BasePlugin.Controller<State, EventMap, PluginServerData, PluginData> {
     name: string;
@@ -38,7 +39,8 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     /** 销毁插件 */
     dispose: () => void;
     /** 更改插件 State */
-    setState(state: Partial<State>, options?: BaseOptions): void;
+    setState(state: PartialDeep<State>, options?: BaseOptions): void;
+    changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;
     private _show;
     private _hide;

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import equal from '../../shared-utils/equal';
-import Main from '../Components/Main';
+import Main from '../Components/Main.svelte';
 import formatData from '../utils/formatData';
 import { CAMERA_IMAGE } from '../Assets/camera';
 import { omit } from '../../shared-utils/filter';
@@ -280,6 +280,8 @@ export class Controller extends BasePlugin.Controller {
             attachedTo: FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER,
             getLabelElement: undefined,
             adaptiveRoomLabelVisibleEnable: true,
+            getRoomAreaText: (size) => (size / 1000000).toFixed(1) + '㎡',
+            getRuleDistanceText: (distance) => distance.toString()
         };
         const paramsConfig = params ? omit(params, ['selector', 'scale']) : {};
         const config = Object.assign(Object.assign({}, baseConfig), paramsConfig);
@@ -381,6 +383,10 @@ export class Controller extends BasePlugin.Controller {
             state.visible ? this._show(options) : this._hide(options);
         }
     }
+    changeConfigs(config, userAction = true) {
+        this.updateState({ config }, userAction);
+        this.render();
+    }
     async formatData(serverData) {
         return await formatData(serverData.data);
     }
@@ -389,7 +395,7 @@ export class Controller extends BasePlugin.Controller {
             return;
         this.isHiddenByHideFunc = false;
         const { userAction } = options;
-        this.hooks.emit('show', { userAction });
+        this.hooks.emit('show', { userAction, auto: false });
         if (this.five.getCurrentState().mode !== 'Topview') {
             await changeMode(this.five, ['Topview', undefined, undefined, userAction]);
         }
@@ -399,14 +405,14 @@ export class Controller extends BasePlugin.Controller {
         const renderDuration = 500;
         const modelOpacity = this.state.config.modelOpacity;
         changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-        this.hooks.emit('showAnimationEnded', { userAction });
+        this.hooks.emit('showAnimationEnded', { userAction, auto: false });
         this.render();
     }
     async _hide(options) {
         if (!this.state.enabled)
             return;
         const { userAction } = options;
-        this.hooks.emit('hide', { userAction });
+        this.hooks.emit('hide', { userAction, auto: false });
         const modelOpacity = 1;
         const renderDuration = 0;
         changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
@@ -423,7 +429,8 @@ export class Controller extends BasePlugin.Controller {
     }
     updateState(state, userAction) {
         const prevState = this.state;
-        this.state = Object.assign(Object.assign({}, this.state), state);
+        const config = state.config ? Object.assign(Object.assign({}, prevState.config), state.config) : prevState.config;
+        this.state = Object.assign(Object.assign(Object.assign({}, this.state), state), { config });
         if (equal(this.state, prevState, { deep: true }))
             return;
         this.hooks.emit('stateChange', { state: this.state, prevState, userAction });

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

@@ -1,86 +1,11 @@
-import type { FLOOR_PLAN_ATTACHED_TO } from '../constant';
-import type * as BasePlugin from '../../base/BasePluginWithData';
-import type { FloorplanServerData } from '../typings/floorplanServerData';
-import type { FloorplanData, FloorplanRoomItem } from '../typings/floorplanData';
-export interface Config {
-    /** 指北针的显示文案，默认为 '北' */
-    northDesc: string;
-    /** 户型图展示时，模型的透明度，默认为 1 */
-    modelOpacity: number;
-    /** 鼠标放置在分间上时，是否要自动高亮分间，默认为 true */
-    hoverEnable: boolean;
+import type * as FloorplanPlugin from '../typings';
+export * from '../typings';
+export interface Config extends FloorplanPlugin.Config {
     /** 是否开启放大缩小和拖动功能，默认为 false */
     gestureEnable: boolean;
-    /** 是否要启用指北针功能，默认为 true */
-    compassEnable: boolean;
-    /** Five 切换到 Topview Mode 时，是否自动展示户型图，默认为 true */
-    autoShowEnable: boolean;
-    /** 是否要启用户型图分间标尺功能，默认为 true */
-    ruleLabelsEnable: boolean;
-    /** 是否要启用户型图分间标签功能，默认为 true */
-    roomLabelsEnable: boolean;
-    /** 自定义「雷达」图标 */
-    cameraImageUrl: string;
-    /** 点击房间时，是否需要跳转到被点房间的全景态点位上，默认为 true */
+    /** 点击房间时，是否阻止跳转到被点房间的全景态点位上，默认为 false */
     preventRoomClick?: boolean;
-    /** 计算户型图大小时，以模型的哪个高度为依据，默认为 BOUNDING_CENTER
-     * - FLOOR_PLAN_ATTACHED_TO.FLOOR: 户型图大小与模型的地板进行贴合
-     * - FLOOR_PLAN_ATTACHED_TO.CEILING: 户型图大小与模型的天花板进行贴合
-     * - FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER: 户型图大小与模型的中心进行贴合
-     */
-    attachedTo: FLOOR_PLAN_ATTACHED_TO;
-    /** 分间标签的自定义函数，通过返回自定义 DOM 替换对应分间的标签 */
-    getLabelElement: undefined | ((room: FloorplanRoomItem) => Element | null);
-    /** 是否支持房屋标签自适应展示，默认为 true
-     * @description
-     * * 标签边框超过房间边框时，自动隐藏；不超过时自动展示。
-     * * 鼠标 hover 时，自动展示。
-     * */
-    adaptiveRoomLabelVisibleEnable: boolean;
 }
-export interface State extends BasePlugin.State {
-    visible: boolean;
+export interface State extends FloorplanPlugin.State {
     config: Config;
 }
-export interface EventMap extends BasePlugin.EventMap<State, FloorplanData> {
-    /** 展示结束的回调
-     * @param event.userAction 是否是用户操作
-     */
-    showAnimationEnded: (event: {
-        userAction: boolean;
-    }) => void;
-    /** visible 从 false 到 true 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    show: (event: {
-        userAction: boolean;
-    }) => void;
-    /** visible 从 true 到 false 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    hide: (event: {
-        userAction: boolean;
-    }) => void;
-    /** enabled 从 false 到 true 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    enable: (event: {
-        userAction: boolean;
-    }) => void;
-    /** enabled 从 true 到 false 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    disable: (event: {
-        userAction: boolean;
-    }) => void;
-}
-/** 插件初始化参数 */
-export interface Parameters extends Partial<Config> {
-    selector?: string | Element;
-    scale?: number;
-}
-export interface PluginServerData extends BasePlugin.ServerData {
-    version: number;
-    data: FloorplanServerData;
-}
-export { FloorplanData as PluginData };

package/libs/floorplan/TopviewFloorplanPlugin/typing.js

@@ -1 +1 @@
-export {};
+export * from '../typings';

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

@@ -0,0 +1,117 @@
+import type { FloorplanRoomItem } from './floorplanData';
+import type { FLOOR_PLAN_ATTACHED_TO } from '../constant';
+import type { FloorplanData } from '../typings/floorplanData';
+import type * as BasePlugin from '../../base/BasePluginWithData';
+import type { FloorplanServerData } from '../typings/floorplanServerData';
+export interface State extends BasePlugin.State {
+    visible: boolean;
+    config: Config;
+}
+export interface Config {
+    /** 指北针的显示文案，默认为 '北' */
+    northDesc: string;
+    /** 户型图展示时，模型的透明度，默认为 1 */
+    modelOpacity: number;
+    /** 鼠标放置在分间上时，是否要自动高亮分间，默认为 true */
+    hoverEnable: boolean;
+    /** 是否要启用指北针功能，默认为 true */
+    compassEnable: boolean;
+    /** Five 切换到 Topview Mode 时，是否自动展示户型图，默认为 true */
+    autoShowEnable: boolean;
+    /** 是否要启用户型图分间标尺功能，默认为 true */
+    ruleLabelsEnable: boolean;
+    /** 是否要启用户型图分间标签功能，默认为 true */
+    roomLabelsEnable: boolean;
+    /** 是否支持房屋标签自适应展示，默认为 true
+     * @description
+     * * 标签边框超过房间边框时，自动隐藏；不超过时自动展示。
+     * * 鼠标 hover 时，自动展示。
+     * */
+    adaptiveRoomLabelVisibleEnable: boolean;
+    /** 自定义「雷达」图标 */
+    cameraImageUrl: string;
+    /** 计算户型图大小时，以模型的哪个高度为依据，默认为 BOUNDING_CENTER
+     * - FLOOR_PLAN_ATTACHED_TO.FLOOR: 户型图大小与模型的地板进行贴合
+     * - FLOOR_PLAN_ATTACHED_TO.CEILING: 户型图大小与模型的天花板进行贴合
+     * - FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER: 户型图大小与模型的中心进行贴合
+     */
+    attachedTo: FLOOR_PLAN_ATTACHED_TO;
+    /** 分间标签的自定义函数，通过返回自定义 DOM 替换对应分间的标签 */
+    getLabelElement: undefined | ((room: FloorplanRoomItem) => Element | null);
+    /** 自定义分间面积文本
+     * @param area 分间原始面积，单位是 mm²
+     */
+    getRoomAreaText: (areaSize: number) => string;
+    /** 自定义标尺距离文本
+     * @param distance 原始标尺距离，单位是 mm
+     */
+    getRuleDistanceText: (distance: number) => string;
+}
+/** 插件初始化参数 */
+export interface Parameters extends Partial<Config> {
+    selector?: string | Element;
+    scale?: number;
+}
+export interface PluginServerData extends BasePlugin.ServerData {
+    version: number;
+    data: FloorplanServerData;
+}
+export interface ViewEvent {
+    /** 是否是用户滑动模型导致的户型图自动展示/消失 */
+    auto: boolean;
+    /** 是否是用户操作 */
+    userAction: boolean;
+}
+export interface EventMap extends BasePlugin.EventMap<State, FloorplanData> {
+    /**
+     * 展示结束的回调
+     * @param event.auto 是否是自动操作
+     * @param event.userAction 是否是用户操作
+     */
+    showAnimationEnded: (event: ViewEvent) => void;
+    /** visible 从 false 到 true 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    show: (event: ViewEvent) => void;
+    /** visible 从 true 到 false 的回调
+     * @param event.auto 是否是自动操作
+     * @param event.userAction 是否是用户操作
+     */
+    hide: (event: ViewEvent) => void;
+    /** enabled 从 false 到 true 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    enable: (event: {
+        userAction: boolean;
+    }) => void;
+    /** enabled 从 true 到 false 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    disable: (event: {
+        userAction: boolean;
+    }) => void;
+    /**
+     * 点击户型图的回调
+     * @return 当返回 false 时，会阻止默认行为
+     */
+    click: () => boolean | undefined;
+}
+export interface ShowOptions {
+    /** 展示户型图时，希望到达的楼层数 */
+    floorIndex: number;
+    /** 是否自动展示 */
+    isAutoShow: boolean;
+    /** 展示户型图时，模型透明度 */
+    modelOpacity: number;
+    /** 是否需要 opacity 动画 */
+    immediately: boolean;
+    /** 是否是用户操作 */
+    userAction: boolean;
+}
+export interface HideOptions {
+    /** 是否自动隐藏 */
+    isAutoHide: boolean;
+    /** 是否是用户操作 */
+    userAction: boolean;
+}
+export { FloorplanData as PluginData };

package/libs/floorplan/typings/index.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -8,7 +8,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.1.0-alpha.13",
+  "version": "2.1.0-alpha.16",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",
@@ -47,8 +47,8 @@
     "eslint": "^8.9.0",
     "eslint-config-alloy": "^4.5.1",
     "glob": "^8.0.1",
-    "postcss": "^8.4.6",
     "polyline-normals": "^2.0.2",
+    "postcss": "^8.4.6",
     "postcss-plugin-px2rem": "^0.8.1",
     "replace": "^1.2.1",
     "rollup-plugin-multi-input": "^1.3.1",
@@ -62,7 +62,7 @@
     "tslib": "^2.3.1",
     "typedoc": "^0.22.11",
     "typescript": "^4.5.5",
-    "type-fest": "^2.17.0",
+    "type-fest": "2.17.0",
     "vite": "^2.8.0"
   },
   "dependencies": {
@@ -71,7 +71,7 @@
     "svelte": "^3.49.0",
     "classnames": "^2.3.1",
     "object-assign-deep": "0.4.0",
-    "swiper": "^8.4.3",
+    "swiper": "8.4.3",
     "animejs": "^3.2.1"
   }
 }