更新包

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

@@ -9,13 +9,17 @@ import { Box3Ext } from '../../Geometry/Box';
 import { RenderType } from '../../GraphicsSystem/RenderType';
 import { BoardProcessOption } from "../../UI/Store/OptionInterface/BoardProcessOption";
 import { CADFiler } from '../CADFiler';
+import { CADObject } from '../CADObject';
 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 declare function IsBigHole(ent: CADObject): boolean;
 export interface IModeling {
     shape: Shape;
     thickness: number;
@@ -85,6 +89,7 @@ export declare class Board extends ExtrudeSolid {
     _SweepArcBoardBuild: ArcBoardBuild;
     private _ArcBoardOptions;
     private _isDrawArcGroove;
+    arcBoardFeedProcess: ArcBoardFeedProcess;
     protected bevelEnabled: boolean;
     private _KnifePolylineMap;
     private _jigSweepPath;
@@ -124,6 +129,7 @@ export declare class Board extends ExtrudeSolid {
     set SweepAngle(v: number);
     AdjustPath(br: Board, outline: Polyline | Circle): void;
     AdjustPosition(br: Board, basePoint: Vector3): void;
+    AdjustBasePoint(oldBasePoint: Vector3, oldPathWCS: Polyline): void;
     /**
      * 创建一个代理数组,数组改变时被监听
      */
@@ -131,7 +137,7 @@ export declare class Board extends ExtrudeSolid {
     private InitBoardData;
     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>, ObjectIdArr[]>;
+    get DrillList(): Map<ObjectId<CADObject>, ObjectIdArr[]>;
     get DrillLock(): boolean;
     set DrillLock(v: boolean);
     get isDrillAssociationLock(): boolean;
@@ -139,7 +145,7 @@ export declare class Board extends ExtrudeSolid {
     AppendDrillAssociationLock(o: ObjectId): void;
     ClearDrillAssociationLock(o: ObjectId): void;
     ClearAllAssociDrillLock(): void;
-    get LayerNails(): ObjectId<import("../CADObject").CADObject>[];
+    get LayerNails(): ObjectId<CADObject>[];
     AppendNails(ids: ObjectId[]): void;
     ClearLayerNails(): void;
     private _CustomNumberTextEntity;
@@ -162,7 +168,6 @@ export declare class Board extends ExtrudeSolid {
     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[]>;
@@ -241,6 +246,7 @@ export declare class Board extends ExtrudeSolid {
      */
     Get2DPathCsgs(): Geom3[];
     _SideModeingCsgs: Geom3[];
+    _SpiltBoardSideModeingCsgs: Geom3[];
     GetSideModeingCsgs(): Geom3[];
     ClearSideModelingCache(): void;
     get HasSideModel(): boolean;
@@ -254,9 +260,16 @@ export declare class Board extends ExtrudeSolid {
     private _Promise2DPathRes;
     private _2DPathBuildPromise;
     Load2DPathPromise(): Promise<boolean>;
+    private UpdateOriginEntGeom;
     UpdateMeshGeom(geo: Geometry): BufferGeometry;
     HandleSpliteEntitys(splitEntitys: this[]): void;
     private BuildArcGeometry;
+    private _HasBigHole;
+    private _BigHoleFace;
+    /** 该板件是否有大孔 */
+    get HasBigHole(): boolean;
+    /** 更新板件是否有大孔 */
+    UpdateThisHasBigHole(): void;
     InitDrawObject(renderType?: RenderType): Object3D;
     UpdateDrawGeometry(): void;
     UpdateDrawObject(renderType: RenderType, obj: Object3D): Object3D;

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 {

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;AAED,oBAAY,aAAa;IAErB,KAAK,IAAI,CAAC,IAAI;IACd,OAAO,IAAI;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/CompositeEntity.d.ts

@@ -22,6 +22,8 @@ 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(): ObjectId<PhysicalMaterialRecord>;

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,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAKrE,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,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,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"}
+{"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/Entity.d.ts

@@ -3,6 +3,7 @@ import { UpdateDraw } from '../../Common/Status';
 import { ObjectSnapMode } from '../../Editor/ObjectSnapMode';
 import { Box3Ext } from '../../Geometry/Box';
 import { Vec3 } from '../../Geometry/IVec3';
+import { OBB } from '../../Geometry/OBB/obb';
 import { IntersectOption } from '../../GraphicsSystem/IntersectWith';
 import { RenderType } from '../../GraphicsSystem/RenderType';
 import { CADFiler } from '../CADFiler';
@@ -91,6 +92,7 @@ export declare class Entity extends CADObject {
      * 返回对象在自身坐标系下的Box
      */
     get BoundingBoxInOCS(): Box3Ext;
+    get OBB(): OBB;
     GetBoundingBoxInMtx(mtx: Matrix4): Box3Ext;
     get BoundingBoxInSpaceCS(): Box3Ext;
     get OCS(): Matrix4;

types/DatabaseServices/Entity/Extrude.d.ts

@@ -1,5 +1,5 @@
 import { Geom3 } from '@jscad/modeling/src/geometries/geom3';
-import { BoxGeometry, BufferGeometry, Frustum, Geometry, Matrix3, Matrix4, Mesh, Object3D, UVGenerator, Vector3 } from "three";
+import { BoxGeometry, BufferGeometry, Frustum, Geometry, LineBasicMaterial, LineSegments, Matrix3, Matrix4, Mesh, Object3D, UVGenerator, Vector3 } from "three";
 import { Line2 } from "three/examples/jsm/lines/Line2";
 import { Status } from "../../Common/Status";
 import { ObjectSnapMode } from "../../Editor/ObjectSnapMode";
@@ -132,6 +132,7 @@ export declare class ExtrudeSolid extends Entity {
     Subtract(extrudes: ExtrudeSolid[], output?: ExtrudeSolid[], checkIntersect?: boolean): boolean;
     ParseGrooves(knifeExtrudes: ExtrudeSolid[]): {
         grooves: ExtrudeSolid[];
+        needCutSideGrooves: ExtrudeSolid[];
         relevanceSideModelMap: Map<number, ExtrudeSolid[]>;
     };
     RelevanceSubtract(knif: ExtrudeSolid, check?: boolean): void;
@@ -140,15 +141,11 @@ export declare class ExtrudeSolid extends Entity {
     */
     RepairRelevance(): void;
     AppendGroove(groove: ExtrudeSolid): void;
-    /** 添加槽进板件,并且自动分裂.
-     *  通常槽已经校验过准确性,所以不在校验
-     */
-    AppendGrooves(grooves: ExtrudeSolid[], output?: ExtrudeSolid[]): void;
     /**
-     *  添加侧面槽
-     *  通常槽已经校验过准确性,所以不在校验
+     * 添加槽进板件,并且自动分裂.
+     * 通常槽已经校验过准确性,所以不在校验
      */
-    AppendRelevanceSideModel(relevanceSideModelMap: Map<number, ExtrudeSolid[]>): void;
+    AppendGrooves(grooves: ExtrudeSolid[], output?: ExtrudeSolid[], outSplitExtrudeSolid?: 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[];
@@ -196,6 +193,8 @@ export declare class ExtrudeSolid extends Entity {
     AdjustPath(ext: ExtrudeSolid, outline: Polyline | Circle): void;
     /** (步骤4.2.2) 针对圆弧板-修正位置 */
     AdjustPosition(ext: ExtrudeSolid, basePoint: Vector3): void;
+    /** (步骤4.2.3) 针对圆弧板-修正起点 */
+    AdjustBasePoint(oldBasePoint: Vector3, oldPathWCS: Polyline): void;
     /**
      * (步骤4.2)
      * 计算本实体被全身的凹槽差集后正确的实体轮廓,和有可能的分裂实体
@@ -212,10 +211,12 @@ export declare class ExtrudeSolid extends Entity {
      */
     GrooveCheckAll(splitEntitys: this[]): void;
     /** 校验内部槽并且自动分裂 */
-    GrooveCheckAllAutoSplit(output?: ExtrudeSolid[]): void;
+    GrooveCheckAllAutoSplit(output?: ExtrudeSolid[], outSplitExtrudeSolid?: ExtrudeSolid[]): void;
     HandleSpliteEntitys(splitEntitys: this[]): void;
     LazyGrooveCheckAll(): void;
     GetPrintObject3D(): (Line2 | Mesh<BufferGeometry, import("three").ShaderMaterial>)[];
+    /** 获取边框 */
+    GetEdgeObject3D(renderType: RenderType): Line2 | LineSegments<BufferGeometry, LineBasicMaterial>;
     InitDrawObject(renderType?: RenderType): Object3D;
     get UCGenerator(): UVGenerator;
     __CacheKnifVersion__: {
@@ -224,6 +225,7 @@ export declare class ExtrudeSolid extends Entity {
     get NeedUpdateRelevanceGroove(): boolean;
     __CacheVolume__: number;
     __CacheSplitExtrudes: this[];
+    _WorkerCalcedBufferGeometryMap: Map<ExtrudeSolid, BufferGeometry[]>;
     /**
      * 计算关联拉槽,更新绘制对象(MeshGeometry和EdgeGeometry)
      */

types/DatabaseServices/Entity/Image.d.ts

@@ -1,4 +1,4 @@
-import { BufferGeometry, Matrix3, Matrix4, Object3D, Vector3 } from "three";
+import { BufferGeometry, Matrix3, Matrix4, Object3D, Side, Vector3 } from "three";
 import { UpdateDraw } from "../../Common/Status";
 import { ObjectSnapMode } from "../../Editor/ObjectSnapMode";
 import { RenderType } from "../../GraphicsSystem/RenderType";
@@ -14,9 +14,11 @@ export declare class Image extends Entity {
     private _ImageScaleX;
     private _ImageScaleY;
     private _ImageClipPoly;
-    private _FaceSize;
+    private _FaceSide;
     private texture;
     constructor(imageSizeX?: number, imageSizeY?: number);
+    get FaceSide(): Side;
+    set FaceSide(v: Side);
     get ImageUrl(): string;
     set ImageUrl(url: string);
     get ImageSizeX(): number;

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

@@ -1 +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;AAC7D,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;IAsDhD,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"}
+{"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,EAAuB,IAAI,EAAmC,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,IAKI,IAAI,CAFnB;IAED,IAAI,QAAQ,CAAC,CAAC,EAAE,IAAI,EAQnB;IAED,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/Polyline.d.ts

@@ -150,7 +150,15 @@ export declare class Polyline extends Curve {
     GetClosestPointTo(pt: Vector3, extend: boolean): Vector3;
     GetClosestPointTo2(pt: Vector3, extType: ExtendType): Vector3;
     GetOffsetCurves(offsetDist: number): Polyline[];
-    GetFeedingToolPath(offsetDist: number, offsetDistSq?: number, joinType?: PolylineJoinType): Polyline[];
+    /**
+     * 走刀模式(在这个模式下,我们会进行圆弧过渡(或者直线过渡)避免尖角过大)
+     * @param offsetDist 偏移距离
+     * @param [offsetDistSq=(offsetDist ** 2) * 2.1] 允许的最大尖角长度 默认值差不多是矩形的尖角大一点
+     * @param [joinType=PolylineJoinType.Round] 尖角的处理方式,默认是圆弧过渡,可以切换成直线过渡
+     * @param [keepCollinearLine=false]  保留共线部分(在向外偏移时,生产程序希望偏移后的结果仍然是一个封闭的曲线,将这个改成true能实现这个目的)
+     * @returns
+     */
+    GetFeedingToolPath(offsetDist: number, offsetDistSq?: number, joinType?: PolylineJoinType, keepCollinearLine?: boolean): Polyline[];
     /**
      * 分解
      */

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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"}