更新版本

types/DatabaseServices/Entity/Arc.d.ts

@@ -16,6 +16,7 @@ import { Curve } from './Curve';
  * 参考计算圆弧的完整角度方法查看该计算方式.
  */
 export declare class Arc extends Curve {
+    private _DisplayAccuracy;
     constructor(center?: Vector3, radius?: number, startAngle?: number, endAngle?: number, clockwise?: boolean);
     private _Radius;
     private _StartAngle;
@@ -29,6 +30,8 @@ export declare class Arc extends Curve {
     set Center(v: Vector3);
     get Normal(): Vector3;
     set Normal(v: Vector3);
+    get DisplayAccuracy(): number;
+    set DisplayAccuracy(v: number);
     get Area(): number;
     get Area2(): number;
     get IsClose(): boolean;
@@ -65,7 +68,7 @@ export declare class Arc extends Curve {
     GetPointAtDistance(distance: number): Vector3;
     GetDistAtParam(param: number): number;
     GetDistAtPoint(pt: Vector3): number;
-    GetParamAtPoint(pt: Vector3): number;
+    GetParamAtPoint(pt: Vector3, fuzz?: number): number;
     /**
      * 利用角度计算该角度在圆弧中代表的参数.
      * 如果角度在圆弧内,那么返回0-1

types/DatabaseServices/Entity/Arc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Arc.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Arc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Arc.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Arc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGjE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAkG,eAAe,EAA6B,eAAe,EAA0B,MAAM,oCAAoC,CAAC;AAEzO,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAKhC;;;;;;;;GAQG;AACH,qBACa,GAAI,SAAQ,KAAK;IAE1B,OAAO,CAAC,gBAAgB,CAAK;gBACjB,MAAM,GAAE,OAAiB,EAAE,MAAM,GAAE,MAAY,EAAE,UAAU,GAAE,MAAY,EAAE,QAAQ,GAAE,MAAU,EAAE,SAAS,UAAO;IAS7H,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;IAC1B;;OAEG;IACH,OAAO,CAAC,UAAU,CAAQ;IAE1B,IAAI,KAAK,WASR;IAED,IAAI,MAAM,IAII,OAAO,CADpB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,EAGpB;IAED,IAAI,MAAM,IAII,OAAO,CADpB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,EAKpB;IAED,IAAI,eAAe,IAKI,MAAM,CAF5B;IAED,IAAI,eAAe,CAAC,CAAC,EAAE,MAAM,EAQ5B;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,KAAK,IAAI,MAAM,CAIlB;IACD,IAAI,OAAO,IAAI,OAAO,CAGrB;IAED,OAAO,KAAK,mBAAmB,GAmB9B;IAED,OAAO,CAAC,MAAM,CAAC,EAAE,CAAe;IAChC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAe;IAChC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAe;IAChC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAe;IAClC,IAAI,WAAW,IAAI,IAAI,CAyBtB;IAED;;MAEE;IACF,IAAI,gBAAgB,IAAI,OAAO,CAG9B;IAED,IAAI,MAAM,IAII,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAKnB;IAED,IAAI,WAAW,IAII,OAAO,CADzB;IACD,IAAI,WAAW,CAAC,CAAC,EAAE,OAAO,EAQzB;IAED,IAAI,UAAU,IAII,MAAM,CADvB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,MAAM,EAMvB;IAED,IAAI,QAAQ,IAII,MAAM,CADrB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAMrB;IAGD,IAAI,UAAU,IAII,OAAO,CADxB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,OAAO,EAIxB;IACD,IAAI,QAAQ,IAII,OAAO,CADtB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,OAAO,EAItB;IACD,IAAI,UAAU,WAGb;IACD,IAAI,QAAQ,WAGX;IACD,IAAI,MAAM,WAGT;IAED,gBAAgB,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM;IAKrC,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,SAAO,GAAG,OAAO;IAM5C,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAO5C,SAAS,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAc7C,eAAe,CAAC,KAAK,EAAE,MAAM;IAK7B,kBAAkB,CAAC,QAAQ,EAAE,MAAM;IAOnC,cAAc,CAAC,KAAK,EAAE,MAAM;IAK5B,cAAc,CAAC,EAAE,EAAE,OAAO;IAM1B,eAAe,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,SAAO;IAUxC;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,EAAE,MAAM;IAe1B;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,UAAO;IAe3C,OAAO,CAAC,MAAM,CAAC,aAAa,CAAe;IAC3C,eAAe,CAAC,EAAE,EAAE,OAAO;IAK3B,eAAe,CAAC,KAAK,EAAE,MAAM;IAK7B,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,GAAG,EAAE;IAiB/C,eAAe,CAAC,UAAU,EAAE,MAAM;IAWlC,MAAM,CAAC,QAAQ,EAAE,MAAM;IAcvB,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,MAAM;IA2FvB,OAAO,IAAI,IAAI;IAQf,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,SAAO,GAAG,eAAe,EAAE;IAsB3F;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,CAGrB;IAED,IAAI,GAAG,IAAI,MAAM,CAKhB;IAED;;;OAGG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAmBtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,EAAE,EAAE,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG;IA6B5E,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO;IA+BvD,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IAiCZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAS/B,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAoDrD,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC;IAKlC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IA+BxD,cAAc,CAAC,CAAC,EAAE,MAAM;IAIxB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAalC,iBAAiB,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO;IAkBxD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAqBlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAc3B"}

types/DatabaseServices/Entity/ArcBoardType.d.ts

@@ -0,0 +1,5 @@
+export declare enum ArcBoardFeedProcess {
+    Slots = 0,//间隔直槽
+    Model = 1
+}
+//# sourceMappingURL=ArcBoardType.d.ts.map

types/DatabaseServices/Entity/ArcBoardType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArcBoardType.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/ArcBoardType.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAE3B,KAAK,IAAI,CAAG,MAAM;IAClB,KAAK,IAAI;CACZ"}

types/DatabaseServices/Entity/Board.d.ts

@@ -1,13 +1,20 @@
 import Geom3 from '@jscad/modeling/src/geometries/geom3/type';
-import { Frustum, Geometry, Matrix3, Matrix4, Object3D, UVGenerator, Vector3 } from 'three';
+import { Frustum, Geometry, Matrix3, Matrix4, Object3D, ShapeBufferGeometry, UVGenerator, Vector3 } from 'three';
+import { ArcBoardBuild } from '../../Add-on/ArcBoard/ArcBoardBuild';
+import { ArcBoardOptions } from '../../Add-on/ArcBoard/ArcBoardFeeding';
+import { SplitBoardSideModelUtil } from '../../Add-on/BoardCutting/SplitBoardSideModel';
 import { FaceDirection } from "../../Add-on/DrawDrilling/DrillType";
 import { ObjectSnapMode } from '../../Editor/ObjectSnapMode';
+import { Box3Ext } from '../../Geometry/Box';
 import { RenderType } from '../../GraphicsSystem/RenderType';
 import { BoardProcessOption } from "../../UI/Store/OptionInterface/BoardProcessOption";
 import { CADFiler } from '../CADFiler';
 import { ObjectId } from '../ObjectId';
 import { Shape } from '../Shape';
+import { ArcBoardFeedProcess } from './ArcBoardType';
 import { BoardOpenDir, BoardType } from './BoardInterface';
+import { Circle } from './Circle';
+import { DragPointType } from './DragPointType';
 import { ExtrudeContourCurve, ExtrudeSolid } from './Extrude';
 import { Polyline } from './Polyline';
 export interface IModeling {
@@ -27,6 +34,7 @@ export interface IKnifeInfo {
 }
 export interface I2DModeingItem {
     depth: number;
+    depthExpr: string;
     offset: number;
     knife: IKnifeInfo;
 }
@@ -44,6 +52,9 @@ export interface I3DModeling {
     dir: FaceDirection;
     knife: IKnifeInfo;
 }
+export interface ObjectIdArr extends Array<ObjectId> {
+    Name?: string;
+}
 /**
  * 板件实体
  */
@@ -63,20 +74,66 @@ export declare class Board extends ExtrudeSolid {
     private _IsChaiDan;
     private _2DModelingList;
     private _3DModelingList;
+    private _SideModelingMap;
     private _CustomNumber;
     private _DrillLock;
     private _DrillAssociationLock;
+    AlignLineObject: ObjectId;
+    private _SweepPath;
+    private _SweepAngle;
+    /** 见光面 */
+    private _SweepVisibleFace;
+    _SweepArcBoardBuild: ArcBoardBuild;
+    private _ArcBoardOptions;
+    private _isDrawArcGroove;
+    arcBoardFeedProcess: ArcBoardFeedProcess;
     protected bevelEnabled: boolean;
     private _KnifePolylineMap;
+    private _jigSweepPath;
+    private _jigPath2WCSMtx;
     constructor();
+    get BoundingBoxInOCS(): Box3Ext;
+    get BoundingBox(): Box3Ext;
+    get IsDrawArcGroove(): boolean;
+    set IsDrawArcGroove(v: boolean);
+    /**
+     * path 发生改变，更新圆弧配置
+     * @param {{ key: number, arc: Arc; }[]} oldArcs 旧圆弧和对应的board options key
+     * @param {Polyline} nPath 新路径（未进行起点偏移）
+     * @return {*}  {void}
+     */
+    private UpdateArcBoardOptionsByPath;
+    get ArcBoardOptions(): Map<number, ArcBoardOptions>;
+    set ArcBoardOptions(opt: Map<number, ArcBoardOptions>);
+    UpdateArcBoardOptions(isNewPath: boolean): void;
+    get IsArcBoard(): boolean;
+    get ArcBuild(): ArcBoardBuild;
+    SetSweepPath(path: Polyline, sweepAngle: number): void;
+    private _FixContourByArcSweepPath_Ing;
+    FixContourByArcSweepPath(): void;
+    FixArcSweepPathLength(): void;
+    ParseBoardLengthInArcSweep(): number;
+    ClearSweepPath(): void;
+    GetSweepPath(): Polyline;
+    GetSweepPathInWCS(): Polyline;
+    GetSweepPath1InWCS(): Polyline;
+    GetSweepPath2InWCS(): Polyline;
+    /** 获取见光面 */
+    get SweepVisibleFace(): FaceDirection;
+    /** 设置见光面 */
+    set SweepVisibleFace(dir: FaceDirection);
+    get SweepAngle(): number;
+    set SweepAngle(v: number);
+    AdjustPath(br: Board, outline: Polyline | Circle): void;
+    AdjustPosition(br: Board, basePoint: Vector3): void;
     /**
      * 创建一个代理数组,数组改变时被监听
      */
     private CreateArray;
     private InitBoardData;
-    InitBoard(length: number, width: number, thickness: number, boardType?: BoardType): void;
+    InitBoard(length: number, width: number, thickness: number, boardType?: BoardType): this;
     static CreateBoard(length: number, width: number, thickness: number, boardType?: BoardType): Board;
-    get DrillList(): Map<ObjectId<import("../CADObject").CADObject>, ObjectId<import("../CADObject").CADObject>[][]>;
+    get DrillList(): Map<ObjectId<import("../CADObject").CADObject>, ObjectIdArr[]>;
     get DrillLock(): boolean;
     set DrillLock(v: boolean);
     get isDrillAssociationLock(): boolean;
@@ -100,12 +157,18 @@ export declare class Board extends ExtrudeSolid {
     protected GetRelevanceKnifes(knifs: ExtrudeSolid[]): void;
     ClearRelevance(en?: ExtrudeSolid): void;
     get SplitBoards(): this[];
+    get ArcBoardModeling(): IModeling[];
     get BoardModeling(): IModeling[];
     set BoardModeling(models: IModeling[]);
     get Modeling2D(): I2DModeling[];
     set Modeling2D(ms: I2DModeling[]);
     get Modeling3D(): I3DModeling[];
     set Modeling3D(ms: I3DModeling[]);
+    RelevanceSideModelMap: Map<number, ExtrudeSolid[]>;
+    get SideModelingMap(): Map<number, ExtrudeSolid[]>;
+    set SideModelingMap(sideModelingMap: Map<number, ExtrudeSolid[]>);
+    get AllSideModelGrooveMap(): Map<number, ExtrudeSolid[]>;
+    ClearSideModeling(): void;
     ClearModeling2DList(): void;
     ClearModeling3DList(): void;
     get IsChaiDan(): boolean;
@@ -116,7 +179,7 @@ export declare class Board extends ExtrudeSolid {
     /**
      * 注意传入的排钻列表,避免指针被引用
      */
-    AppendDrillList(k: ObjectId, drs: ObjectId[][]): void;
+    AppendDrillList(k: ObjectId, drs: ObjectIdArr[]): void;
     ClearDrillList(k: ObjectId): void;
     ClearAllDrillList(): void;
     Erase(isErase?: boolean): void;
@@ -125,6 +188,8 @@ export declare class Board extends ExtrudeSolid {
     set Height(v: number);
     get Width(): number;
     set Width(v: number);
+    get Thickness(): number;
+    set Thickness(thickness: number);
     get BoardType(): BoardType;
     set BoardType(type: BoardType);
     SetBoardType(type: BoardType): void;
@@ -135,6 +200,10 @@ export declare class Board extends ExtrudeSolid {
     get HasGroove(): boolean;
     get Name(): string;
     set Name(n: string);
+    private UpdateSplitBoardSideModelUtil;
+    private _SplitBoardSideModelUtil;
+    get SplitBoardSideModelUtil(): SplitBoardSideModelUtil;
+    GeneralRectContour(): void;
     /**
      * 板件的轮廓,在板件坐标系中的表现方式.
      */
@@ -157,7 +226,7 @@ export declare class Board extends ExtrudeSolid {
     get UCGenerator(): UVGenerator;
     UpdateUV(geo: Geometry, ocs: Matrix4, isRev?: boolean): void;
     CopyFrom(obj: Board): void;
-    Clone(): this;
+    Clone(cloneDraw?: boolean): this;
     Join(target: this): import("../../Common/Status").Status;
     private GetLinesDir;
     private GetLinesOpenDir;
@@ -173,16 +242,28 @@ export declare class Board extends ExtrudeSolid {
      * 这个函数生成了二维刀路的csg数组,并且同时生成了_2DPathDrawObject(二维刀路提刀线框显示对象)
      */
     Get2DPathCsgs(): Geom3[];
+    _SideModeingCsgs: Geom3[];
+    GetSideModeingCsgs(): Geom3[];
+    ClearSideModelingCache(): void;
+    get HasSideModel(): boolean;
+    private _asyncSideModelIng;
+    get AsyncSideModeling(): boolean;
     protected get Has2DPath(): boolean;
     private _workerCalcedGeom;
     private _async2DPathIng;
     get Async2DPathing(): boolean;
     GoodBye(): void;
-    private promise2DPath;
-    Load2DPathIng(): Promise<boolean>;
+    private _Promise2DPathRes;
+    private _2DPathBuildPromise;
+    Load2DPathPromise(): Promise<boolean>;
     HandleSpliteEntitys(splitEntitys: this[]): void;
+    private BuildArcGeometry;
+    UpdateDrawObject(renderType: RenderType, obj: Object3D): Object3D;
+    private DrawAsyncText;
     private get PlaceColor();
     private GetPlaceFace;
+    /** 获取大孔面的几何体 */
+    get BigHoleFaceGeo(): ShapeBufferGeometry;
     private GetBigHoleFace;
     OffsetPathCache: Map<Polyline, {
         [key: string]: Polyline;
@@ -196,9 +277,24 @@ export declare class Board extends ExtrudeSolid {
     private UpdateDrawObjectByBoardInfo;
     UpdateDrawObjectMaterial(renderType: RenderType, obj: Object3D): void;
     CheckSealing(obj: Object3D): void;
+    private AddSideModelGripPoints;
+    GetStrectchPointCountList(dragType: DragPointType): number[];
+    GetGripPoints(): Vector3[];
+    private MapToArcPoints;
+    MoveGripPoints(indexList: number[], vec: Vector3): void;
     GetStretchPoints(): Vector3[];
     MoveStretchPoints(indexList: Array<number>, vec: Vector3): void;
     GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3, frustum?: Frustum): Vector3[];
+    private MoveArcBoardPoints;
+    private GetOffsetVecAlongPath;
+    /**
+     * @private 通过新旧轮廓的Bondingbox修正路径
+     * @param {Box3Ext} newBox 路径坐标系下，新轮廓的Bondingbox
+     * @param {Box3Ext} oldBox 路径坐标系下，旧轮廓的Bondingbox
+     * @param {Polyline} path 见光面路径
+     * @return {*}  {Polyline} 修正好的路径
+     */
+    private FixSweepPathByContourBondingbox;
     DeferUpdate(): void;
     protected _ReadFile(file: CADFiler): void;
     WriteFile(file: CADFiler): void;

types/DatabaseServices/Entity/BoardInterface.d.ts

@@ -11,6 +11,11 @@ export declare enum LinesType {
     /** 可翻转 */
     CanReversal = 2
 }
+export declare const LinesTypeNames: {
+    0: string;
+    1: string;
+    2: string;
+};
 export declare enum ComposingType {
     Positive = 0,//正面
     Reverse = 1,//反面
@@ -21,6 +26,7 @@ export declare enum BoardOpenDir {
     Right = 2,
     Up = 3,
     Down = 4,
+    NoOpen = 5,//是门板 但没有开门方向
     None = 0
 }
 export declare enum BrRelativePos {
@@ -32,4 +38,8 @@ export declare enum BrRelativePos {
     Right = "right",
     Div = "div"
 }
+export declare enum AddRemarkType {
+    Cover = 1,//覆盖
+    NoCover = 0
+}
 //# sourceMappingURL=BoardInterface.d.ts.map

types/DatabaseServices/Entity/BoardInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardInterface.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/BoardInterface.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IAEjB,KAAK,IAAI,CAAE,IAAI;IACf,QAAQ,IAAI,CAAE,IAAI;IAClB,MAAM,IAAI;CACb;AAGD,oBAAY,SAAS;IAEjB,SAAS;IACT,QAAQ,IAAI;IACZ,SAAS;IACT,OAAO,IAAI;IACX,UAAU;IACV,WAAW,IAAI;CAClB;AAGD,oBAAY,aAAa;IAErB,QAAQ,IAAI,CAAG,IAAI;IACnB,OAAO,IAAI,CAAI,IAAI;IACnB,SAAS,IAAI;CAChB;AAED,oBAAY,YAAY;IAEpB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,EAAE,IAAI;IACN,IAAI,IAAI;IACR,IAAI,IAAI;CACX;AAED,oBAAY,aAAa;IAErB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,GAAG,QAAQ;CACd"}
+{"version":3,"file":"BoardInterface.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/BoardInterface.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IAEjB,KAAK,IAAI,CAAE,IAAI;IACf,QAAQ,IAAI,CAAE,IAAI;IAClB,MAAM,IAAI;CACb;AAGD,oBAAY,SAAS;IAEjB,SAAS;IACT,QAAQ,IAAI;IACZ,SAAS;IACT,OAAO,IAAI;IACX,UAAU;IACV,WAAW,IAAI;CAClB;AAGD,eAAO,MAAM,cAAc;;;;CAI1B,CAAC;AAGF,oBAAY,aAAa;IAErB,QAAQ,IAAI,CAAG,IAAI;IACnB,OAAO,IAAI,CAAI,IAAI;IACnB,SAAS,IAAI;CAChB;AAED,oBAAY,YAAY;IAEpB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,EAAE,IAAI;IACN,IAAI,IAAI;IACR,MAAM,IAAI,CAAE,aAAa;IACzB,IAAI,IAAI;CACX;AAED,oBAAY,aAAa;IAErB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,GAAG,QAAQ;CACd;AAED,oBAAY,aAAa;IAErB,KAAK,IAAI,CAAC,IAAI;IACd,OAAO,IAAI;CACd"}

types/DatabaseServices/Entity/Circle.d.ts

@@ -9,8 +9,11 @@ import { Arc } from './Arc';
 import { Curve } from './Curve';
 import { DragPointType } from './DragPointType';
 export declare class Circle extends Curve {
+    private _DisplayAccuracy;
     constructor(center?: Vector3, radius?: number);
     private _Radius;
+    get DisplayAccuracy(): number;
+    set DisplayAccuracy(v: number);
     get Shape(): Shape2;
     get Center(): Vector3;
     set Center(v: Vector3);

types/DatabaseServices/Entity/Circle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Circle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Circle.ts"],"names":[],"mappings":"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"}

types/DatabaseServices/Entity/CompositeEntity.d.ts

@@ -1,8 +1,11 @@
-import { Matrix3, Matrix4, Object3D, Vector3 } from "three";
+import { Frustum, Matrix3, Matrix4, Object3D, Vector3 } from "three";
 import { ObjectSnapMode } from "../../Editor/ObjectSnapMode";
 import { Box3Ext } from "../../Geometry/Box";
 import { RenderType } from "../../GraphicsSystem/RenderType";
 import { CADFiler } from "../CADFiler";
+import { LayerTableRecord } from "../LayerTableRecord";
+import { ObjectId } from "../ObjectId";
+import { PhysicalMaterialRecord } from "../PhysicalMaterialRecord";
 import { DragPointType } from "./DragPointType";
 import { Entity } from "./Entity";
 export declare abstract class CompositeEntity extends Entity {
@@ -19,10 +22,20 @@ export declare abstract class CompositeEntity extends Entity {
     Traverse(callback: (arg0: Entity) => void): void;
     protected InitDrawObject(renderType?: RenderType): Object3D;
     UpdateDrawObject(renderType: RenderType, obj: Object3D): void;
+    /** 为了避免_CacheDrawObject中的key错误，这里重写了GetDrawObjectFromRenderType，而不是直接在UpdateDrawObject中修改rtype */
+    GetDrawObjectFromRenderType(renderType?: RenderType): Object3D;
     get ColorIndex(): number;
     set ColorIndex(color: number);
-    get Material(): import("../ObjectId").ObjectId<import("../CADObject").CADObject>;
-    set Material(id: import("../ObjectId").ObjectId<import("../CADObject").CADObject>);
+    get Material(): ObjectId<PhysicalMaterialRecord>;
+    set Material(id: ObjectId<PhysicalMaterialRecord>);
+    get Layer(): ObjectId<LayerTableRecord>;
+    set Layer(id: ObjectId<LayerTableRecord>);
+    SetAllMaterialAtSlot(mtl: ObjectId<PhysicalMaterialRecord>): void;
+    GetMtlLockedStatus(): {
+        partMtlLocked: boolean;
+        allMtlLocked: boolean;
+    };
+    GetPhyMtlRecords(containErased?: boolean): PhysicalMaterialRecord[];
     UpdateDrawObjectMaterial(renderType: RenderType, obj: Object3D): void;
     RestoreJigMaterial(): void;
     /**
@@ -33,7 +46,7 @@ export declare abstract class CompositeEntity extends Entity {
     * @param viewXform const 最近点捕捉需要这个变量
     * @returns object snap points
     */
-    GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3): Vector3[];
+    GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3, frustum?: Frustum): Vector3[];
     GetGripPoints(): Array<Vector3>;
     MoveGripPoints(indexList: number[], vec: Vector3): void;
     GetStretchPoints(): Array<Vector3>;

types/DatabaseServices/Entity/CompositeEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompositeEntity.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/CompositeEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAK5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,8BACsB,eAAgB,SAAQ,MAAM;;IAOpC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEnC;;MAEE;IACF,IAAa,gBAAgB,IAAI,OAAO,CA6BvC;IAID;;MAEE;IACO,OAAO;IAShB,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;IAsBzC,SAAS,CAAC,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAajF,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAwBtD,IAAI,UAAU,IAAI,MAAM,CAGvB;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAgB3B;IACD,IAAI,QAAQ,qEAGX;IACD,IAAI,QAAQ,CAAC,EAAE,kEAAA,EAQd;IAED,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAK9D,kBAAkB;IASlB;;;;;;;MAOE;IACF,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IAQZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAK/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO;IAMhD,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC;IAKlC;;;;;;OAMG;IACH,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAMxD,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IASjC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa;IA4ClF,eAAe,CAAC,IAAI,EAAE,IAAI;IAkB1B,iBAAiB,CAAC,CAAC,EAAE,OAAO;IAS5B,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAclC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAS3B"}
+{"version":3,"file":"CompositeEntity.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/CompositeEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAMrE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,8BACsB,eAAgB,SAAQ,MAAM;;IAOpC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEnC;;MAEE;IACF,IAAa,gBAAgB,IAAI,OAAO,CA6BvC;IAID;;MAEE;IACO,OAAO;IAYhB,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;IAsBzC,SAAS,CAAC,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAajF,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAyBtD,kGAAkG;IACzF,2BAA2B,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAkB7F,IAAI,UAAU,IAAI,MAAM,CAGvB;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAgB3B;IACD,IAAI,QAAQ,qCAGX;IACD,IAAI,QAAQ,CAAC,EAAE,kCAAA,EAQd;IAED,IAAI,KAAK,IAAI,QAAQ,CAAC,gBAAgB,CAAC,CAGtC;IAED,IAAI,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAQvC;IAED,oBAAoB,CAAC,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAe1D,kBAAkB;;;;IAwBlB,gBAAgB,CAAC,aAAa,GAAE,OAAe;IAgB/C,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAe9D,kBAAkB;IASlB;;;;;;;MAOE;IACF,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,EACnB,OAAO,CAAC,EAAE,OAAO,GAClB,OAAO,EAAE;IAQZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAK/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO;IAMhD,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC;IAKlC;;;;;;OAMG;IACH,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAMxD,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IASjC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa;IA8ClF,eAAe,CAAC,IAAI,EAAE,IAAI;IAkB1B,iBAAiB,CAAC,CAAC,EAAE,OAAO;IAS5B,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAmBlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAY3B"}

types/DatabaseServices/Entity/Curve.d.ts

@@ -2,6 +2,7 @@ import { Material, Object3D, Curve as TCurve, Vector3 } from 'three';
 import { Status } from '../../Common/Status';
 import { IntersectOption, IntersectResult } from '../../GraphicsSystem/IntersectWith';
 import { RenderType } from '../../GraphicsSystem/RenderType';
+import { CADFiler } from '../CADFiler';
 import { DragPointType } from './DragPointType';
 import { Entity } from './Entity';
 export declare enum ExtendType {
@@ -27,6 +28,12 @@ export declare enum ExtendType {
  */
 export declare abstract class Curve extends Entity {
     constructor();
+    protected _RoomName: string;
+    protected _CabinetName: string;
+    get RoomName(): string;
+    set RoomName(value: string);
+    get CabinetName(): string;
+    set CabinetName(value: string);
     get Is2D(): boolean;
     get StartPoint(): Vector3;
     set StartPoint(v: Vector3);
@@ -81,6 +88,11 @@ export declare abstract class Curve extends Entity {
     PtOnCurve2(pt: Vector3): boolean;
     PtOnCurve3(p: Vector3, fuzz?: number): boolean;
     ParamOnCurve(param: number, fuzz?: number): boolean;
+    /**
+     * 偏移曲线
+     * @param offsetDist 左边负数 右边正数
+     * @returns 返回偏移后的曲线 可能返回多条曲线
+     */
     GetOffsetCurves(offsetDist: number): Array<Curve>;
     GetClosestPointTo(pt: Vector3, extend: boolean): Vector3;
     /**
@@ -112,6 +124,8 @@ export declare abstract class Curve extends Entity {
      */
     UpdateDrawObjectMaterial(type: RenderType, obj: Object3D, material?: Material): void;
     UpdateJigMaterial(color?: number): void;
+    protected ReadRoomAndCabinetName(file: CADFiler): void;
+    protected WriteRoomAndCabinetName(file: CADFiler): void;
 }
 export declare const DbCurve: typeof Curve;
 //# sourceMappingURL=Curve.d.ts.map

types/DatabaseServices/Entity/Curve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Curve.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Curve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Curve.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Curve.ts"],"names":[],"mappings":"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"}

types/DatabaseServices/Entity/DragPointType.d.ts

@@ -1,5 +1,6 @@
 export declare enum DragPointType {
     Grip = 0,
-    Stretch = 1
+    Stretch = 1,
+    End = 2
 }
 //# sourceMappingURL=DragPointType.d.ts.map

types/DatabaseServices/Entity/DragPointType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DragPointType.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/DragPointType.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IAErB,IAAI,IAAI;IACR,OAAO,IAAI;CACd"}
+{"version":3,"file":"DragPointType.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/DragPointType.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IAErB,IAAI,IAAI;IACR,OAAO,IAAI;IACX,GAAG,IAAI;CACV"}

types/DatabaseServices/Entity/Ellipse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Ellipse.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Ellipse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGpE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,OAAO,EAA6E,eAAe,EAAqD,MAAM,oCAAoC,CAAC;AAEnM,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBACa,OAAQ,SAAQ,KAAK;IAE9B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,SAAS,CAAe;gBAE5B,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,GAAE,MAAa,EACnB,IAAI,GAAE,MAAa,EACnB,KAAK,GAAE,MAAU;IAQrB,IAAI,UAAU,IAAI,MAAM,CAGvB;IACD,IAAI,QAAQ,IAAI,MAAM,CAGrB;IACD,IAAI,UAAU,YAGb;IACD,IAAI,QAAQ,YAGX;IACD,IAAI,KAAK,IAAI,KAAK,CAKjB;IACD,IAAI,OAAO,IAAI,OAAO,CAGrB;IACD,IAAI,MAAM,IAII,OAAO,CADpB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,EAKpB;IACD,IAAI,IAAI,IAII,MAAM,CADjB;IACD,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAKjB;IACD,IAAI,IAAI,IAII,MAAM,CADjB;IACD,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAKjB;IACD,IAAI,QAAQ,IAII,MAAM,CADrB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAKrB;IACD,IAAI,UAAU,IAQI,MAAM,CALvB;IACD,IAAI,QAAQ,IAUI,MAAM,CAPrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,MAAM,EAKvB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAKrB;IACD,IAAI,MAAM,WAKT;IACD,IAAI,IAAI,WAiBP;IAED,IAAI,UAAU,WAMb;IAED,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAS5C,MAAM,CAAC,QAAQ,EAAE,MAAM;IAUvB,SAAS,CAAC,EAAE,EAAE,OAAO;IAMrB,SAAS,CAAC,EAAE,EAAE,OAAO;IAKrB,WAAW,CAAC,EAAE,EAAE,OAAO;IAMvB,eAAe,CAAC,KAAK,EAAE,MAAM;IAW7B,eAAe,CAAC,EAAE,CAAC,EAAE,OAAO;IAyB5B,kBAAkB,CAAC,QAAQ,EAAE,MAAM;IAKnC,cAAc,CAAC,KAAK,EAAE,MAAM;IAI5B,cAAc,CAAC,EAAE,EAAE,OAAO;IAM1B,cAAc,CAAC,CAAC,EAAE,MAAM;IAKxB,eAAe,CAAC,KAAK,EAAE,MAAM;IAK7B,qBAAqB,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM;IAa1C,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IA8BlC,iBAAiB,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO;IA+CvD,eAAe,CAAC,UAAU,EAAE,MAAM;IAWlC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAqCvC,IAAI,CAAC,EAAE,EAAE,OAAO;IAwBhB,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IAkCZ,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe;IAuBrD,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC;IAIlC,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAoB/B,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAIxD,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAoCrD,gBAAgB,CAAC,KAAK,SAAI;IA0B1B,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAYlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAW3B"}
+{"version":3,"file":"Ellipse.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Ellipse.ts"],"names":[],"mappings":"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"}

types/DatabaseServices/Entity/Entity.d.ts

@@ -8,11 +8,14 @@ import { RenderType } from '../../GraphicsSystem/RenderType';
 import { CADFiler } from '../CADFiler';
 import { CADObject } from '../CADObject';
 import { ISerialize } from '../ISerialize';
+import { LayerTableRecord } from '../LayerTableRecord';
 import { ObjectId } from '../ObjectId';
+import { PhysicalMaterialRecord } from '../PhysicalMaterialRecord';
 /**
  * Entity 是所有图元的基类,绘制的实体都集成该类.
  */
 export declare class Entity extends CADObject {
+    ParentEntity: Entity;
     IsEmbedEntity: boolean;
     /**
      * 该实体的只有一个渲染类型,任何渲染类型都一个样
@@ -22,8 +25,9 @@ export declare class Entity extends CADObject {
     protected HasPlaceFaceRenderType: boolean;
     protected HasBigHoleFaceRenderType: boolean;
     protected _CacheDrawObject: Map<RenderType, Object3D>;
-    protected _MaterialId: ObjectId;
+    protected _MaterialId: ObjectId<PhysicalMaterialRecord>;
     protected _Color: number;
+    protected _Layer: ObjectId<LayerTableRecord>;
     protected _Matrix: Matrix4;
     constructor();
     protected _SpaceOCS: Matrix4;
@@ -39,6 +43,9 @@ export declare class Entity extends CADObject {
     set Freeze(f: boolean);
     get VisibleInRender(): boolean;
     set VisibleInRender(v: boolean);
+    protected _LockMaterial: boolean;
+    get LockMaterial(): boolean;
+    set LockMaterial(f: boolean);
     GroupId: ObjectId;
     Template: ObjectId;
     ProcessingGroupList: ObjectId[];
@@ -49,12 +56,29 @@ export declare class Entity extends CADObject {
     NeedUpdateFlag: UpdateDraw;
     AutoUpdate: boolean;
     CopyInRenderTpye: RenderType;
-    set Material(materialId: ObjectId);
-    get Material(): ObjectId;
+    set Material(materialId: ObjectId<PhysicalMaterialRecord>);
+    get Material(): ObjectId<PhysicalMaterialRecord>;
     GetMaterialSlots(): void;
-    SetMaterialAtSlot(mtl: ObjectId, slotIndex: number): void;
+    IsMtlLockAtSlot(slotIndex?: number): boolean;
+    SetMaterialAtSlot(mtl: ObjectId<PhysicalMaterialRecord>, slotIndex?: number): void;
+    GetMtlLockedStatus(): {
+        allMtlLocked: boolean;
+        partMtlLocked: boolean;
+    };
+    /**
+     * 获取实体的 PhysicalMaterialRecord
+     * @param {boolean} [containErased=false] 是否包含被删除的材质
+     * @return {*}  {PhysicalMaterialRecord[]}
+     * @memberof Entity
+     */
+    GetPhyMtlRecords(containErased?: boolean): PhysicalMaterialRecord[];
+    get HasLayer(): boolean;
+    get Layer(): ObjectId<LayerTableRecord>;
+    set Layer(id: ObjectId<LayerTableRecord>);
+    SetAllMaterialAtSlot(mtl: ObjectId<PhysicalMaterialRecord>): void;
     set ColorIndex(color: number);
     get ColorIndex(): number;
+    get DrawColorIndex(): number;
     /**
      * 炸开实体
      */

types/DatabaseServices/Entity/EntityFbx.d.ts

@@ -1,7 +1,5 @@
-import { Group, Matrix3, Matrix4, Object3D, Vector3 } from "three";
-import { ObjectSnapMode } from "../../Editor/ObjectSnapMode";
+import { Group, Matrix4, Vector3 } from "three";
 import { Box3Ext } from "../../Geometry/Box";
-import { RenderType } from "../../GraphicsSystem/RenderType";
 import { CADFiler } from "../CADFiler";
 import { ObjectId } from "../ObjectId";
 import { PhysicalMaterialRecord } from "../PhysicalMaterialRecord";
@@ -27,15 +25,20 @@ export declare class EntityFbx extends Entity {
     get BoundingBox(): Box3Ext;
     get BoundingBoxInOCS(): Box3Ext;
     get OverWriteMaterial(): Map<number, ObjectId<PhysicalMaterialRecord>>;
+    IsMtlLockAtSlot(slotIndex: number): boolean;
     SetMaterialAtSlot(mtl: ObjectId<PhysicalMaterialRecord>, slotIndex: number): void;
+    SetAllMaterialAtSlot(mtl: ObjectId<PhysicalMaterialRecord>): void;
+    GetMtlLockedStatus(): {
+        allMtlLocked: boolean;
+        partMtlLocked: boolean;
+    };
+    private _GetValidOWMtlRecord;
+    GetPhyMtlRecords(containErased?: boolean): PhysicalMaterialRecord[];
     newObject: Group;
-    LoadFBXModelFromArrayBuffer(fbxArray: ArrayBuffer): string;
+    LoadFBXModelFromArrayBuffer(fbxArray: ArrayBuffer): string | undefined;
     CloneDrawObject(from: this): void;
     ApplyScaleMatrix(m: Matrix4): this;
-    InitDrawObject(renderType?: RenderType): Object3D;
-    UpdateDrawObject(type: RenderType, obj: Object3D): void;
-    UpdateDrawObjectMaterial(renderType: RenderType, obj: Object3D): void;
-    GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform: Matrix3): Vector3[];
+    private _GetValidOWMtl;
     MoveGripPoints(indexList: Array<number>, vec: Vector3): void;
     protected _ReadFile(file: CADFiler): void;
     WriteFile(file: CADFiler): void;

types/DatabaseServices/Entity/EntityFbx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityFbx.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/EntityFbx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,EAAE,OAAO,EAAE,OAAO,EAA2B,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AASlG,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC;;GAEG;AACH,qBACa,SAAU,SAAQ,MAAM;IAUrB,OAAO,CAAC,IAAI,CAAC;IARzB,cAAc,UAAQ;IAEtB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,OAAO,CAAe;IAE9B,OAAO,CAAC,kBAAkB,CAAuD;gBAE7D,IAAI,CAAC,EAAE,MAAM;IAKjC,IAAa,SAAS,YAGrB;IAED,IAAI,GAAG,IACM,MAAM,CADY;IAC/B,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,EAOlB;IAED,IAAI,OAAO,YAA6E;IAExF,IAAI,SAAS,IACO,OAAO,CADgB;IAC3C,IAAI,SAAS,CAAC,IAAI,EAAE,OAAO,EAW1B;IAED,IAAI,KAAK,YAKR;IAED,IAAI,WAAW,YAGd;IAED,IAAI,gBAAgB,YAenB;IACD,IAAI,iBAAiB,kDAGpB;IAED,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,EAAE,MAAM;IAS1E,SAAS,EAAE,KAAK,CAAC;IAGjB,2BAA2B,CAAC,QAAQ,EAAE,WAAW;IAgBjD,eAAe,CAAC,IAAI,EAAE,IAAI;IAyB1B,gBAAgB,CAAC,CAAC,EAAE,OAAO;IA6B3B,cAAc,CAAC,UAAU,GAAE,UAAiC;IA4J5D,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAchD,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAyC9D,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,GACnB,OAAO,EAAE;IAsCZ,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAYrD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAmClC,SAAS,CAAC,IAAI,EAAE,QAAQ;CA4B3B"}
+{"version":3,"file":"EntityFbx.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/EntityFbx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAA8B,OAAO,EAAE,MAAM,OAAO,CAAC;AAG5E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;GAEG;AACH,qBACa,SAAU,SAAQ,MAAM;IAUrB,OAAO,CAAC,IAAI,CAAC;IARzB,cAAc,UAAQ;IAEtB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,OAAO,CAAe;IAE9B,OAAO,CAAC,kBAAkB,CAAuD;gBAE7D,IAAI,CAAC,EAAE,MAAM;IAKjC,IAAa,SAAS,YAGrB;IAED,IAAI,GAAG,IACM,MAAM,CADY;IAC/B,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,EAOlB;IAED,IAAI,OAAO,YAA6E;IAExF,IAAI,SAAS,IACO,OAAO,CADgB;IAC3C,IAAI,SAAS,CAAC,IAAI,EAAE,OAAO,EAW1B;IAED,IAAI,KAAK,YAKR;IAED,IAAI,WAAW,YAGd;IAED,IAAI,gBAAgB,YAenB;IACD,IAAI,iBAAiB,kDAGpB;IAED,eAAe,CAAC,SAAS,EAAE,MAAM;IAWjC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,EAAE,MAAM;IAa1E,oBAAoB,CAAC,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAqC1D,kBAAkB;;;;IAuClB,OAAO,CAAC,oBAAoB;IAW5B,gBAAgB,CAAC,aAAa,GAAE,OAAe;IAkC/C,SAAS,EAAE,KAAK,CAAC;IAGjB,2BAA2B,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS;IAKtE,eAAe,CAAC,IAAI,EAAE,IAAI;IAI1B,gBAAgB,CAAC,CAAC,EAAE,OAAO;IA6B3B,OAAO,CAAC,cAAc;IAUtB,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAYrD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAwClC,SAAS,CAAC,IAAI,EAAE,QAAQ;CA+B3B"}

types/DatabaseServices/Entity/EntityRef.d.ts

@@ -28,7 +28,15 @@ export declare class EntityRef extends Entity {
     CloneDrawObject(from: this): void;
     ApplyScaleMatrix(m: Matrix4): this;
     get OverWriteMaterial(): Map<number, ObjectId<PhysicalMaterialRecord>>;
+    IsMtlLockAtSlot(slotIndex: number): boolean;
     SetMaterialAtSlot(mtl: ObjectId<PhysicalMaterialRecord>, slotIndex: number): void;
+    SetAllMaterialAtSlot(mtl: ObjectId<PhysicalMaterialRecord>): void;
+    GetMtlLockedStatus(): {
+        partMtlLocked: boolean;
+        allMtlLocked: boolean;
+    };
+    private _GetValidOWMtlRecord;
+    GetPhyMtlRecords(containErased?: boolean): PhysicalMaterialRecord[];
     GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform: Matrix3): Vector3[];
     GetGripPoints(): Array<Vector3>;
     MoveGripPoints(indexList: Array<number>, vec: Vector3): void;

types/DatabaseServices/Entity/EntityRef.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityRef.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/EntityRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,OAAO,EAAQ,OAAO,EAAE,MAAM,OAAO,CAAC;AAI9D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC;;GAEG;AACH,qBACa,SAAU,SAAQ,MAAM;IAWrB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IATnC,cAAc,UAAQ;IAEtB,SAAS,CAAC,KAAK,UAAe;IAC9B,SAAS,CAAC,UAAU,UAAe;IACnC,SAAS,CAAC,OAAO,UAAe;IAEhC,SAAS,CAAC,kBAAkB,gDAAuD;gBAG7D,IAAI,CAAC,EAAE,MAAM;IAKnC,IAAa,SAAS,YAGrB;IAED,IAAI,GAAG,IACM,MAAM,CADY;IAC/B,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,EAOlB;IAED,IAAI,OAAO,YAA6E;IAExF,IAAI,SAAS,IACO,OAAO,CADgB;IAC3C,IAAI,SAAS,CAAC,IAAI,EAAE,OAAO,EAW1B;IAED,IAAI,KAAK,YAKR;IAED,IAAI,WAAW,YAGd;IAED,IAAI,gBAAgB,YAenB;IAED,eAAe,CAAC,IAAI,EAAE,IAAI;IA2C1B,gBAAgB,CAAC,CAAC,EAAE,OAAO;IA6B3B,IAAI,iBAAiB,kDAGpB;IAED,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,EAAE,MAAM;IAY1E,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,GACnB,OAAO,EAAE;IAsCZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IA0B/B,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAarD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAmClC,SAAS,CAAC,IAAI,EAAE,QAAQ;CA4B3B"}
+{"version":3,"file":"EntityRef.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/EntityRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,OAAO,EAAQ,OAAO,EAAE,MAAM,OAAO,CAAC;AAI9D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC;;GAEG;AACH,qBACa,SAAU,SAAQ,MAAM;IAWrB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IATnC,cAAc,UAAQ;IAEtB,SAAS,CAAC,KAAK,UAAe;IAC9B,SAAS,CAAC,UAAU,UAAe;IACnC,SAAS,CAAC,OAAO,UAAe;IAEhC,SAAS,CAAC,kBAAkB,gDAAuD;gBAG7D,IAAI,CAAC,EAAE,MAAM;IAKnC,IAAa,SAAS,YAGrB;IAED,IAAI,GAAG,IACM,MAAM,CADY;IAC/B,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,EAOlB;IAED,IAAI,OAAO,YAA6E;IAExF,IAAI,SAAS,IACO,OAAO,CADgB;IAC3C,IAAI,SAAS,CAAC,IAAI,EAAE,OAAO,EAW1B;IAED,IAAI,KAAK,YAKR;IAED,IAAI,WAAW,YAGd;IAED,IAAI,gBAAgB,YAenB;IAED,eAAe,CAAC,IAAI,EAAE,IAAI;IA2C1B,gBAAgB,CAAC,CAAC,EAAE,OAAO;IA6B3B,IAAI,iBAAiB,kDAGpB;IAED,eAAe,CAAC,SAAS,EAAE,MAAM;IAWjC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,EAAE,MAAM;IAa1E,oBAAoB,CAAC,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAqC1D,kBAAkB;;;;IAuClB,OAAO,CAAC,oBAAoB;IAS5B,gBAAgB,CAAC,aAAa,GAAE,OAAe;IAgC/C,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,GACnB,OAAO,EAAE;IAsCZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IA0B/B,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAarD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAwClC,SAAS,CAAC,IAAI,EAAE,QAAQ;CA+B3B"}

types/DatabaseServices/Entity/Extrude.d.ts

@@ -8,6 +8,7 @@ import { OBB } from "../../Geometry/OBB/obb";
 import { RenderType } from "../../GraphicsSystem/RenderType";
 import { CADFiler } from "../CADFiler";
 import { ObjectId } from "../ObjectId";
+import { PhysicalMaterialRecord } from "../PhysicalMaterialRecord";
 import { Shape } from "../Shape";
 import { Circle } from "./Circle";
 import { DragPointType } from "./DragPointType";
@@ -18,6 +19,7 @@ export type ExtrudeContourCurve = Polyline | Circle;
 export type ExtrudeContour = Polyline | Circle | ExtrudeSolid | Region;
 export declare const MaxDrawGrooveCount = 1000;
 export declare class ExtrudeSolid extends Entity {
+    private _DisplayAccuracy;
     protected height: number;
     protected width: number;
     /**
@@ -53,8 +55,10 @@ export declare class ExtrudeSolid extends Entity {
         Version: number;
     };
     constructor();
-    set Material(materialId: ObjectId);
-    get Material(): ObjectId;
+    set Material(materialId: ObjectId<PhysicalMaterialRecord>);
+    get Material(): ObjectId<PhysicalMaterialRecord>;
+    get DisplayAccuracy(): number;
+    set DisplayAccuracy(v: number);
     get KnifeRadius(): number;
     set KnifeRadius(v: number);
     get BoundingBox(): Box3Ext;
@@ -66,7 +70,6 @@ export declare class ExtrudeSolid extends Entity {
     set GroovesAddWidth(v: number);
     get GroovesAddDepth(): number;
     set GroovesAddDepth(v: number);
-    Clone(): this;
     ApplyMatrix(m: Matrix4): this;
     protected ApplyScaleMatrix(m: Matrix4): this;
     protected ApplyMirrorMatrix(m: Matrix4): this;
@@ -75,6 +78,7 @@ export declare class ExtrudeSolid extends Entity {
     get Thickness(): number;
     set Thickness(thickness: number);
     get Grooves(): ExtrudeSolid[];
+    get SideModelingMap(): Map<any, any>;
     /**
      * 返回未拷贝的轮廓曲线
      */
@@ -125,6 +129,10 @@ export declare class ExtrudeSolid extends Entity {
      * @returns 切割是否成功
      */
     Subtract(extrudes: ExtrudeSolid[], output?: ExtrudeSolid[], checkIntersect?: boolean): boolean;
+    ParseGrooves(knifeExtrudes: ExtrudeSolid[]): {
+        grooves: ExtrudeSolid[];
+        relevanceSideModelMap: Map<number, ExtrudeSolid[]>;
+    };
     RelevanceSubtract(knif: ExtrudeSolid, check?: boolean): void;
     /**
     * 当实体被分裂后,加入新图纸时,需要修复关联拉槽
@@ -135,6 +143,12 @@ export declare class ExtrudeSolid extends Entity {
      *  通常槽已经校验过准确性,所以不在校验
      */
     AppendGrooves(grooves: ExtrudeSolid[], output?: ExtrudeSolid[]): void;
+    /**
+     *  添加侧面槽
+     *  通常槽已经校验过准确性,所以不在校验
+     */
+    AppendRelevanceSideModel(relevanceSideModelMap: Map<number, ExtrudeSolid[]>): void;
+    AppendSideModel(relevanceSideModelMap: Map<number, ExtrudeSolid[]>): void;
     GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3, frustum?: Frustum): Vector3[];
     protected GetStrectchPointCountList(dragType: DragPointType): number[];
     GetGripOrStretchPoints(dragType: DragPointType): Vector3[];
@@ -165,6 +179,10 @@ export declare class ExtrudeSolid extends Entity {
     * @returns this[] 凹槽在本实体中正确的约束状态.(可能分裂成为多个)
     */
     private GrooveCheckContour;
+    /** (步骤4.2.1) 针对圆弧板-修正路径 */
+    AdjustPath(ext: ExtrudeSolid, outline: Polyline | Circle): void;
+    /** (步骤4.2.2) 针对圆弧板-修正位置 */
+    AdjustPosition(ext: ExtrudeSolid, basePoint: Vector3): void;
     /**
      * (步骤4.2)
      * 计算本实体被全身的凹槽差集后正确的实体轮廓,和有可能的分裂实体
@@ -196,17 +214,18 @@ export declare class ExtrudeSolid extends Entity {
     /**
      * 计算关联拉槽,更新绘制对象(MeshGeometry和EdgeGeometry)
      */
-    private CalcRelevanceGroove;
+    protected CalcRelevanceGroove(): void;
     /**
      * 如果实体被切割,那么将返回分裂的实体数组,否则返回自身
      */
     get SplitExtrudes(): this[];
     protected GetRelevanceKnifes(knifs: ExtrudeSolid[]): void;
     ClearRelevance(en?: ExtrudeSolid): void;
-    private _MeshGeometry;
+    protected _MeshGeometry: BufferGeometry;
     get MeshGeometry(): BufferGeometry;
     UpdateMeshGeom(geo: BufferGeometry | Geometry): BufferGeometry;
     protected get Has2DPath(): boolean;
+    protected get HasSideModel(): boolean;
     protected _EdgeGeometry: EdgesGeometry | BufferGeometry;
     get EdgeGeometry(): BufferGeometry;
     UpdateUV(geo: Geometry, ocs: Matrix4, isRev?: boolean): void;
@@ -216,7 +235,9 @@ export declare class ExtrudeSolid extends Entity {
     ClearDraw(): this;
     UpdateDrawObject(renderType: RenderType, obj: Object3D): Object3D;
     UpdateDrawObjectMaterial(renderType: RenderType, obj: Object3D): void;
+    private GetConceptualMaterial;
     private GetModelGroove;
+    private GetSideModelGroove;
     UpdateJigMaterial(color?: number): void;
     /**
      * 简化的文件读取和写入,只写入必要的数据,没有id,没有其他版本号

types/DatabaseServices/Entity/GenLocalUv.d.ts

@@ -0,0 +1,10 @@
+import { BufferGeometry } from "three";
+export declare class GenLocalUv {
+    private InvMtxMap;
+    private _Z;
+    private _X;
+    private _Y;
+    private GetMtxInv;
+    CalculateUv(geo: BufferGeometry, IsReverse: boolean, scale?: number): void;
+}
+//# sourceMappingURL=GenLocalUv.d.ts.map

types/DatabaseServices/Entity/GenLocalUv.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GenLocalUv.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/GenLocalUv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,cAAc,EAA4C,MAAM,OAAO,CAAC;AAKlG,qBAAa,UAAU;IAEnB,OAAO,CAAC,SAAS,CAA+B;IAEhD,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,EAAE,CAAe;IAEzB,OAAO,CAAC,SAAS;IAsBjB,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,SAAO;CAwBpE"}

types/DatabaseServices/Entity/GenUVForWorld.d.ts

@@ -9,6 +9,6 @@ export declare class GenUVForWorld {
     private _Box2;
     GetMtxInv(normalX: number, normalY: number, normalZ: number): Matrix4;
     GenUV(mesh: Mesh<BufferGeometry, Material[]>): void;
-    GenGeoUV(geo: BufferGeometry, mtl: Material, scale?: number): void;
+    GenGeoUV(bGeo: BufferGeometry, mtl: Material, scale?: number): void;
 }
 //# sourceMappingURL=GenUVForWorld.d.ts.map

types/DatabaseServices/Entity/GenUVForWorld.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GenUVForWorld.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/GenUVForWorld.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAMhG,wBAAgB,UAAU,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAsBtD;AAED,qBAAa,aAAa;IAEtB,SAAS,wBAA+B;IAExC,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,IAAI,CAAY;IACxB,OAAO,CAAC,KAAK,CAAY;IACzB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAiB3D,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,CAAC;IAqD5C,QAAQ,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,SAAO;CA+B5D"}
+{"version":3,"file":"GenUVForWorld.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/GenUVForWorld.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAMhG,wBAAgB,UAAU,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAsBtD;AAED,qBAAa,aAAa;IAEtB,SAAS,wBAA+B;IAExC,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,IAAI,CAAY;IACxB,OAAO,CAAC,KAAK,CAAY;IACzB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAiB3D,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,CAAC;IAqD5C,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,SAAO;CA+B7D"}

types/DatabaseServices/Entity/Image.d.ts

@@ -0,0 +1,54 @@
+import { BufferGeometry, Matrix3, Matrix4, Object3D, Vector3 } from "three";
+import { UpdateDraw } from "../../Common/Status";
+import { ObjectSnapMode } from "../../Editor/ObjectSnapMode";
+import { RenderType } from "../../GraphicsSystem/RenderType";
+import { CADFiler } from "../CADFiler";
+import { CADObject } from "../CADObject";
+import { Entity } from "./Entity";
+import { Polyline } from "./Polyline";
+export declare class Image extends Entity {
+    protected OnlyRenderType: boolean;
+    private _ImageUrl;
+    private _ImageSizeX;
+    private _ImageSizeY;
+    private _ImageScaleX;
+    private _ImageScaleY;
+    private _ImageClipPoly;
+    private _FaceSize;
+    private texture;
+    constructor(imageSizeX?: number, imageSizeY?: number);
+    get ImageUrl(): string;
+    set ImageUrl(url: string);
+    get ImageSizeX(): number;
+    get ImageSizeY(): number;
+    get ImageScaleX(): number;
+    set ImageScaleX(v: number);
+    get ImageScaleY(): number;
+    set ImageScaleY(v: number);
+    get ImageClipPoly(): Polyline;
+    /**
+     * 请注意 v不需要OCS 请调用MatrixIdentity清除
+     */
+    set ImageClipPoly(v: Polyline);
+    ApplyScaleMatrix(m: Matrix4): this;
+    Update(mode?: UpdateDraw): Promise<void>;
+    UpdateTexture(url?: string): Promise<void>;
+    GetPolyline(): Polyline;
+    GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3): Vector3[];
+    GetGripPoints(): Array<Vector3>;
+    MoveGripPoints(indexList: number[], vec: Vector3): void;
+    GetStretchPoints(): Vector3[];
+    MoveStretchPoints(indexList: Array<number>, vec: Vector3): void;
+    private _MeshGeometry;
+    get MeshGeometry(): BufferGeometry;
+    private _EdgeGeometry;
+    private get EdgeGeometry();
+    private UpdateGeometry;
+    UpdateDrawGeometry(): void;
+    InitDrawObject(renderType?: RenderType): Object3D;
+    UpdateDrawObject(renderType: RenderType, obj: Object3D): Object3D;
+    protected _ReadFile(file: CADFiler): void;
+    WriteFile(file: CADFiler): void;
+    ApplyPartialUndo(undoData: CADObject): void;
+}
+//# sourceMappingURL=Image.d.ts.map

types/DatabaseServices/Entity/Image.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAa,OAAO,EAAE,OAAO,EAA2B,QAAQ,EAA8D,OAAO,EAAE,MAAM,OAAO,CAAC;AAE5K,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBACa,KAAM,SAAQ,MAAM;IAE7B,SAAS,CAAC,cAAc,UAAQ;IAEhC,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,WAAW,CAAa;IAEhC,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,YAAY,CAAa;IAEjC,OAAO,CAAC,cAAc,CAAW;IAEjC,OAAO,CAAC,SAAS,CAAmB;IAEpC,OAAO,CAAC,OAAO,CAA0B;gBAE7B,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAOpD,IAAI,QAAQ,IAAI,MAAM,CAA2B;IAEjD,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAQvB;IAED,IAAI,UAAU,IAAI,MAAM,CAA6B;IAErD,IAAI,UAAU,IAAI,MAAM,CAA6B;IAGrD,IAAI,WAAW,IAAI,MAAM,CAA8B;IAEvD,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,EAQxB;IAED,IAAI,WAAW,IAAI,MAAM,CAA8B;IAEvD,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,EAQxB;IAED,IAAI,aAAa,IAAI,QAAQ,CAAgC;IAE7D;;OAEG;IACH,IAAI,aAAa,CAAC,CAAC,EAAE,QAAQ,EAgB5B;IAED,gBAAgB,CAAC,CAAC,EAAE,OAAO;IA2BrB,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU;IAMxB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM;IAShC,WAAW;IAMX,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IAKZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAK/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO;IA4DhD,gBAAgB;IAKhB,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IA6BxD,OAAO,CAAC,aAAa,CAAiB;IACtC,IAAI,YAAY,IAAI,cAAc,CAMjC;IAED,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,KAAK,YAAY,GAMvB;IAED,OAAO,CAAC,cAAc;IA8BtB,kBAAkB;IAclB,cAAc,CAAC,UAAU,GAAE,UAAiC;IAS5D,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;cAYnC,SAAS,CAAC,IAAI,EAAE,QAAQ;IA8BlC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAyBxB,gBAAgB,CAAC,QAAQ,EAAE,SAAS;CAKhD"}

types/DatabaseServices/Entity/Line.d.ts

@@ -66,6 +66,8 @@ export declare class Line extends Curve {
     WriteFile(file: CADFiler): void;
     set StartPoint(p: Vector3);
     get StartPoint(): Vector3;
+    get StartPointInOcs(): Vector3;
+    get EndPointInOcs(): Vector3;
     get EndPoint(): Vector3;
     set EndPoint(p: Vector3);
     SetStartEndPoint(s: Vector3, e: Vector3): void;

types/DatabaseServices/Entity/Line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Line.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Line.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Line.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Line.ts"],"names":[],"mappings":"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"}

types/DatabaseServices/Entity/Polyline.d.ts

@@ -17,6 +17,7 @@ export interface PolylineProps {
 export declare const BUL_IS_LINE_FUZZ = 0.00001;
 export declare class Polyline extends Curve {
     private _LineData;
+    private _DisplayAccuracy;
     private _ClosedMark;
     constructor(_LineData?: PolylineProps[]);
     UpdateOCSTo(m: Matrix4): void;
@@ -25,6 +26,8 @@ export declare class Polyline extends Curve {
      */
     Flip(): this;
     Reverse(): this;
+    get DisplayAccuracy(): number;
+    set DisplayAccuracy(v: number);
     set LineData(data: PolylineProps[]);
     get LineData(): PolylineProps[];
     get NumberOfVertices(): number;
@@ -102,9 +105,15 @@ export declare class Polyline extends Curve {
      * @returns {number}
      * @memberof Polyline
      */
-    GetParamAtPoint(pt: Vector3): number;
+    GetParamAtPoint(pt: Vector3, fuzz?: number): number;
     GetParamAtDist(dist: number): number;
     GetDistAtPoint(pt: Vector3): number;
+    /**
+     * 这个方法允许点在曲线的延伸线上
+     * @param pt 需要保证传入的点路径上
+     * @returns
+     */
+    GetDistAtPoint2(pt: Vector3): number;
     /**
      * 返回曲线的一阶导数.
      * 当曲线闭合(标志)且点不在曲线上.
@@ -122,6 +131,10 @@ export declare class Polyline extends Curve {
         pts: Vector2[];
         buls: number[];
     };
+    /**
+     * 将多段线的OCS清除(请保证这个实体是在WCSZ0坐标系下,否则结果不正确!)
+     */
+    MatrixIdentity(): void;
     Join(cu: Curve, allowGap?: boolean, tolerance?: number): Status.False | Status.True;
     /**
      * 将曲线数组组合成多段线

types/DatabaseServices/Entity/Polyline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Polyline.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Polyline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Polyline.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Polyline.ts"],"names":[],"mappings":"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"}

types/DatabaseServices/Entity/Region.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Region.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Region.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAgB,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAQ,QAAQ,EAA0B,OAAO,EAAE,MAAM,OAAO,CAAC;AAIxI,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBACa,MAAO,SAAQ,MAAM;IAelB,OAAO,CAAC,aAAa;IAbjC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,MAAM,GAAG,SAAS;gBAanD,aAAa,GAAE,YAAiC;IAMpE,IAAI,YAAY,iBAGf;IACD,IAAI,IAAI,WAGP;IACD,IAAI,WAAW,SAMd;IACD,OAAO;IAoBP;;;;;OAKG;IACH,gBAAgB,CAAC,CAAC,EAAE,OAAO;IAK3B,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IAyBZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAO/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO;IAMpD,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAQ7B,IAAI,QAAQ,IAIK,OAAO,CADvB;IACD,IAAI,QAAQ,CAAC,EAAE,EAAE,OAAO,EAgBvB;IAED,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAW5C,EAAE;IAQF,iBAAiB;IAQjB,SAAS,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO;IAItC;;;;OAIG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO;IAkBtE,OAAO,CAAC,aAAa,CAAiB;IACtC,IAAI,YAAY,IAAI,cAAc,CAMjC;IAED,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,KAAK,YAAY,GAMvB;IAED,OAAO,CAAC,cAAc;IA4CtB,kBAAkB;IAUlB,SAAS,IAAI,IAAI;IAMjB,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAoCvE,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAyCtD;;MAEE;IACF,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,QAAQ;IA8B7E,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAOlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAM3B"}
+{"version":3,"file":"Region.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Region.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAgB,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAQ,QAAQ,EAA0B,OAAO,EAAE,MAAM,OAAO,CAAC;AAIxI,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBACa,MAAO,SAAQ,MAAM;IAelB,OAAO,CAAC,aAAa;IAbjC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,MAAM,GAAG,SAAS;gBAanD,aAAa,GAAE,YAAiC;IAMpE,IAAI,YAAY,iBAGf;IACD,IAAI,IAAI,WAGP;IACD,IAAI,WAAW,SAMd;IACD,OAAO;IAoBP;;;;;OAKG;IACH,gBAAgB,CAAC,CAAC,EAAE,OAAO;IAK3B,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IAyBZ,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAO/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO;IAMpD,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAQ7B,IAAI,QAAQ,IAIK,OAAO,CADvB;IACD,IAAI,QAAQ,CAAC,EAAE,EAAE,OAAO,EAgBvB;IAED,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAW5C,EAAE;IAQF,iBAAiB;IAQjB,SAAS,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO;IAItC;;;;OAIG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO;IAkBtE,OAAO,CAAC,aAAa,CAAiB;IACtC,IAAI,YAAY,IAAI,cAAc,CAMjC;IAED,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,KAAK,YAAY,GAMvB;IAED,OAAO,CAAC,cAAc;IA4CtB,kBAAkB;IAUlB,SAAS,IAAI,IAAI;IAMjB,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAoCvE,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAyCtD;;MAEE;IACF,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,QAAQ;IA8B7E,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAWlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAS3B"}