|
|
@ -448,7 +448,7 @@ export class Arc extends Curve
|
|
|
|
return this;
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
IntersectWith2(curve: Curve, intType: IntersectOption)
|
|
|
|
IntersectWith2(curve: Curve, intType: IntersectOption, tolerance = 1e-6)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (curve instanceof Arc)
|
|
|
|
if (curve instanceof Arc)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -456,14 +456,14 @@ export class Arc extends Curve
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (curve instanceof Line)
|
|
|
|
if (curve instanceof Line)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return SwapParam(IntersectLineAndArc(curve, this, reverseIntersectOption(intType)));
|
|
|
|
return SwapParam(IntersectLineAndArc(curve, this, reverseIntersectOption(intType), tolerance));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (curve instanceof Circle)
|
|
|
|
if (curve instanceof Circle)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return SwapParam(IntersectCircleAndArc(curve, this, reverseIntersectOption(intType)));
|
|
|
|
return SwapParam(IntersectCircleAndArc(curve, this, reverseIntersectOption(intType), tolerance));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (curve instanceof Polyline)
|
|
|
|
if (curve instanceof Polyline)
|
|
|
|
return SwapParam(IntersectPolylineAndCurve(curve, this, reverseIntersectOption(intType)));
|
|
|
|
return SwapParam(IntersectPolylineAndCurve(curve, this, reverseIntersectOption(intType), tolerance));
|
|
|
|
|
|
|
|
|
|
|
|
if (curve instanceof Ellipse)
|
|
|
|
if (curve instanceof Ellipse)
|
|
|
|
return SwapParam(IntersectEllipseAndCircleOrArc(curve, this, intType));
|
|
|
|
return SwapParam(IntersectEllipseAndCircleOrArc(curve, this, intType));
|
|
|
|