diff --git a/src/DatabaseServices/Contour.ts b/src/DatabaseServices/Contour.ts index 1ed720e75..bdd85abaf 100644 --- a/src/DatabaseServices/Contour.ts +++ b/src/DatabaseServices/Contour.ts @@ -600,7 +600,7 @@ function fastEqualCurve(c1: Curve, c2: Curve, tolerance = 1e-3) //对于双多段线互相切割后的结果,快速判断曲线是否在另一条曲线内部 -//也许有一天这个中点算法需要改一下, 使用 src\Geometry\ExtrudeEdgeGeometry2.ts->CenterPoint 会比较稳妥 +//也许有一天这个中点算法需要改一下, 使用.MidPoint比较稳妥 function fastCurveInCurve(sourceCu: Polyline | Circle, targetCu: Curve) { return sourceCu.PtInCurve(targetCu.GetPointAtParam(targetCu.EndParam * 0.5)); diff --git a/src/DatabaseServices/Entity/Curve.ts b/src/DatabaseServices/Entity/Curve.ts index 748e52457..9b435f57c 100644 --- a/src/DatabaseServices/Entity/Curve.ts +++ b/src/DatabaseServices/Entity/Curve.ts @@ -187,15 +187,15 @@ export abstract class Curve extends Entity //------------------绘制相关------------------ //重载 - protected OnlyRenderType = true; + protected override OnlyRenderType = true; //样条线重载了这个,得到了更高的绘制精度 protected GetDrawCount() { return 30; } + /** - * 重载: 初始化绘制实体. * @param {RenderType} [renderType=RenderType.Wireframe] */ - InitDrawObject(renderType: RenderType = RenderType.Wireframe): Object3D + override InitDrawObject(renderType: RenderType = RenderType.Wireframe): Object3D { let pts = this.Shape.getPoints(this.GetDrawCount()); if (renderType === RenderType.WireframePrint) @@ -214,7 +214,7 @@ export abstract class Curve extends Entity * @param {RenderType} type * @param {Object3D} obj */ - UpdateDrawObject(type: RenderType, obj: Object3D) + override UpdateDrawObject(type: RenderType, obj: Object3D) { let pts = this.Shape.getPoints(this.GetDrawCount()); let plObj = obj as TLine; @@ -237,7 +237,7 @@ export abstract class Curve extends Entity /** * 重载:更新实体材质 */ - UpdateDrawObjectMaterial(type: RenderType, obj: Object3D, material?: Material) + override UpdateDrawObjectMaterial(type: RenderType, obj: Object3D, material?: Material) { if (type === RenderType.WireframePrint) { @@ -250,7 +250,7 @@ export abstract class Curve extends Entity } } - UpdateJigMaterial(color = 8) + override UpdateJigMaterial(color = 8) { for (let [type, obj] of this._CacheDrawObject) {