|
|
|
@ -729,14 +729,14 @@ export class DrawDrillingTool extends Singleton
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
let ocs = interBoard.OCSInv.multiply(this.m_Face.OCS).multiply(MoveMatrix(new Vector3(dist)));
|
|
|
|
|
return CyHoleInBoard(this.drillEnts as CylinderHole[], interBoard, ocs);
|
|
|
|
|
return CyHoleInBoard(this.drillEnts as CylinderHole[], interBoard, ocs, false, this.m_Option.allowPxl);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
private CheckWoodInBoard(dist: number)
|
|
|
|
|
{
|
|
|
|
|
let br = this.m_Face.InterBoard;
|
|
|
|
|
let ocs = br.OCSInv.multiply(this.m_Face.OCS).multiply(MoveMatrix(new Vector3(dist)));
|
|
|
|
|
return CyHoleInBoard(this.woodPins as CylinderHole[], br, ocs);
|
|
|
|
|
return CyHoleInBoard(this.woodPins as CylinderHole[], br, ocs, false, this.m_Option.allowPxl);
|
|
|
|
|
}
|
|
|
|
|
private CheckModelingCollision(localBoxs: Box3[], intBox3s: Box3[], dist: number)
|
|
|
|
|
{
|
|
|
|
@ -953,8 +953,8 @@ export class DrawDrillingTool extends Singleton
|
|
|
|
|
needRemoveDrillList.add(hole);
|
|
|
|
|
}
|
|
|
|
|
//偏移后判断是否在板件外面
|
|
|
|
|
else if (!CyHoleInBoard(moveAfterDrills, this.m_Face.InterBoard, this.m_Face.InterBoard.OCSInv) &&
|
|
|
|
|
!CyHoleInBoard(moveAfterDrills, this.m_Face.LocalBoard, this.m_Face.LocalBoard.OCSInv))
|
|
|
|
|
else if (!CyHoleInBoard(moveAfterDrills, this.m_Face.InterBoard, this.m_Face.InterBoard.OCSInv, false, this.m_Option.allowPxl) &&
|
|
|
|
|
!CyHoleInBoard(moveAfterDrills, this.m_Face.LocalBoard, this.m_Face.LocalBoard.OCSInv, false, this.m_Option.allowPxl))
|
|
|
|
|
{
|
|
|
|
|
this._InteractionLog(`有${isWoodPinss ? "木销" : "通孔排钻"}偏移后在板件外,跳过绘制`);
|
|
|
|
|
needRemoveDrillList.add(hole);
|
|
|
|
|