From 1f2546fd6c72099bcfbe027064aa5a8ea912005d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com> Date: Wed, 3 Jul 2024 01:39:56 +0000 Subject: [PATCH] =?UTF-8?q?!2854=20=E4=BC=98=E5=8C=96:=E5=90=8C=E4=BE=A7?= =?UTF-8?q?=E9=9D=A2=E6=8E=92=E9=92=BB=E6=97=B6,=E5=8E=9A=E5=BA=A6?= =?UTF-8?q?=E5=B0=8F=E7=9A=84=E9=82=A3=E5=9D=97=E6=9D=BF=E5=BD=93=E5=81=9A?= =?UTF-8?q?=E6=89=93=E5=AD=94=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Geometry/DrillParse/Face.ts | 4 ++++ src/UI/Components/Board/GangDrillModal.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Geometry/DrillParse/Face.ts b/src/Geometry/DrillParse/Face.ts index 5cce7d6cf..61233ce58 100644 --- a/src/Geometry/DrillParse/Face.ts +++ b/src/Geometry/DrillParse/Face.ts @@ -85,6 +85,10 @@ export class Face //获得侧面和非侧面 let [sideFace, noSideFace] = this.type === BoardFaceType.Side ? [this, f] : [f, this]; + //同侧面排钻时 厚度小的那块当做第一块 + if (sideFace.type === noSideFace.type) + [sideFace, noSideFace] = this.Width > f.Width ? [f, this] : [this, f]; + //布尔面和被布尔面得差异矩阵 let diffMtx = sideFace.OCSInv.multiply(noSideFace.OCS); MatrixPlanarizere(diffMtx); diff --git a/src/UI/Components/Board/GangDrillModal.tsx b/src/UI/Components/Board/GangDrillModal.tsx index 8a0bb7d84..041a42a76 100644 --- a/src/UI/Components/Board/GangDrillModal.tsx +++ b/src/UI/Components/Board/GangDrillModal.tsx @@ -375,7 +375,7 @@ export class DrillModal extends React.Component<{ store?: DrillStore; }, {}> {
其他
- 当板厚小于 + 当碰撞面宽小于