From 37cc41ac0aef3dae7c7b541bec91feb5b6821557 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sat, 11 May 2019 14:54:01 -0700 Subject: [PATCH] Report status better --- .../DesignTools/Operations/CurveObject3D_2.cs | 10 ++++++++++ .../DesignTools/Operations/TwistObject3D.cs | 7 +++++++ Submodules/agg-sharp | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs b/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs index 859336544..af6dd6022 100644 --- a/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs +++ b/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs @@ -149,15 +149,22 @@ namespace MatterHackers.MatterControl.DesignTools var curvedChildren = new List(); + var status = new ProgressStatus(); + foreach (var sourceItem in SourceContainer.VisibleMeshes()) { var originalMesh = sourceItem.Mesh; + status.Status = "Copy Mesh".Localize(); + reporter.Report(status); var transformedMesh = originalMesh.Copy(CancellationToken.None); var itemMatrix = sourceItem.WorldMatrix(SourceContainer); // transform into this space transformedMesh.Transform(itemMatrix); + status.Status = "Split Mesh".Localize(); + reporter.Report(status); + // split the mesh along the x axis transformedMesh.SplitOnPlanes(Vector3.UnitX, cuts, cutSize / 8); @@ -181,6 +188,9 @@ namespace MatterHackers.MatterControl.DesignTools // transform back into item local space transformedMesh.Transform(Matrix4X4.CreateTranslation(-rotationCenter) * itemMatrix.Inverted); + status.Status = "Merge Vertices".Localize(); + reporter.Report(status); + transformedMesh.MergeVertices(.1); transformedMesh.CalculateNormals(); diff --git a/MatterControlLib/DesignTools/Operations/TwistObject3D.cs b/MatterControlLib/DesignTools/Operations/TwistObject3D.cs index 7bca61620..dceb91ce2 100644 --- a/MatterControlLib/DesignTools/Operations/TwistObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/TwistObject3D.cs @@ -175,15 +175,22 @@ namespace MatterHackers.MatterControl.DesignTools var twistedChildren = new List(); + var status = new ProgressStatus(); + foreach (var sourceItem in SourceContainer.VisibleMeshes()) { var originalMesh = sourceItem.Mesh; + status.Status = "Copy Mesh".Localize(); + reporter.Report(status); var transformedMesh = originalMesh.Copy(CancellationToken.None); var itemMatrix = sourceItem.WorldMatrix(SourceContainer); // transform into this space transformedMesh.Transform(itemMatrix); + status.Status = "Split Mesh".Localize(); + reporter.Report(status); + // split the mesh along the z axis transformedMesh.SplitOnPlanes(Vector3.UnitZ, cuts, cutSize / 8); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index b380555fc..2dda67fe8 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit b380555fc0d4f08db75b70f6602fdf9b68176313 +Subproject commit 2dda67fe8affa8aeaa31e952f7b89a8719553c85