|
|
@ -272,15 +272,13 @@ export class Arc extends Curve
|
|
|
|
let surplusAngleHalf = Math.PI - allAn / 2;
|
|
|
|
let surplusAngleHalf = Math.PI - allAn / 2;
|
|
|
|
|
|
|
|
|
|
|
|
if (ptAllAn > allAn + surplusAngleHalf)//返回负数
|
|
|
|
if (ptAllAn > allAn + surplusAngleHalf)//返回负数
|
|
|
|
{
|
|
|
|
|
|
|
|
return ((ptAllAn - allAn) - (surplusAngleHalf * 2)) / allAn;
|
|
|
|
return ((ptAllAn - allAn) - (surplusAngleHalf * 2)) / allAn;
|
|
|
|
}
|
|
|
|
|
|
|
|
else//返回正数
|
|
|
|
else//返回正数
|
|
|
|
return ptAllAn / allAn;
|
|
|
|
return ptAllAn / allAn;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Gets param at angle2
|
|
|
|
* 根据角度获得参数,不过在这里我们可以指定我们是要获取前面的参数还是后面的参数(正负)
|
|
|
|
* @param an
|
|
|
|
* @param an
|
|
|
|
* @param [isStart] true:返回负数,false 返回正数
|
|
|
|
* @param [isStart] true:返回负数,false 返回正数
|
|
|
|
* @returns
|
|
|
|
* @returns
|
|
|
@ -295,9 +293,7 @@ export class Arc extends Curve
|
|
|
|
let surplusAngleHalf = Math.PI - allAn / 2;
|
|
|
|
let surplusAngleHalf = Math.PI - allAn / 2;
|
|
|
|
|
|
|
|
|
|
|
|
if (isStart)//返回负数
|
|
|
|
if (isStart)//返回负数
|
|
|
|
{
|
|
|
|
|
|
|
|
return ((ptAllAn - allAn) - (surplusAngleHalf * 2)) / allAn;
|
|
|
|
return ((ptAllAn - allAn) - (surplusAngleHalf * 2)) / allAn;
|
|
|
|
}
|
|
|
|
|
|
|
|
else//返回正数
|
|
|
|
else//返回正数
|
|
|
|
return ptAllAn / allAn;
|
|
|
|
return ptAllAn / allAn;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -505,7 +501,7 @@ export class Arc extends Curve
|
|
|
|
if (this._Clockwise)
|
|
|
|
if (this._Clockwise)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (this._StartAngle > endAngle)
|
|
|
|
if (this._StartAngle > endAngle)
|
|
|
|
return this.StartAngle - endAngle;
|
|
|
|
return this._StartAngle - endAngle;
|
|
|
|
else //越过0点绘制圆弧
|
|
|
|
else //越过0点绘制圆弧
|
|
|
|
return (Math.PI * 2) - (endAngle - this._StartAngle);
|
|
|
|
return (Math.PI * 2) - (endAngle - this._StartAngle);
|
|
|
|
}
|
|
|
|
}
|
|
|
|