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

Working to make zoom to selection zoom better

Browse source
This commit is contained in:
LarsBrubaker 2021-05-24 07:36:04 -07:00
parent 8c00f58d9d
commit 045b146588
4 changed files with 112 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
MatterControlLib/PartPreviewWindow/View3D/TrackballTumbleWidgetExtended.cs
View file

@ -425,7 +425,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
public void AnimateTo(Matrix4X4 newRotation)
public void AnimateRotation(Matrix4X4 newRotation, Action after = null)
{
var rotationStart = new Quaternion(world.RotationMatrix);
var rotationEnd = new Quaternion(newRotation);
@ -435,21 +435,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
var current = Quaternion.Slerp(rotationStart, rotationEnd, update / (double)updates);
this.SetRotationWithDisplacement(current);
});
}, after);
}
public void AnimateTranslation(Vector3 start, Vector3 end)
public void AnimateTranslation(Vector3 worldStart, Vector3 worldEnd, Action after = null)
{
var delta = end - start;
var delta = worldEnd - worldStart;
ZeroVelocity();
Animation.Run(this, .25, 10, (update) =>
{
world.Translate(delta * .1);
});
}, after);
}
internal class MotionQueue
{
private readonly List<TimeAndPosition> motionQueue = new List<TimeAndPosition>();

2
MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs
View file

@ -387,7 +387,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var look = Matrix4X4.LookAt(Vector3.Zero, normalAndUp.normal, normalAndUp.up);
trackballTumbleWidgetExtended.AnimateTo(look);
trackballTumbleWidgetExtended.AnimateRotation(look);
}
}

113
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -471,6 +471,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
AddRoundButton(zoomToSelectionButton, RotatedMargin(zoomToSelectionButton, MathHelper.Tau * .4)).Click += (s, e) =>
{
bool NeedsToBeSmaller(RectangleDouble partScreenBounds, RectangleDouble goalBounds)
{
if (partScreenBounds.Bottom < goalBounds.Bottom
|| partScreenBounds.Top > goalBounds.Top
|| partScreenBounds.Left < goalBounds.Left
|| partScreenBounds.Right > goalBounds.Right)
{
return true;
}
return false;
}
var selectedItem = this.Scene.SelectedItem;
if (selectedItem != null)
{
@ -478,8 +491,61 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var center = aabb.Center;
// pan to the center
var world = sceneContext.World;
var screenCenter = new Vector2(world.Width / 2, world.Height / 2);
var screenCenter = new Vector2(world.Width / 2 - selectedObjectPanel.Width / 2, world.Height / 2);
var centerRay = world.GetRayForLocalBounds(screenCenter);
bool done = false;
double scaleFraction = .1;
// make the target size a portion of the total size
var goalBounds = new RectangleDouble(0, 0, world.Width, world.Height);
goalBounds.Inflate(-world.Width * .1);
int rescaleAttempts = 0;
var testWorld = new WorldView(world.Width, world.Height);
testWorld.RotationMatrix = world.RotationMatrix;
var distance = 80.0;
void AjustDistance()
{
testWorld.TranslationMatrix = world.TranslationMatrix;
var delta = centerRay.origin + centerRay.directionNormal * distance - center;
testWorld.Translate(delta);
}
while (!done && rescaleAttempts++ < 500)
{
var partScreenBounds = testWorld.GetScreenBounds(aabb);
if (!NeedsToBeSmaller(partScreenBounds, goalBounds))
{
distance *= 1 + scaleFraction;
AjustDistance();
partScreenBounds = testWorld.GetScreenBounds(aabb);
// If it crossed over the goal reduct the amount we are adjusting by.
if (NeedsToBeSmaller(partScreenBounds, goalBounds))
{
scaleFraction /= 2;
}
}
else
{
testWorld.Scale *= 1 - scaleFraction;
AjustDistance();
partScreenBounds = testWorld.GetScreenBounds(aabb);
// If it crossed over the goal reduct the amount we are adjusting by.
if (!NeedsToBeSmaller(partScreenBounds, goalBounds))
{
scaleFraction /= 2;
if (scaleFraction < .001)
{
done = true;
}
}
}
}
TrackballTumbleWidget.AnimateTranslation(center, centerRay.origin + centerRay.directionNormal * 80);
// zoom to fill the view
// viewControls3D.NotifyResetView();
@ -1705,19 +1771,50 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return offset;
}
Vector3 homeEyePosition = default(Vector3);
Matrix4X4 homeRotation = default(Matrix4X4);
public void ResetView()
{
var world = sceneContext.World;
TrackballTumbleWidget.SetRotationCenter(new Vector3(sceneContext.BedCenter));
var world = sceneContext.World;
void ResetHome()
{
world.Reset();
world.Scale = .03;
world.Translate(-new Vector3(sceneContext.BedCenter));
world.Rotate(Quaternion.FromEulerAngles(new Vector3(0, 0, -MathHelper.Tau / 16)));
world.Rotate(Quaternion.FromEulerAngles(new Vector3(MathHelper.Tau * .19, 0, 0)));
world.Reset();
world.Scale = .03;
world.Translate(-new Vector3(sceneContext.BedCenter));
world.Rotate(Quaternion.FromEulerAngles(new Vector3(0, 0, -MathHelper.Tau / 16)));
world.Rotate(Quaternion.FromEulerAngles(new Vector3(MathHelper.Tau * .19, 0, 0)));
homeEyePosition = world.EyePosition;
homeRotation = world.RotationMatrix;
Invalidate();
}
Invalidate();
void Rotate()
{
TrackballTumbleWidget.AnimateRotation(homeRotation);//, ResetHome);
}
void Translate()
{
TrackballTumbleWidget.AnimateTranslation(world.EyePosition, homeEyePosition);
}
if (homeEyePosition.Z != 0)
{
// pan to the center
//var screenCenter = new Vector2(world.Width / 2 - selectedObjectPanel.Width / 2, world.Height / 2);
//var centerRay = world.GetRayForLocalBounds(screenCenter);
//TrackballTumbleWidget.AnimateTranslation(new Vector3(sceneContext.BedCenter, 0), centerRay.origin + centerRay.directionNormal * 80);
ResetHome();
}
else
{
ResetHome();
}
}
public override void OnMouseUp(MouseEventArgs mouseEvent)