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

Report status better

Browse source
This commit is contained in:
LarsBrubaker 2019-05-11 14:54:01 -07:00
parent 97fd35057b
commit 37cc41ac0a
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs
View file

@ -149,15 +149,22 @@ namespace MatterHackers.MatterControl.DesignTools
var curvedChildren = new List<IObject3D>();
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();

7
MatterControlLib/DesignTools/Operations/TwistObject3D.cs
View file

@ -175,15 +175,22 @@ namespace MatterHackers.MatterControl.DesignTools
var twistedChildren = new List<IObject3D>();
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);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit b380555fc0d4f08db75b70f6602fdf9b68176313
Subproject commit 2dda67fe8affa8aeaa31e952f7b89a8719553c85