!752 修复对齐和板件缩放造型位置问题

pull/752/MERGE
ZoeLeeFZ 5 years ago committed by ChenX
parent 8dc074c2f9
commit c83a1481bb

@ -59,14 +59,14 @@ export class Align implements Command
{
let p3 = ptRes.Point;
let po3 = await this.getPoint("选择第三个目标点");
let po3 = await this.getPoint("选择第三个目标点", p3);
if (!po3) return;
JigUtils.Draw(new Line(p3, po3));
let v13 = p3.clone().sub(p1).applyMatrix4(roInv);
let vo13 = po3.clone().sub(po1).applyMatrix4(roInv);
let d1 = v13.cross(v12).normalize();
let d1 = v13.cross(v12).normalize().applyMatrix4(roMtx);
let d2 = vo13.cross(vo12).normalize();
if (!equalv3(d1, d2))
{

@ -163,6 +163,8 @@ export class ExtrudeSolid extends Entity
//由于修改矩阵会导致矩阵错误
this.csg = undefined;
if (!equaln(m.getMaxScaleOnAxis(), 1))
this.Update(UpdateDraw.Geometry);
return this;
}
protected ApplyScaleMatrix(m: Matrix4): this
@ -173,7 +175,6 @@ export class ExtrudeSolid extends Entity
cu.ApplyMatrix(m);
cu.ApplyMatrix(this.OCSInv);
this.CheckContourCurve();
this.Update(UpdateDraw.Geometry);
return this;
}
get Position(): Vector3

Loading…
Cancel
Save