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

Added intersection

Browse source
This commit is contained in:
LarsBrubaker 2018-11-13 07:59:13 -08:00
parent 0ead07f8fd
commit 8e347340c4
2 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

61
MatterControlLib/PartPreviewWindow/View3D/Actions/IntersectionObject3D.cs
View file

@ -80,48 +80,45 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var participants = this.DescendantsAndSelf().Where((obj) => obj.OwnerID == this.ID);
if (participants.Count() > 1)
try
{
var first = participants.First();
var totalOperations = participants.Count() - 1;
double amountPerOperation = 1.0 / totalOperations;
double percentCompleted = 0;
foreach (var remove in participants)
if (participants.Count() > 1)
{
if (remove != first)
var first = participants.First();
var totalOperations = participants.Count() - 1;
double amountPerOperation = 1.0 / totalOperations;
double percentCompleted = 0;
foreach (var remove in participants)
{
var transformedRemove = remove.Mesh.Copy(CancellationToken.None);
transformedRemove.Transform(remove.WorldMatrix());
var transformedKeep = first.Mesh.Copy(CancellationToken.None);
transformedKeep.Transform(first.WorldMatrix());
transformedKeep = PolygonMesh.Csg.CsgOperations.Intersect(transformedKeep, transformedRemove, (status, progress0To1) =>
if (remove != first)
{
// Abort if flagged
cancellationToken.ThrowIfCancellationRequested();
var transformedRemove = remove.Mesh.Copy(CancellationToken.None);
transformedRemove.Transform(remove.WorldMatrix());
progressStatus.Status = status;
progressStatus.Progress0To1 = percentCompleted + amountPerOperation * progress0To1;
var transformedKeep = first.Mesh.Copy(CancellationToken.None);
transformedKeep.Transform(first.WorldMatrix());
var result = BooleanProcessing.Do(transformedKeep, transformedRemove, 2, reporter, amountPerOperation, percentCompleted, progressStatus, cancellationToken);
var inverse = first.WorldMatrix();
inverse.Invert();
result.Transform(inverse);
using (first.RebuildLock())
{
first.Mesh = result;
}
remove.Visible = false;
percentCompleted += amountPerOperation;
progressStatus.Progress0To1 = percentCompleted;
reporter.Report(progressStatus);
}, cancellationToken);
var inverse = first.WorldMatrix();
inverse.Invert();
transformedKeep.Transform(inverse);
using (first.RebuildLock())
{
first.Mesh = transformedKeep;
}
remove.Visible = false;
percentCompleted += amountPerOperation;
progressStatus.Progress0To1 = percentCompleted;
reporter.Report(progressStatus);
}
}
}
catch { }
UiThread.RunOnIdle(() =>
{

10
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs
View file

@ -262,7 +262,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}, cancellationToken);
case 2:
break;
return PolygonMesh.Csg.CsgOperations.Intersect(transformedKeep, transformedRemove, (status, progress0To1) =>
{
// Abort if flagged
cancellationToken.ThrowIfCancellationRequested();
progressStatus.Status = status;
progressStatus.Progress0To1 = percentCompleted + amountPerOperation * progress0To1;
reporter.Report(progressStatus);
}, cancellationToken);
}
return null;