From 425ba475672bbf774fd85cec3806825f96168bcf Mon Sep 17 00:00:00 2001 From: ChenX_AMD Date: Sat, 3 Mar 2018 23:16:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E5=9C=86=E7=9A=84=E6=B1=82?= =?UTF-8?q?=E4=BA=A4=20=E5=BA=94=E8=AF=A5=E9=81=BF=E5=85=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=9A=84=E6=A0=A1=E9=AA=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/GraphicsSystem/IntersectWith.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GraphicsSystem/IntersectWith.ts b/src/GraphicsSystem/IntersectWith.ts index ba4c357b9..825198423 100644 --- a/src/GraphicsSystem/IntersectWith.ts +++ b/src/GraphicsSystem/IntersectWith.ts @@ -102,7 +102,7 @@ export function IntersectCircleAndCircle(circle1: Circle, circle2: Circle, intTy export function IntersectCircleAndArc(circle: Circle, arc2: Arc, intType: IntersectOption) { 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) { 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)