@realsee/dnalogel 3.44.5 → 3.45.0

package/CHANGELOG.md

@@ -1,4 +1,7 @@
 # CHANGELOG
+## 3.45.0
+- feat(Sculpt): 支持创建线段；支持创建 线段、折线、多边形时，锁定垂直/水平面
+
 ## 3.44.5
 - chore(PanoTagPlugin): 开启 `debug` 时，控制台输出函数调用日志。
 

package/dist/Sculpt/Meshes/Area.d.ts

@@ -1,4 +1,4 @@
-import type { LineStyle } from '../utils/color';
+import type { LineStyle } from '../typings/style';
 import type { PointsData } from '../utils/data';
 import type { ColoredMeshStyle } from '../utils/three/ColoredMesh';
 import { PolygonWithEdgeMesh } from './PolygonWithEdge';

package/dist/Sculpt/Meshes/Box.d.ts

@@ -1,7 +1,7 @@
 import { IObject3D } from '../../shared-utils/three/IObject3D';
 import { type AnyPositions, type AnyPosition } from '../../shared-utils/positionToVector3';
 import type * as THREE from 'three';
-import type { LineStyle } from '../utils/color';
+import type { LineStyle } from '../typings/style';
 import { RectangleWithEdgeMesh } from './RectangleWithEdge';
 import { RectangleMesh } from './Rectangle';
 import type { PointsData } from '../utils/data';

package/dist/Sculpt/Meshes/Circle.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { type OcclusionStyle } from '../utils/color';
+import { type OcclusionStyle } from '../typings/style';
 import ColoredMesh, { type ColoredMeshStyle } from '../utils/three/ColoredMesh';
 import { type AnyPosition } from '../../shared-utils/positionToVector3';
 export type CircleStyle = ColoredMeshStyle & OcclusionStyle;

package/dist/Sculpt/Meshes/CircleWithEdge.d.ts

@@ -1,4 +1,4 @@
-import type { LineStyle } from '../utils/color';
+import type { LineStyle } from '../typings/style';
 import { CircleMesh, type CircleData, type CircleStyle } from './Circle';
 export type CircleWithEdgeMeshStyle = CircleStyle & LineStyle;
 export declare class CircleWithEdgeMesh extends CircleMesh {

package/dist/Sculpt/Meshes/Line.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { type Color, type OcclusionStyle, type LineStyle } from '../utils/color';
+import { type Color, type OcclusionStyle, type LineStyle } from '../typings/style';
 import { LineGeometry, LineMaterial, THREE_Line2 } from '../../shared-utils/five/FiveLine';
 import { type AnyPositions } from '../../shared-utils/positionToVector3';
 import { IObject3D } from '../../shared-utils/three/IObject3D';
@@ -28,6 +28,7 @@ export declare class THREE_Line3 extends THREE_Line2 {
 export declare class LineMesh extends IObject3D {
     name: string;
     points: THREE.Vector3[];
+    get style(): LineMeshStyle;
     get lineWidth(): number;
     get color(): THREE.Color;
     get dashed(): boolean;

package/dist/Sculpt/Meshes/LineWithDots.d.ts

@@ -15,7 +15,7 @@ type Style = LineMeshStyle & {
 export declare class LineWithDotsMesh extends LineMesh {
     name: string;
     pointGroup: IObject3D;
-    style: Style;
+    private _paramsStyle;
     get startPoint(): PointMesh;
     get endPoint(): PointMesh;
     get visiblePointMeshes(): PointMesh[];

package/dist/Sculpt/Meshes/Point.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { type ColorStyle, type OcclusionStyle } from '../utils/color';
+import { type ColorStyle, type OcclusionStyle } from '../typings/style';
 import { IObject3D } from '../../shared-utils/three/IObject3D';
 import type { PointData } from '../utils/data';
 export type { PointData } from '../utils/data';

package/dist/Sculpt/Meshes/PolygonWithEdge.d.ts

@@ -1,6 +1,6 @@
 import type { AnyPositions } from '../../shared-utils/positionToVector3';
 import { PolylineMesh } from './Polyline';
-import type { LineStyle } from '../utils/color';
+import type { LineStyle } from '../typings/style';
 import PolygonMesh, { type PolygonData, type PolygonStyle } from './Polygon';
 import * as THREE from 'three';
 export type PolygonWithEdgeMeshStyle = PolygonStyle & LineStyle;

package/dist/Sculpt/Meshes/Prism.d.ts

@@ -2,7 +2,7 @@ import { IObject3D } from '../../shared-utils/three/IObject3D';
 import { type AnyPosition, type AnyPositions } from '../../shared-utils/positionToVector3';
 import type { AreaData } from './Area';
 import * as THREE from 'three';
-import type { LineStyle } from '../utils/color';
+import type { LineStyle } from '../typings/style';
 import type { ColoredMeshStyle } from '../utils/three/ColoredMesh';
 import { PolygonWithEdgeMesh } from './PolygonWithEdge';
 export type PrismStyle = ColoredMeshStyle & LineStyle;

package/dist/Sculpt/Meshes/RectangleWithEdge.d.ts

@@ -1,8 +1,7 @@
 import type { AnyPositions } from '../../shared-utils/positionToVector3';
 import { RectangleMesh, type RectangleData, type RectangleStyle } from './Rectangle';
 import { PolylineMesh } from './Polyline';
-import type { LineStyle } from '../utils/color';
-import * as THREE from 'three';
+import type { LineStyle } from '../typings/style';
 export type RectangleWithEdgeMeshStyle = RectangleStyle & LineStyle;
 /**
  * @description: 带边线的矩形
@@ -10,8 +9,8 @@ export type RectangleWithEdgeMeshStyle = RectangleStyle & LineStyle;
 export declare class RectangleWithEdgeMesh extends RectangleMesh {
     name: string;
     get lineWidth(): number;
-    get lineColor(): THREE.Color;
-    protected line: PolylineMesh;
+    get lineColor(): import("three").Color;
+    line: PolylineMesh;
     constructor(params?: Partial<RectangleWithEdgeMeshStyle & RectangleData>);
     setPoints(points: AnyPositions): void;
     setStyle(style: Partial<RectangleWithEdgeMeshStyle>): void;

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

@@ -0,0 +1,22 @@
+import { BaseEditor } from '../Base/Editor';
+import type { FiveDomEvent } from '../../../shared-utils/five/FiveDomEvents';
+import type { Line } from '.';
+import type * as THREE from 'three';
+import { PointMesh } from '../../Meshes/Point';
+export declare abstract class LineEditorAbstract<OriginObject extends THREE.Object3D = THREE.Object3D> extends BaseEditor<OriginObject> {
+    protected draggingPoints: PointMesh[];
+    protected get pointMeshes(): PointMesh[];
+    abstract get points(): THREE.Vector3[];
+    get pointHandles(): PointMesh[];
+    constructor(originObject: OriginObject);
+    enable(): void;
+    disable(): void;
+    protected onDragstart: (event: FiveDomEvent) => void;
+    protected onDragend: (event: FiveDomEvent) => void;
+    protected abstract onDrag(event: FiveDomEvent): void;
+}
+export declare class LineEditor extends LineEditorAbstract<Line> {
+    get points(): THREE.Vector3[];
+    constructor(originObject: Line);
+    protected onDrag: (event: FiveDomEvent) => void;
+}

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

@@ -0,0 +1,33 @@
+import { LineMesh, type LineData, type LineMeshStyle } from '../../Meshes/Line';
+import { BaseObject, type BaseImportData, type BaseObjectConfig } from '../Base';
+import type { PointSelector } from '../../../shared-utils/three/PointSelector';
+import type { LiteralString } from '../../../typings/utils.type';
+import type { LimitPlaneConfig } from '../../typings/style';
+import { LineWithDotsMesh } from '../../Meshes/LineWithDots';
+export interface LineImportData extends BaseImportData, LineData {
+    type: LiteralString<'Line'>;
+    style?: Partial<LineMeshStyle>;
+}
+export declare class Line extends BaseObject<LineImportData> {
+    readonly type = "Line";
+    lineMesh: LineWithDotsMesh;
+    get data(): {
+        points: [number, number, number][];
+        style: {
+            lineColor: number;
+            lineWidth: number;
+            dashed: boolean;
+        };
+        id: string;
+        type: string;
+    };
+    constructor(data?: LineImportData, config?: Partial<BaseObjectConfig>);
+    highlight(): void;
+    unhighlight(): void;
+    create(params?: Partial<LineMeshStyle & LimitPlaneConfig>): Promise<void>;
+}
+/**
+ * @description 绘制线段
+ * @param config.limit 限制折线绘制的平面; `xoz` 限制在水平面; `y` 限制垂直面; `none` 不限制；默认 `none`
+ */
+export declare function createLine(lineMesh: LineMesh, pointSelector: PointSelector, config?: Partial<LimitPlaneConfig>): Promise<void>;

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

@@ -30,6 +30,6 @@ export declare class Point extends BaseObject<PointImportData> {
     /**
      * @description: 创建点
      */
-    create(params?: PointStyle): Promise<void>;
+    create(params?: Partial<PointStyle>): Promise<void>;
 }
 export declare function createPoint(pointMesh: PointMesh, pointSelector: PointSelector): Promise<void>;

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

@@ -1,8 +1,8 @@
 import type { Polygon } from '.';
 import type { FiveDomEvent } from '../../../shared-utils/five/FiveDomEvents';
-import { LineEditor } from '../Polyline/Editor';
 import * as THREE from 'three';
-export declare class PolygonEditor extends LineEditor<Polygon> {
+import { LineEditorAbstract } from '../Line/Editor';
+export declare class PolygonEditor extends LineEditorAbstract<Polygon> {
     get points(): THREE.Vector3[];
     constructor(originObject: Polygon);
     protected onDrag: (event: FiveDomEvent) => void;

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

@@ -3,6 +3,7 @@ import { AreaMesh, type AreaStyle } from '../../Meshes/Area';
 import type { PointSelector } from '../../../shared-utils/three/PointSelector';
 import type { LiteralString } from '../../../typings/utils.type';
 import type { PolygonData, PolygonStyle } from '../../Meshes/Polygon';
+import type { LimitPlaneConfig } from '../../typings/style';
 export interface PolygonImportData extends BaseImportData, PolygonData {
     type: LiteralString<'Polygon'>;
     style?: Partial<AreaStyle>;
@@ -23,6 +24,6 @@ export declare class Polygon extends BaseObject<PolygonImportData> {
     constructor(data?: PolygonImportData, config?: Partial<BaseObjectConfig>);
     highlight(): void;
     unhighlight(): void;
-    create(params?: Partial<PolygonStyle>): Promise<void>;
+    create(params?: Partial<PolygonStyle & LimitPlaneConfig>): Promise<void>;
 }
-export declare function createPolygon(areaMesh: AreaMesh, pointSelector: PointSelector): Promise<void>;
+export declare function createPolygon(areaMesh: AreaMesh, pointSelector: PointSelector, config?: Partial<LimitPlaneConfig>): Promise<void>;

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

@@ -1,22 +1,8 @@
-import { BaseEditor } from '../Base/Editor';
 import type { FiveDomEvent } from '../../../shared-utils/five/FiveDomEvents';
 import type { Polyline } from '.';
-import type * as THREE from 'three';
-import { PointMesh } from '../../Meshes/Point';
-export declare abstract class LineEditor<OriginObject extends THREE.Object3D = THREE.Object3D> extends BaseEditor<OriginObject> {
-    protected draggingPoints: PointMesh[];
-    protected get pointMeshes(): PointMesh[];
-    abstract get points(): THREE.Vector3[];
-    get pointHandles(): PointMesh[];
-    constructor(originObject: OriginObject);
-    enable(): void;
-    disable(): void;
-    protected onDragstart: (event: FiveDomEvent) => void;
-    protected onDragend: (event: FiveDomEvent) => void;
-    protected abstract onDrag(event: FiveDomEvent): void;
-}
-export declare class PolylineEditor extends LineEditor<Polyline> {
-    get points(): THREE.Vector3[];
+import { LineEditorAbstract } from '../Line/Editor';
+export declare class PolylineEditor extends LineEditorAbstract<Polyline> {
+    get points(): import("three").Vector3[];
     constructor(originObject: Polyline);
     protected onDrag: (event: FiveDomEvent) => void;
 }

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

@@ -1,8 +1,8 @@
-import type { Color } from '../../../Object3DHelperPlugin';
 import { PolylineMesh, PolylineWithDotsMesh, type PolylineData, type PolylineStyle } from '../../Meshes/Polyline';
 import { BaseObject, type BaseImportData, type BaseObjectConfig } from '../Base';
 import type { PointSelector } from '../../../shared-utils/three/PointSelector';
 import type { LiteralString } from '../../../typings/utils.type';
+import type { LimitPlaneConfig } from '../../typings/style';
 export interface PolylineImportData extends BaseImportData, PolylineData {
     type: LiteralString<'Polyline'>;
     style?: Partial<PolylineStyle>;
@@ -23,9 +23,10 @@ export declare class Polyline extends BaseObject<PolylineImportData> {
     constructor(data?: PolylineImportData, config?: Partial<BaseObjectConfig>);
     highlight(): void;
     unhighlight(): void;
-    create(params?: {
-        color?: Color;
-        lineWidth?: number;
-    }): Promise<void>;
+    create(params?: Partial<PolylineStyle & LimitPlaneConfig>): Promise<void>;
 }
-export declare function createPolyline(polyLineMesh: PolylineMesh, pointSelector: PointSelector): Promise<void>;
+/**
+ * @description 绘制折线
+ * @param config.limit 限制折线绘制的平面; `xoz` 限制在水平面; `y` 限制垂直面; `none` 不限制；默认 `none`
+ */
+export declare function createPolyline(polyLineMesh: PolylineMesh, pointSelector: PointSelector, config?: Partial<LimitPlaneConfig>): Promise<void>;

package/dist/Sculpt/index.d.ts

@@ -12,6 +12,7 @@ import { Circle } from './Objects/Circle';
 import { Cylinder } from './Objects/Cylinder';
 import { Box } from './Objects/Box';
 import type { BuiltInData, BuiltInItem, Theme } from './typings';
+import { Line } from './Objects/Line';
 export type { SculptData } from './typings';
 interface Data {
     items: Array<BuiltInData>;
@@ -125,6 +126,10 @@ export declare class Sculpt extends Subscribe<Event> {
      * @description: 开始绘制点
      */
     createPoint(params?: Parameters<Point['create']>[0]): Promise<Point>;
+    /**
+     * @description: 开始绘制线段
+     */
+    createline(params?: Parameters<Line['create']>[0]): Promise<Line>;
     /**
      * @description: 开始绘制空间折线
      */

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

@@ -1,8 +1,9 @@
-import type { SimplifyDeep } from './SimplifyDeep';
 import type { PartialDeep } from 'type-fest';
-export type { SimplifyDeep } from './SimplifyDeep';
-import type { Polyline, PolylineImportData } from '../Objects/Polyline';
+import type { SimplifyDeep } from './utils.type';
+export type { SimplifyDeep };
 import type { Point, PointImportData } from '../Objects/Point';
+import type { Line, LineImportData } from '../Objects/Line';
+import type { Polyline, PolylineImportData } from '../Objects/Polyline';
 import type { Polygon, PolygonImportData } from '../Objects/Polygon';
 import type { Prism, PrismImportData } from '../Objects/Prism';
 import type { Rectangle, RectangleImportData } from '../Objects/Rectangle';
@@ -10,6 +11,7 @@ import type { Circle, CircleImportData } from '../Objects/Circle';
 import type { Cylinder, CylinderImportData } from '../Objects/Cylinder';
 import type { Box, BoxImportData } from '../Objects/Box';
 import type { PointStyle } from '../Meshes/Point';
+import type { LineMeshStyle } from '../Meshes/Line';
 import type { PolylineStyle } from '../Meshes/Polyline';
 import type { PrismStyle } from '../Meshes/Prism';
 import type { RectangleWithEdgeMeshStyle as RectangleStyle } from '../Meshes/RectangleWithEdge';
@@ -27,8 +29,9 @@ export declare namespace SculptData {
     type CylinderData = SimplifyDeep<CylinderImportData>;
     type BoxData = SimplifyDeep<BoxImportData>;
 }
-export type { Polyline, PolylineImportData };
 export type { Point, PointImportData };
+export type { Line, LineImportData };
+export type { Polyline, PolylineImportData };
 export type { Polygon, PolygonImportData };
 export type { Prism, PrismImportData };
 export type { Rectangle, RectangleImportData };
@@ -36,6 +39,7 @@ export type { Circle, CircleImportData };
 export type { Cylinder, CylinderImportData };
 export type { Box, BoxImportData };
 export type { PointStyle };
+export type { LineMeshStyle };
 export type { PolylineStyle };
 export type { PrismStyle };
 export type { RectangleStyle };
@@ -43,10 +47,11 @@ export type { CircleStyle };
 export type { CylinderStyle };
 export type { BoxStyle };
 export type { AreaStyle };
-export type BuiltInData = PolylineImportData | PointImportData | PolygonImportData | PrismImportData | RectangleImportData | CircleImportData | CylinderImportData | BoxImportData;
-export type BuiltInItem = Polyline | Point | Polygon | Prism | Rectangle | Circle | Cylinder | Box;
+export type BuiltInData = PolylineImportData | PointImportData | PolygonImportData | PrismImportData | RectangleImportData | CircleImportData | CylinderImportData | BoxImportData | LineImportData;
+export type BuiltInItem = Polyline | Point | Polygon | Prism | Rectangle | Circle | Cylinder | Box | Line;
 export type Theme = PartialDeep<{
     point: PointStyle;
+    line: LineMeshStyle;
     polyline: PolylineStyle;
     polygon: AreaStyle;
     prism: PrismStyle;

package/dist/Sculpt/{utils/color.d.ts → typings/style.d.ts}

@@ -31,6 +31,13 @@ export type LineWidthStyle = {
      */
     lineWidth?: number;
 };
+export type LimitPlaneConfig = {
+    /**
+     * @description 限制折线绘制的平面; `xoz` 限制在水平面; `y` 限制垂直面; `none` 不限制
+     * @default `none`
+     */
+    limit: 'xoz' | 'y' | 'none';
+};
 export type OcclusionStyle = {
     /**
      * @description 是否以一种半透明的方式显示遮挡的部分

package/dist/Sculpt/typings/utils.type.d.ts

@@ -1,6 +1,8 @@
 import type * as THREE from 'three';
 import type { Merge, UnknownArray } from 'type-fest';
+import type { ConditionalSimplifyDeep } from 'type-fest/source/conditional-simplify';
 import type { IsNull, NonRecursiveType } from 'type-fest/source/internal';
+export type SimplifyDeep<T> = ConditionalSimplifyDeep<T, THREE.Color | THREE.Vector3 | Function | Iterable<unknown>, object>;
 export type ImportDataToExportData<T> = Merge<JsonData<T>, {
     id: string | number;
 }>;

package/dist/Sculpt/utils/three/ColoredMesh.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { type ColorStyle, type OpacityStyle, type OcclusionStyle } from '../color';
+import { type ColorStyle, type OpacityStyle, type OcclusionStyle } from '../../typings/style';
 import { IObject3D } from '../../../shared-utils/three/IObject3D';
 export type ColoredMeshStyle = OpacityStyle & ColorStyle & OcclusionStyle;
 export default class ColoredMesh<TGeometry extends THREE.Geometry | THREE.BufferGeometry = THREE.Geometry | THREE.BufferGeometry> extends IObject3D {

package/dist/Sculpt/utils/three/rayOnLine.d.ts

@@ -1,13 +1,11 @@
 import * as THREE from 'three';
 /**
  * @description: 求射线与线段的交点（交点在线段上）
- * @param {THREE.Vector3} cameraPosition 摄像机位置
- * @param {THREE.Ray} ray 射线
- * @param {THREE.Line3} line 线段
- * @param {boolean} clampToLine 是否限制交点在线段上，默认为true，不限制则可以相交在线段的延长线上
+ * @param {THREE.Raycaster} params.ray 射线
+ * @param {THREE.Line3} params.line 线段
+ * @param {boolean} params.clampToLine `true` 限制交点在线段上, `false` 可以相交在线段的延长线上；默认为`true`
  */
 export declare function rayOnLine(params: {
-    cameraPosition: THREE.Vector3;
     raycaster: THREE.Raycaster;
     line: THREE.Line3;
     clampToLine?: boolean;