From 82e6000efd5586583d6215efaad9c546e0253669 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 24 Feb 2016 18:11:10 -0800 Subject: [PATCH] Made it possible to limit the minimum scale of the trackball widget. Fixed scale of existing widgets to not start too small. --- BrailleBuilder/View3DBrailleBuilder.cs | 4 ++-- CustomWidgets/ThumbnailTracer.cs | 3 ++- PartPreviewWindow/View3D/View3DWidget.cs | 4 ++-- PartPreviewWindow/ViewGcodeBasic.cs | 2 +- Submodules/agg-sharp | 2 +- TextCreator/View3DTextCreator.cs | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/BrailleBuilder/View3DBrailleBuilder.cs b/BrailleBuilder/View3DBrailleBuilder.cs index dc86a982d..da7e68af8 100644 --- a/BrailleBuilder/View3DBrailleBuilder.cs +++ b/BrailleBuilder/View3DBrailleBuilder.cs @@ -250,9 +250,9 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); // move things into the right place and scale - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = .06; - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .02, 0, 0))); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-new Vector3(ActiveSliceSettings.Instance.BedCenter)); + meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; + meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .02, 0, 0))); } private async void InsertTextNow(string text) diff --git a/CustomWidgets/ThumbnailTracer.cs b/CustomWidgets/ThumbnailTracer.cs index 0b147f2c1..23afd39e6 100644 --- a/CustomWidgets/ThumbnailTracer.cs +++ b/CustomWidgets/ThumbnailTracer.cs @@ -94,7 +94,8 @@ namespace MatterHackers.RayTracer public void SetRenderPosition(List loadedMeshGroups) { trackballTumbleWidget.TrackBallController.Reset(); - trackballTumbleWidget.TrackBallController.Scale = .03; + trackballTumbleWidget.TrackBallController.MinScale = 0; + trackballTumbleWidget.TrackBallController.Scale = .03; trackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(0, 0, MathHelper.Tau / 16))); trackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .19, 0, 0))); diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 7f826c8d2..c8da66d53 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -579,8 +579,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { meshViewerWidget.TrackballTumbleWidget.ZeroVelocity(); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = .03; meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-new Vector3(ActiveSliceSettings.Instance.BedCenter)); + meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(0, 0, MathHelper.Tau / 16))); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .19, 0, 0))); } @@ -2586,7 +2586,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow UpdateSizeInfo(); } - private void UpdateSizeInfo() + public void UpdateSizeInfo() { if (sizeDisplay[0] != null && SelectedMeshGroup != null) diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index f8b8eb967..d3420f819 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -126,8 +126,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // move things into the right place and scale Vector3 bedCenter3D = new Vector3(bedCenter, 0); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = .05; meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-bedCenter3D); + meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; } private void Clear3DGCode(object sender, EventArgs e) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 66522f874..f9e04b56e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 66522f874d18f759f1d50af968cae7ad1b1bd24b +Subproject commit f9e04b56ee3730c9c064206320d106b0539e8163 diff --git a/TextCreator/View3DTextCreator.cs b/TextCreator/View3DTextCreator.cs index e3291a7cb..066f662e0 100644 --- a/TextCreator/View3DTextCreator.cs +++ b/TextCreator/View3DTextCreator.cs @@ -285,9 +285,9 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); // move things into the right place and scale - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = .06; - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .02, 0, 0))); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-new Vector3(ActiveSliceSettings.Instance.BedCenter)); + meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; + meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .02, 0, 0))); } private void ResetWordLayoutSettings()