|
|
@ -102,7 +102,7 @@ export function IntersectCircleAndCircle(circle1: Circle, circle2: Circle, intTy
|
|
|
|
export function IntersectCircleAndArc(circle: Circle, arc2: Arc, intType: IntersectOption)
|
|
|
|
export function IntersectCircleAndArc(circle: Circle, arc2: Arc, intType: IntersectOption)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
let ptArr = this.IntersectCircleAndCircleOrArc(circle.Center, circle.Radius, arc2.Center, arc2.Radius);
|
|
|
|
let ptArr = this.IntersectCircleAndCircleOrArc(circle.Center, circle.Radius, arc2.Center, arc2.Radius);
|
|
|
|
return CheckPointOnCurve(ptArr, circle, arc2, intType);
|
|
|
|
return CheckPointOnCurve(ptArr, circle, arc2, intType | IntersectOption.ExtendThis);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//圆弧与圆弧
|
|
|
|
//圆弧与圆弧
|
|
|
@ -171,7 +171,7 @@ export function IntersectLineAndCircleOrArc(line: Line, center?: Vector3, radius
|
|
|
|
export function IntersectLineAndCircle(line: Line, circle: Circle, intType: IntersectOption)
|
|
|
|
export function IntersectLineAndCircle(line: Line, circle: Circle, intType: IntersectOption)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
let ptArr = this.IntersectLineAndCircleOrArc(line, circle.Center, circle.Radius);
|
|
|
|
let ptArr = this.IntersectLineAndCircleOrArc(line, circle.Center, circle.Radius);
|
|
|
|
return CheckPointOnCurve(ptArr, line, circle, intType);
|
|
|
|
return CheckPointOnCurve(ptArr, line, circle, intType | IntersectOption.ExtendArg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//直线和圆弧
|
|
|
|
//直线和圆弧
|
|
|
|
export function IntersectLineAndArc(line: Line, arc: Arc, intType: IntersectOption)
|
|
|
|
export function IntersectLineAndArc(line: Line, arc: Arc, intType: IntersectOption)
|
|
|
|