nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed a bug with group objects moving on the be when scaled.

Browse source
This commit is contained in:
Lars Brubaker 2015-10-16 12:36:09 -07:00
parent 1e41bca15d
commit b939da1036
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -2151,6 +2151,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void ScaleAxis(double scaleIn, int axis)
{
AxisAlignedBoundingBox originalMeshBounds = SelectedMeshGroup.GetAxisAlignedBoundingBox();
AxisAlignedBoundingBox totalMeshBounds = SelectedMeshGroup.GetAxisAlignedBoundingBox(SelectedMeshGroupTransform.TotalTransform);
AxisAlignedBoundingBox scaledBounds = SelectedMeshGroup.GetAxisAlignedBoundingBox(SelectedMeshGroupTransform.scale);
// first we remove any scale we have applied and then scale to the new value
@ -2169,7 +2172,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
scale.scale *= totalScale;
SelectedMeshGroupTransform = scale;
// And make sure its center has not changed
AxisAlignedBoundingBox postScaleBounds = SelectedMeshGroup.GetAxisAlignedBoundingBox(SelectedMeshGroupTransform.TotalTransform);
ScaleRotateTranslate translation = SelectedMeshGroupTransform;
translation.translation *= Matrix4X4.CreateTranslation(totalMeshBounds.Center - postScaleBounds.Center);
SelectedMeshGroupTransform = translation;
PlatingHelper.PlaceMeshGroupOnBed(MeshGroups, MeshGroupTransforms, SelectedMeshGroupIndex);
PartHasBeenChanged();
Invalidate();
MeshGroupExtraData[SelectedMeshGroupIndex].currentScale[axis] = scaleIn;