diff --git a/src/Add-on/DrawLine.ts b/src/Add-on/DrawLine.ts index c4dd26b8f..9b60ce79b 100644 --- a/src/Add-on/DrawLine.ts +++ b/src/Add-on/DrawLine.ts @@ -85,7 +85,7 @@ export class DrawLine implements Command UCSUtils.SetUCSFromPointRes(ptRes); let ptLast = ptRes.Point; - let firstSnapModeIsTan = ptRes.SnaoMode === ObjectSnapMode.Tan; + let firstSnapModeIsTan = ptRes.SnapMode === ObjectSnapMode.Tan; let secondSnapModelIsTan = false; let firstTangeCircle: Circle | Arc; @@ -158,9 +158,9 @@ export class DrawLine implements Command if (ptRes.Status === PromptStatus.OK) { //第一个是切点 第二个也是选切点 - if (ptRes.SnaoMode === ObjectSnapMode.Tan && firstTangeCircle && pts.length === 1) + if (ptRes.SnapMode === ObjectSnapMode.Tan && firstTangeCircle && pts.length === 1) { - let pick = new SelectPick(app.Viewer, app.Viewer.WorldToScreen(ptRes.Point)); + let pick = new SelectPick(app.Viewer, app.Viewer.WorldToScreen(ptRes.Point), app.Editor.GetPointServices.snapServices.SnapSize); pick.Select(app.Viewer.VisibleObjects, { filterTypes: [Circle, Arc] }); let secondTangeCircle: Circle = (pick.SelectEntityList as Circle[]).find(c => c.PtInCurve(ptRes.Point)); diff --git a/src/Common/CurveUtils.ts b/src/Common/CurveUtils.ts index 38ad2e6db..e87b1787f 100644 --- a/src/Common/CurveUtils.ts +++ b/src/Common/CurveUtils.ts @@ -400,6 +400,8 @@ export function CircleInternalTangentLines(cir0: Circle, cir1: Circle): Line[] } } +//ref https://github1s.com/ArashPartow/wykobi/blob/master/wykobi.inl#L6575-L6576 +//获取2个圆的外切线 export function CircleOuterTangentLines(circle0: Circle, circle1: Circle): Line[] { let c0 = circle0.Center; diff --git a/src/Editor/GetPointServices.ts b/src/Editor/GetPointServices.ts index 3318c15c9..7f5608569 100644 --- a/src/Editor/GetPointServices.ts +++ b/src/Editor/GetPointServices.ts @@ -499,7 +499,7 @@ export class GetPointServices implements EditorService retValue.Point = p; retValue.intersection = this.intersection; - retValue.SnaoMode = snapMode; + retValue.SnapMode = snapMode; this.lastPoint = p; diff --git a/src/Editor/PromptResult.ts b/src/Editor/PromptResult.ts index 37949a355..abdfb07ab 100644 --- a/src/Editor/PromptResult.ts +++ b/src/Editor/PromptResult.ts @@ -40,7 +40,8 @@ export class PromptResult export class PromptPointResult extends PromptResult { - SnaoMode: ObjectSnapMode; + SnapMode: ObjectSnapMode; + // SnapEntity: Entity; TODO: intersection: Intersection; private _point: Vector3; /**