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

Rebuilding happing correctly again

Browse source
This commit is contained in:
LarsBrubaker 2021-06-20 14:31:08 -07:00
parent 6ebc9188c9
commit 4327013216
5 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

309
MatterControl.MeshOperations/OperationSourceContainerObject3D.cs
View file

@ -1,309 +0,0 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.DataConverters3D.UndoCommands;
using MatterHackers.Localizations;
using MatterHackers.PolygonMesh;
using Newtonsoft.Json;
namespace MatterHackers.MatterControl.DesignTools.Operations
{
public class OperationSourceContainerObject3D : Object3D
{
public static Func<string, Func<IProgress<ProgressStatus>, CancellationToken, Task>, Task> TaskBuilder { get; set; } =
(name, func) => Task.Run(() => func(null, CancellationToken.None));
public override Mesh Mesh
{
get
{
if (base.Mesh == null && !RebuildLocked)
{
int a = 0;
}
return base.Mesh;
}
set => base.Mesh = value;
}
public override bool CanFlatten => true;
public override bool Persistable
{
get
{
if (SourceContainer != null)
{
if (SourceContainer.Children.Any(c => !c.Persistable))
{
return false;
}
}
return true;
}
}
[JsonIgnore]
public IObject3D SourceContainer
{
get
{
IObject3D sourceContainer = this.Children.FirstOrDefault(c => c is OperationSourceObject3D);
if (sourceContainer == null)
{
using (this.RebuildLock())
{
sourceContainer = new OperationSourceObject3D();
// Move all the children to sourceContainer
this.Children.Modify(thisChildren =>
{
sourceContainer.Children.Modify(sourceChildren =>
{
foreach (var child in thisChildren)
{
sourceChildren.Add(child);
}
});
// and then add the source container to this
thisChildren.Clear();
thisChildren.Add(sourceContainer);
});
}
}
return sourceContainer;
}
}
public override void Flatten(UndoBuffer undoBuffer)
{
using (RebuildLock())
{
List<IObject3D> newChildren = new List<IObject3D>();
// push our matrix into a copy of our children
foreach (var child in this.Children)
{
if (!(child is OperationSourceObject3D))
{
var newChild = child.Clone();
newChildren.Add(newChild);
newChild.Matrix *= this.Matrix;
var flags = Object3DPropertyFlags.Visible;
if (this.Color.alpha != 0) flags |= Object3DPropertyFlags.Color;
if (this.OutputType != PrintOutputTypes.Default) flags |= Object3DPropertyFlags.OutputType;
if (this.MaterialIndex != -1) flags |= Object3DPropertyFlags.MaterialIndex;
newChild.CopyProperties(this, flags);
}
}
if (newChildren.Count > 1)
{
// wrap the children in an object so they remain a group
var group = new Object3D();
group.Children.Modify((groupList) =>
{
groupList.AddRange(newChildren);
});
newChildren.Clear();
newChildren.Add(group);
}
if (newChildren.Count == 0)
{
newChildren = this.Children.Select(i => i.Clone()).ToList();
}
// add flatten to the name to show what happened
newChildren[0].Name = this.Name + " - " + "Flattened".Localize();
// and replace us with the children
var replaceCommand = new ReplaceCommand(new[] { this }, newChildren);
if (undoBuffer != null)
{
undoBuffer.AddAndDo(replaceCommand);
}
else
{
replaceCommand.Do();
}
foreach (var child in newChildren[0].DescendantsAndSelf())
{
child.MakeNameNonColliding();
}
}
Invalidate(InvalidateType.Children);
}
public override async void OnInvalidate(InvalidateArgs invalidateArgs)
{
// TODO: color and output type could have special consideration that would not require a rebuild
// They could just propagate the color and output type to the correctly child and everything would be good
if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Children)
|| invalidateArgs.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateArgs.InvalidateType.HasFlag(InvalidateType.Mesh)
|| invalidateArgs.InvalidateType.HasFlag(InvalidateType.Path)
|| invalidateArgs.InvalidateType.HasFlag(InvalidateType.Color)
|| invalidateArgs.InvalidateType.HasFlag(InvalidateType.OutputType))
&& invalidateArgs.Source != this
&& !RebuildLocked)
{
await Rebuild();
}
else if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Properties) && invalidateArgs.Source == this))
{
await Rebuild();
}
//else if (SheetObject3D.NeedsRebuild(this, invalidateArgs))
//{
// await Rebuild();
//}
else
{
base.OnInvalidate(invalidateArgs);
}
}
public override void Remove(UndoBuffer undoBuffer)
{
using (RebuildLock())
{
List<IObject3D> newChildren = new List<IObject3D>();
// push our matrix into a copy of our children
foreach (var child in this.SourceContainer.Children)
{
var newChild = child.Clone();
newChildren.Add(newChild);
newChild.Matrix *= this.Matrix;
var flags = Object3DPropertyFlags.Visible;
if (this.Color.alpha != 0) flags |= Object3DPropertyFlags.Color;
if (this.OutputType != PrintOutputTypes.Default) flags |= Object3DPropertyFlags.OutputType;
if (this.MaterialIndex != -1) flags |= Object3DPropertyFlags.MaterialIndex;
newChild.CopyProperties(this, flags);
}
// and replace us with the children
var replaceCommand = new ReplaceCommand(new[] { this }, newChildren, false);
if (undoBuffer != null)
{
undoBuffer.AddAndDo(replaceCommand);
}
else
{
replaceCommand.Do();
}
}
Invalidate(InvalidateType.Children);
}
public void RemoveAllButSource()
{
var sourceContainer = SourceContainer;
this.Children.Modify(list =>
{
list.Clear();
list.Add(sourceContainer);
});
}
public async void WrapSelectedItemAndSelect(InteractiveScene scene)
{
using (RebuildLock())
{
var selectedItems = scene.GetSelectedItems();
if (selectedItems.Count > 0)
{
// clear the selected item
scene.SelectedItem = null;
using (RebuildLock())
{
var clonedItemsToAdd = new List<IObject3D>(selectedItems.Select((i) => i.Clone()));
Children.Modify((list) =>
{
list.Clear();
foreach (var child in clonedItemsToAdd)
{
list.Add(child);
}
});
}
scene.UndoBuffer.AddAndDo(
new ReplaceCommand(
new List<IObject3D>(selectedItems),
new List<IObject3D> { this }));
await this.Rebuild();
}
}
// and select this
var rootItem = this.Parents().Where(i => scene.Children.Contains(i)).FirstOrDefault();
if (rootItem != null)
{
scene.SelectedItem = rootItem;
}
scene.SelectedItem = this;
this.Invalidate(InvalidateType.Children);
}
}
public class OperationSourceObject3D : Object3D
{
public override bool CanFlatten => true;
public OperationSourceObject3D()
{
Name = "Source".Localize();
}
}
}

193
MatterControl.MeshOperations/PlaneCutObject3D.cs
View file

@ -1,193 +0,0 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using System.Threading.Tasks;
using ClipperLib;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DesignTools.Operations;
using MatterHackers.PolygonMesh;
using MatterHackers.PolygonMesh.Csg;
using MatterHackers.VectorMath;
using Polygons = System.Collections.Generic.List<System.Collections.Generic.List<ClipperLib.IntPoint>>;
namespace MatterHackers.MatterControl.DesignTools
{
public class PlaneCutObject3D : OperationSourceContainerObject3D, IPropertyGridModifier
{
public PlaneCutObject3D()
{
Name = "Plane Cut".Localize();
}
public double CutHeight { get; set; } = 10;
private double cutMargin = .01;
public Mesh Cut(IObject3D item)
{
var mesh = new Mesh(item.Mesh.Vertices, item.Mesh.Faces);
var itemMatrix = item.WorldMatrix(this);
mesh.Transform(itemMatrix);
// calculate and add the PWN face from the loops
var cutPlane = new Plane(Vector3.UnitZ, new Vector3(0, 0, CutHeight));
var slice = SliceLayer.CreateSlice(mesh, cutPlane);
// copy every face that is on or below the cut plane
// cut the faces at the cut plane
mesh.Split(new Plane(Vector3.UnitZ, CutHeight), cutMargin, cleanAndMerge: false);
// remove every face above the cut plane
RemoveFacesAboveCut(mesh);
slice.Vertices().TriangulateFaces(null, mesh, CutHeight);
mesh.Transform(itemMatrix.Inverted);
return mesh;
}
private void RemoveFacesAboveCut(Mesh mesh)
{
var newVertices = new List<Vector3Float>();
var newFaces = new List<Face>();
var facesToRemove = new HashSet<int>();
var cutRemove = CutHeight - cutMargin;
for (int i = 0; i < mesh.Faces.Count; i++)
{
var face = mesh.Faces[i];
if (mesh.Vertices[face.v0].Z >= cutRemove
&& mesh.Vertices[face.v1].Z >= cutRemove
&& mesh.Vertices[face.v2].Z >= cutRemove)
{
// record the face for removal
facesToRemove.Add(i);
}
}
// make a new list of all the faces we are keeping
var keptFaces = new List<Face>();
for (int i = 0; i < mesh.Faces.Count; i++)
{
if (!facesToRemove.Contains(i))
{
keptFaces.Add(mesh.Faces[i]);
}
}
var vertexCount = mesh.Vertices.Count;
// add the new vertices
mesh.Vertices.AddRange(newVertices);
// add the new faces (have to make the vertex indices to the new vertices
foreach (var newFace in newFaces)
{
Face faceNewIndices = newFace;
faceNewIndices.v0 += vertexCount;
faceNewIndices.v1 += vertexCount;
faceNewIndices.v2 += vertexCount;
keptFaces.Add(faceNewIndices);
}
mesh.Faces = new FaceList(keptFaces);
}
public override Task Rebuild()
{
this.DebugDepth("Rebuild");
var rebuildLocks = this.RebuilLockAll();
var valuesChanged = false;
return TaskBuilder(
"Plane Cut".Localize(),
(reporter, cancellationToken) =>
{
var newChildren = new List<Object3D>();
foreach (var sourceItem in SourceContainer.VisibleMeshes())
{
var reducedMesh = Cut(sourceItem);
var newMesh = new Object3D()
{
Mesh = reducedMesh,
OwnerID = sourceItem.ID
};
newMesh.CopyProperties(sourceItem, Object3DPropertyFlags.All);
newChildren.Add(newMesh);
}
RemoveAllButSource();
SourceContainer.Visible = false;
foreach (var child in newChildren)
{
this.Children.Add(child);
}
UiThread.RunOnIdle(() =>
{
rebuildLocks.Dispose();
if (valuesChanged)
{
Invalidate(InvalidateType.DisplayValues);
}
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
});
return Task.CompletedTask;
});
}
public void UpdateControls(PublicPropertyChange change)
{
}
}
public static class CutExtensionMethods
{
public static Polygons CreateUnion(this Polygons polygons, Polygons other)
{
Clipper clipper = new Clipper();
clipper.AddPaths(polygons, PolyType.ptSubject, true);
clipper.AddPaths(other, PolyType.ptSubject, true);
Polygons ret = new Polygons();
clipper.Execute(ClipType.ctUnion, ret, PolyFillType.pftNonZero, PolyFillType.pftNonZero);
return ret;
}
}
}