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

Made it possible to limit the minimum scale of the trackball widget.

Browse source 
Fixed scale of existing widgets to not start too small.
This commit is contained in:
Lars Brubaker 2016-02-24 18:11:10 -08:00
parent f6060939dd
commit 82e6000efd
6 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BrailleBuilder/View3DBrailleBuilder.cs
View file

@ -250,9 +250,9 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset();
// move things into the right place and scale // 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.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) private async void InsertTextNow(string text)

3
CustomWidgets/ThumbnailTracer.cs
View file

@ -94,7 +94,8 @@ namespace MatterHackers.RayTracer
public void SetRenderPosition(List<MeshGroup> loadedMeshGroups) public void SetRenderPosition(List<MeshGroup> loadedMeshGroups)
{ {
trackballTumbleWidget.TrackBallController.Reset(); 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(0, 0, MathHelper.Tau / 16)));
trackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .19, 0, 0))); trackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .19, 0, 0)));

4
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -579,8 +579,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
meshViewerWidget.TrackballTumbleWidget.ZeroVelocity(); meshViewerWidget.TrackballTumbleWidget.ZeroVelocity();
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset();
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = .03;
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-new Vector3(ActiveSliceSettings.Instance.BedCenter)); 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(0, 0, MathHelper.Tau / 16)));
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .19, 0, 0))); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .19, 0, 0)));
} }
@ -2586,7 +2586,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
UpdateSizeInfo(); UpdateSizeInfo();
} }
private void UpdateSizeInfo() public void UpdateSizeInfo()
{ {
if (sizeDisplay[0] != null if (sizeDisplay[0] != null
&& SelectedMeshGroup != null) && SelectedMeshGroup != null)

2
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -126,8 +126,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// move things into the right place and scale // move things into the right place and scale
Vector3 bedCenter3D = new Vector3(bedCenter, 0); Vector3 bedCenter3D = new Vector3(bedCenter, 0);
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = .05;
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-bedCenter3D); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-bedCenter3D);
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3;
} }
private void Clear3DGCode(object sender, EventArgs e) private void Clear3DGCode(object sender, EventArgs e)

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 66522f874d18f759f1d50af968cae7ad1b1bd24b Subproject commit f9e04b56ee3730c9c064206320d106b0539e8163

4
TextCreator/View3DTextCreator.cs
View file

@ -285,9 +285,9 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset();
// move things into the right place and scale // 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.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() private void ResetWordLayoutSettings()