From a26f1e9f2681b705dd2b93cd03837acf1e9ebd6a Mon Sep 17 00:00:00 2001 From: ChenX Date: Thu, 5 Sep 2019 18:26:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E9=97=B4=E6=8B=BE?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Geometry/SpaceParse/ClampSpaceParseFix.ts | 6 +++++- src/Geometry/SpaceParse/ClampSpaceParseRay.ts | 13 ++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Geometry/SpaceParse/ClampSpaceParseFix.ts b/src/Geometry/SpaceParse/ClampSpaceParseFix.ts index cef37b90a..da2b44ab9 100644 --- a/src/Geometry/SpaceParse/ClampSpaceParseFix.ts +++ b/src/Geometry/SpaceParse/ClampSpaceParseFix.ts @@ -8,12 +8,16 @@ export class ClampSpaceParseFix extends ClampSpaceParse { this._signalDist = v; } + get SignalDist() + { + return this._signalDist; + } //virtual (请重载) 指定用户选择单块板的延伸空间 async GetSignalDist(): Promise { let res = new PromptDistendResult(); - res.Distance = this.SignalDist; + res.Distance = this._signalDist; res.Status = PromptStatus.OK; return res; } diff --git a/src/Geometry/SpaceParse/ClampSpaceParseRay.ts b/src/Geometry/SpaceParse/ClampSpaceParseRay.ts index 864a9e7ea..8975de8a9 100644 --- a/src/Geometry/SpaceParse/ClampSpaceParseRay.ts +++ b/src/Geometry/SpaceParse/ClampSpaceParseRay.ts @@ -30,12 +30,11 @@ export class ClampSpaceParseRay extends ClampSpaceParseDist return box; } - splitBoxs.sort((b1, b2) => - { - return b1.getCenter(new Vector3()).distanceToSquared(this.selectRay.origin) - - b2.getCenter(new Vector3()).distanceToSquared(this.selectRay.origin); - }); - - return splitBoxs[0]; + let [b1, b2] = splitBoxs; + if (b1.getCenter(new Vector3()).distanceToSquared(this.selectRay.origin) + < b2.getCenter(new Vector3()).distanceToSquared(this.selectRay.origin)) + return b1; + else + return b2; } }