From 16ab2a4831f5925d6c8341ea1e5e51032c954eb1 Mon Sep 17 00:00:00 2001 From: ChenX Date: Thu, 19 May 2022 17:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E5=9C=86=E5=BC=A7=E5=A2=99?= =?UTF-8?q?=E5=9C=A8=E5=88=A0=E9=99=A4=E7=BD=91=E6=B4=9E=E5=90=8E=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Room/Entity/Wall/RoomWallArc.ts | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/DatabaseServices/Room/Entity/Wall/RoomWallArc.ts b/src/DatabaseServices/Room/Entity/Wall/RoomWallArc.ts index 82087b721..2b7db46a6 100644 --- a/src/DatabaseServices/Room/Entity/Wall/RoomWallArc.ts +++ b/src/DatabaseServices/Room/Entity/Wall/RoomWallArc.ts @@ -314,10 +314,10 @@ export class RoomWallArc extends RoomWallBase { let tapes = [new Tape(0, 1, 0, this._Height)]; let curveParam = new GetLineParam(curve); - - if (this.Holes.length) + let holes = this.RealHoles; + if (holes.length) { - for (let hole of this.Holes) + for (let hole of holes) { let start = equaln(hole.StartParam, 0) ? 0 : MathUtils.clamp(curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam)), 0, 1); let end = equaln(hole.EndParam, 1) ? 1 : MathUtils.clamp(curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam)), 0, 1); @@ -366,9 +366,10 @@ export class RoomWallArc extends RoomWallBase let tapes = [new Tape(0, 1, 0, this._Height)]; let curveParam = new GetArcParam(arc); - if (this.Holes.length) + let holes = this.RealHoles; + if (holes.length) { - for (let hole of this.Holes) + for (let hole of holes) { let start = equaln(hole.StartParam, 0) ? 0 : MathUtils.clamp(curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam)), 0, 1); let end = equaln(hole.EndParam, 1) ? 1 : MathUtils.clamp(curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam)), 0, 1); @@ -474,9 +475,10 @@ export class RoomWallArc extends RoomWallBase let tapes = [new Tape(0, 1, 0, this._Height)]; let curveParam = new GetLineParam(curve); - if (this.Holes.length) + let holes = this.RealHoles; + if (holes.length) { - for (let hole of this.Holes) + for (let hole of holes) { let start = equaln(hole.StartParam, 0) ? 0 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam)); let end = equaln(hole.EndParam, 1) ? 1 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam)); @@ -525,9 +527,10 @@ export class RoomWallArc extends RoomWallBase let tapes = [new Tape(0, 1, 0, this._Height)]; let curveParam = new GetArcParam(arc); - if (this.Holes.length) + let holes = this.RealHoles; + if (holes.length) { - for (let hole of this.Holes) + for (let hole of holes) { let start = equaln(hole.StartParam, 0) ? 0 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam)); let end = equaln(hole.EndParam, 1) ? 1 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam));