!2364 修复:二维刀路反面挖,线显示在面上和应用在板边会有警告

pull/2365/MERGE
林三 1 year ago committed by ChenX
parent 4da0917304
commit 88d1532327

@ -1313,16 +1313,18 @@ export class Board extends ExtrudeSolid
let curves = VData2Curve(VKnifToolPath(tempPath, item.depth, item.knife.angle / 2));
let o = new Object3D();
o.position.z = -item.depth;
for (let c of curves)
{
c.ColorIndex = tempPath.ColorIndex;
o.add(c.GetDrawObjectFromRenderType(RenderType.Wireframe));
}
if (vm.dir === FaceDirection.Back)
{
o.applyMatrix4(ZMirrorMatrix);
o.position.z = item.depth;
}
else
o.position.z += this.thickness;
o.position.z = this.thickness - item.depth;
o.updateMatrix();
this._2DPathDrawObject.add(o);

@ -354,6 +354,7 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
//记录初始世界UCS
let backUCSMatrix = app.Editor.UCSMatrix;
let backVisibleUCS = app.Editor.UcsServices.Visible;
//记录初始相机状态
let backCamera = new CADFiler;
app.Viewer.CameraCtrl.WriteFile(backCamera);
@ -364,7 +365,7 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
//UCS W0
app.Editor.UCSMatrix = IdentityMtx4;
app.Editor.UcsServices.Visible = false;
//改变观察视角
app.Viewer.CameraCtrl.LookAt(ZAxisN);
app.Viewer.CameraCtrl.ZoomExtentsBox3(brCurve.BoundingBox.expandByScalar(1000));
@ -414,6 +415,7 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
TempEditor.End();
app.Editor.UCSMatrix = backUCSMatrix;
app.Viewer.CameraCtrl.ReadFile(backCamera);
app.Editor.UcsServices.Visible = backVisibleUCS;
}
}
}, EDITOR_2D_PATH);
@ -435,12 +437,12 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
}
}
let cuGourp = curveLinkGroup(finalCurve);
let pathMap = new Map<number, Polyline[]>();
if (cuGourp)
await CommandWrap(() =>
{
await CommandWrap(async () =>
let cuGourp = curveLinkGroup(finalCurve);
if (cuGourp)
{
const rightStore = RightPanelStore.GetInstance();
@ -482,8 +484,8 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
}
}
}, "分析二维刀路");
}
}
}, "分析二维刀路");
AppToaster.dismiss(EDITOR_2D_PATH);

Loading…
Cancel
Save