@realsee/dnalogel 3.77.2-alpha.0 → 3.77.2

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 # CHANGELOG
+## 3.77.2
+
+- fix(Sculpt): 修复 hitFilter 配置为可选，避免未配置时报错
+
+## 3.77.1
+
+- feat(floorplan): 1. 支持自定义showState 2. 在模型有旋转时仍然支持显示&放大缩小平面图
+
+## 3.77.0
+
+- feat(Sculpt): 1.添加Sculpt 落笔时候的点位回调，2添加Sculpt编辑状态的回调 包含旋转，拖拽，缩放参数
+
 ## 3.76.0
 
 - feat(Sculpt): 添加 hitFilter 配置，支持自定义拾取点过滤函数

package/dist/CruisePlugin/Work.d.ts

@@ -20,8 +20,6 @@ export default class WalkController extends CruiseController<PluginData, Config>
         moveToFirstPanoEffect?: MoveEffect;
         moveToFirstPanoDuration?: number;
         modeChanging?: boolean;
-        audio?: HTMLAudioElement;
-        audioCache?: Map<string, HTMLAudioElement>;
     };
     constructor(five: Five, config?: Config);
     /**
@@ -119,6 +117,4 @@ export default class WalkController extends CruiseController<PluginData, Config>
      * @description Change five mode
      */
     private changeMode;
-    private loadAudio;
-    private playAudio;
 }

package/dist/CruisePlugin/typing.d.ts

@@ -18,13 +18,6 @@ export type CruiseData = {
      * @description 旋转速度 rad/ms
      */
     rotateSpeed?: number;
-    /**
-     * @description move effect独有，音频播放相关参数
-     */
-    audio?: {
-        url: string;
-        duration: number;
-    };
 } & FivePoseAndState;
 export interface CruiseKeyframe {
     id: string;

package/dist/CruisePlugin/utils/coordinatesAngle.d.ts

@@ -1,6 +1,6 @@
 /**
- * @description: 获取coordinates间的夹角（两个方向向量之间的最小夹角）
- * @return {number} 夹角角度（0 到 π）
+ * @description: 获取coordinates间的夹角
+ * @return {number} 夹角角度
  */
 declare function coordinatesAngle(coordinates1: {
     longitude: number;
@@ -9,20 +9,4 @@ declare function coordinatesAngle(coordinates1: {
     longitude: number;
     latitude: number;
 }): number;
-/**
- * @description: 获取coordinates间的实际旋转角度（基于 longitude/latitude 差值）
- * @param coordinates1 起始坐标
- * @param coordinates2 目标坐标
- * @param signed 是否返回有符号角度（默认 false）
- *   - true: 返回有符号角度（以主要旋转方向的符号为准）
- *   - false: 返回无符号角度（绝对值）
- * @return {number} 旋转角度（弧度），可以超过 π
- */
-declare function coordinatesRotation(coordinates1: {
-    longitude: number;
-    latitude: number;
-}, coordinates2: {
-    longitude: number;
-    latitude: number;
-}, signed?: boolean): number;
-export { coordinatesAngle, coordinatesRotation };
+export { coordinatesAngle };

package/dist/Sculpt/Objects/Base/Editor.d.ts

@@ -2,9 +2,21 @@ import type * as THREE from 'three';
 import { IObject3D } from '../../../shared-utils/three/IObject3D';
 import type { AddObject3DHelperConfig } from '../../../Object3DHelperPlugin';
 import { Subscribe } from '../../../shared-utils/Subscribe';
+import type { Direction, Direction4 } from '../../../shared-utils/Object3DHelper/typings/Direction';
+export type ObjectUpdateType = 'move' | 'rotate' | 'scale';
+export interface ObjectUpdateParams {
+    /** 操作类型：移动、旋转、缩放 */
+    type: ObjectUpdateType;
+    /** 开始时间戳 */
+    start_timestamp: number;
+    /** 结束时间戳 */
+    end_timestamp?: number;
+    /** 轴向 */
+    axis?: Direction | Direction4;
+}
 export declare class BaseEditor<OriginObject extends THREE.Object3D = THREE.Object3D> extends IObject3D {
     hooks: Subscribe<{
-        objectUpdate: () => void;
+        objectUpdate: (params?: ObjectUpdateParams) => void;
     }>;
     protected originObject: OriginObject;
     constructor(originObject: OriginObject);
@@ -20,9 +32,16 @@ export declare class BaseEditor<OriginObject extends THREE.Object3D = THREE.Obje
 export declare class BaseEditorWithObjectHelper<OriginObject extends THREE.Object3D = THREE.Object3D> extends BaseEditor<OriginObject> {
     private get helper();
     private objectHelperConfig;
+    private currentOperation;
     constructor(originObject: OriginObject, objectHelperConfig?: AddObject3DHelperConfig | (() => AddObject3DHelperConfig));
     enable(): void;
     disable(): void;
     initialHelperMatrix(): void;
+    private onMoveStart;
+    private onRotateStart;
+    private onScaleStart;
+    private onMoveEnd;
+    private onRotateEnd;
+    private onScaleEnd;
     private onObjectUpdate;
 }

package/dist/Sculpt/Objects/Box/index.d.ts

@@ -9,6 +9,9 @@ export interface BoxImportData extends BaseImportData, BoxData {
     type: LiteralString<'Box'>;
     style?: Partial<BoxStyle>;
 }
+export type BoxCreateConfig = Partial<BoxStyle & CreateLimitConfig & DrawMethodConfig> & {
+    onPointPlaced?: () => void;
+};
 export declare class Box extends BaseObject<BoxImportData> {
     readonly type = "Box";
     boxMesh: BoxMesh;
@@ -30,7 +33,7 @@ export declare class Box extends BaseObject<BoxImportData> {
     setData(data: Partial<BoxImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(params?: Partial<BoxStyle & CreateLimitConfig & DrawMethodConfig>): Promise<void>;
+    create(params?: BoxCreateConfig): Promise<void>;
     /**
      * 获取盒子在世界坐标中的6个面的几何信息
      * 返回顺序：bottom、top、side0~side3（自底面第0点起顺时针）
@@ -42,4 +45,4 @@ export declare class Box extends BaseObject<BoxImportData> {
         normal: THREE.Vector3;
     }>;
 }
-export declare function createBox(boxMesh: BoxMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & DrawMethodConfig>): Promise<void>;
+export declare function createBox(boxMesh: BoxMesh, pointSelector: PointSelector, config?: BoxCreateConfig): Promise<void>;

package/dist/Sculpt/Objects/Rectangle/index.d.ts

@@ -9,6 +9,9 @@ export interface RectangleImportData extends BaseImportData, RectangleData {
     type: LiteralString<'Rectangle'>;
     style?: Partial<RectangleWithEdgeMeshStyle>;
 }
+export type RectangleCreateConfig = Partial<RectangleWithEdgeMeshStyle & CreateLimitConfig & DrawMethodConfig> & {
+    onPointPlaced?: () => void;
+};
 export declare class Rectangle extends BaseObject<RectangleImportData> {
     readonly type = "Rectangle";
     rectangleMesh: RectangleWithEdgeMesh;
@@ -29,17 +32,17 @@ export declare class Rectangle extends BaseObject<RectangleImportData> {
     setData(data: Partial<RectangleImportData>): void;
     highlight(): void;
     unhighlight(): void;
-    create(config?: Partial<RectangleWithEdgeMeshStyle & CreateLimitConfig & DrawMethodConfig>): Promise<void>;
+    create(config?: RectangleCreateConfig): Promise<void>;
 }
 /**
  * @description 创建矩形
  */
-export declare function createRectangle(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig & DrawMethodConfig>): void | Promise<void>;
+export declare function createRectangle(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: RectangleCreateConfig): void | Promise<void>;
 /**
  * @description 对角线创建矩形（两步）
  */
-export declare function createRectangleByDiagonal(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig>): void | Promise<void>;
+export declare function createRectangleByDiagonal(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: RectangleCreateConfig): void | Promise<void>;
 /**
  * @description 正常创建矩形（三步）
  */
-export declare function createRectangleByVertex(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: Partial<CreateLimitConfig>): void | Promise<void>;
+export declare function createRectangleByVertex(rectangleMesh: RectangleMesh, pointSelector: PointSelector, config?: RectangleCreateConfig): void | Promise<void>;

package/dist/floorplan/MapviewFloorplanPlugin/Controller.d.ts

@@ -67,10 +67,26 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     /** 更新户型图大小 */
     updateSize: () => boolean;
+    /** 根据旋转角度计算 pxmm
+     * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用 Z 轴计算
+     */
+    private getPxmmWithRotation;
+    /** 使用 Z 轴计算 pxmm
+     * @description 当相机旋转导致 X 轴接近垂直于屏幕时，改用 Z 轴计算
+     */
+    private getPxmmZAxis;
     /** 更新户型图位置 */
     updatePosition(): void;
     highlight: (highlightData: HighlightData) => void;
     unhighlight: () => void;
+    /** 更新展示状态
+     * @description 可以更新 longitude、latitude、offset 等参数
+     * @param showState 需要更新的状态，会与现有状态合并
+     * @example
+     * // 更新 longitude
+     * plugin.updateShowState({ longitude: Math.PI / 2 })
+     */
+    updateShowState: (showState: Partial<ShowState>) => void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;
     private _disable;
     private _enable;
@@ -95,6 +111,11 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     private onFivePanoArrived;
     /** cameraUpdate 时判断户型图是否应该自动隐藏 */
     private onFiveCameraUpdate;
+    /** 获取相对于 showState 的 pose 偏差
+     * @description 将当前相机状态的 longitude 减去 showState.longitude，归一化后返回
+     * 这样自动隐藏逻辑会检查相对偏差，而不是绝对值
+     */
+    private getRelativePose;
     /** 户型图展示中，转动三维模型，结束时应该自动修复模型状态 */
     private onFiveWantsPanGesture;
     /** 阻止点击分间走点 */

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

@@ -65,8 +65,24 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     /** 更新户型图大小 */
     updateSize: () => boolean;
+    /** 根据旋转角度计算 pxmm
+     * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用 Z 轴计算
+     */
+    private getPxmmWithRotation;
+    /** 使用 Z 轴计算 pxmm
+     * @description 当相机旋转导致 X 轴接近垂直于屏幕时，改用 Z 轴计算
+     */
+    private getPxmmZAxis;
     highlight: (highlightData: HighlightData) => void;
     unhighlight: () => void;
+    /** 更新展示状态
+     * @description 可以更新 longitude、latitude、fov 等参数
+     * @param showState 需要更新的状态，会与现有状态合并
+     * @example
+     * // 更新 longitude
+     * plugin.updateShowState({ longitude: Math.PI / 2 })
+     */
+    updateShowState: (showState: Partial<ShowState>) => void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;
     private _disable;
     private _enable;

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

@@ -3,6 +3,7 @@ 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';
+import type { ShowState } from '../utils/correctFiveState';
 export interface State extends BasePlugin.State {
     visible: boolean;
     config: Config;
@@ -87,6 +88,8 @@ export interface Parameters extends Partial<Config> {
     scale?: number;
     /** 静态资源前缀，用于替换插件中使用到的固化资源 */
     staticPrefix?: string;
+    /** 展示状态配置，可以自定义 longitude、latitude、fov 等参数 */
+    showState?: Partial<ShowState>;
 }
 export interface PluginServerData {
     version: number;