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

Making subtract select logical names from children rather than visible meshes

Browse source
This commit is contained in:
Lars Brubaker 2019-03-22 10:29:05 -07:00
parent 4c9b5b39d0
commit 3f19e8d11c
4 changed files with 70 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControlLib/DesignTools/Primitives/TextObject3D.cs
View file

@ -155,7 +155,8 @@ namespace MatterHackers.MatterControl.DesignTools
list.Add(new Object3D()
{
Mesh = VertexSourceToMesh.Extrude(scaledLetterPrinter, this.Height),
Matrix = Matrix4X4.CreateTranslation(offest, 0, 0)
Matrix = Matrix4X4.CreateTranslation(offest, 0, 0),
Name = letter.ToString()
});
offest += letterPrinter.GetSize(letter.ToString()).X * pointsToMm;

6
MatterControlLib/DesignTools/PublicPropertyEditor.cs
View file

@ -640,11 +640,13 @@ namespace MatterHackers.MatterControl.DesignTools
return new ImageWidget(imageBuffer);
}
private static GuiWidget CreateSourceChildSelector(SelectedChildren childSelector, OperationSourceContainerObject3D sourceCantainer, ThemeConfig theme)
private static GuiWidget CreateSourceChildSelector(SelectedChildren childSelector, OperationSourceContainerObject3D sourceContainer, ThemeConfig theme)
{
GuiWidget tabContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
var sourceChildren = sourceCantainer.SourceContainer.VisibleMeshes().ToList();
var parentOfSubtractTargets = sourceContainer.SourceContainer.DescendantsAndSelfMultipleChildrenFirstOrSelf();
var sourceChildren = parentOfSubtractTargets.Children.ToList();
var objectChecks = new Dictionary<ICheckbox, IObject3D>();

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

@ -130,13 +130,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
var removeObjects = this.Children
.Where((i) => ItemInSubtractList(i))
.SelectMany((h) => h.DescendantsAndSelf())
.Where((c) => c.OwnerID == this.ID).ToList();
.Where(i => ItemInSubtractList(i))
.SelectMany(h => h.DescendantsAndSelf())
.Where(c => c.OwnerID == this.ID).ToList();
var keepObjects = this.Children
.Where((i) => !ItemInSubtractList(i))
.SelectMany((h) => h.DescendantsAndSelf())
.Where((c) => c.OwnerID == this.ID).ToList();
.Where(i => !ItemInSubtractList(i))
.SelectMany(h => h.DescendantsAndSelf())
.Where(c => c.OwnerID == this.ID).ToList();
if (removeObjects.Any()
&& keepObjects.Any())

97
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D_2.cs
View file

@ -60,34 +60,46 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
suppressNormalDraw = true;
var removeObjects = this.SourceContainer.VisibleMeshes()
.Where((i) => SelectedChildren.Contains(i.Name)).ToList();
var keepObjects = this.SourceContainer.VisibleMeshes()
.Where((i) => !SelectedChildren.Contains(i.Name)).ToList();
var parentOfSubtractTargets = SourceContainer.DescendantsAndSelfMultipleChildrenFirstOrSelf();
var removeObjects = parentOfSubtractTargets.Children
.Where((i) => SelectedChildren
.Contains(i.Name))
.SelectMany(c => c.VisibleMeshes())
.ToList();
foreach (var item in removeObjects)
{
transparentMeshes.Add(new Object3DView(item, new Color(item.WorldColor(SourceContainer), 128)));
}
foreach (var item in keepObjects)
var keepObjects = parentOfSubtractTargets.Children
.Where((i) => !SelectedChildren
.Contains(i.Name))
.ToList();
foreach (var keepItem in keepObjects)
{
var subtractChild = this.Children.Where(i => i.Name == item.Name).FirstOrDefault();
if (subtractChild != null)
var subtractChild = this.Children.Where(i => i.Name == keepItem.Name).FirstOrDefault() != null;
foreach (var item in keepItem.VisibleMeshes())
{
GLHelper.Render(subtractChild.Mesh,
subtractChild.Color,
subtractChild.WorldMatrix(),
RenderTypes.Outlines,
subtractChild.WorldMatrix() * layer.World.ModelviewMatrix);
}
else
{
GLHelper.Render(item.Mesh,
item.WorldColor(SourceContainer),
item.WorldMatrix(),
RenderTypes.Outlines,
item.WorldMatrix() * layer.World.ModelviewMatrix);
if (subtractChild)
{
GLHelper.Render(item.Mesh,
Color.Transparent, // item.Color,
item.WorldMatrix(),
RenderTypes.Outlines,
item.WorldMatrix() * layer.World.ModelviewMatrix);
suppressNormalDraw = false;
}
else
{
GLHelper.Render(item.Mesh,
item.WorldColor(SourceContainer),
item.WorldMatrix(),
RenderTypes.Outlines,
item.WorldMatrix() * layer.World.ModelviewMatrix);
}
}
}
}
@ -152,15 +164,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
SourceContainer.Visible = true;
RemoveAllButSource();
var visibleMeshes = SourceContainer.VisibleMeshes();
if (visibleMeshes.Count() < 2)
var parentOfSubtractTargets = SourceContainer.DescendantsAndSelfMultipleChildrenFirstOrSelf();
if (parentOfSubtractTargets.Children.Count() < 2)
{
if (visibleMeshes.Count() == 1)
if (parentOfSubtractTargets.Children.Count() == 1)
{
var newMesh = new Object3D();
newMesh.CopyProperties(visibleMeshes.First(), Object3DPropertyFlags.All);
newMesh.Mesh = visibleMeshes.First().Mesh;
this.Children.Add(newMesh);
this.Children.Add(SourceContainer.Clone());
SourceContainer.Visible = false;
}
return;
@ -168,26 +178,33 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
CleanUpSelectedChildrenNames(this);
var removeObjects = this.SourceContainer.VisibleMeshes()
.Where((i) => SelectedChildren.Contains(i.Name)).ToList();
var keepObjects = this.SourceContainer.VisibleMeshes()
.Where((i) => !SelectedChildren.Contains(i.Name)).ToList();
var removeVisibleItems = parentOfSubtractTargets.Children
.Where((i) => SelectedChildren
.Contains(i.Name))
.SelectMany(c => c.VisibleMeshes())
.ToList();
if (removeObjects.Any()
&& keepObjects.Any())
var keepItems = parentOfSubtractTargets.Children
.Where((i) => !SelectedChildren
.Contains(i.Name));
var keepVisibleItems = keepItems.SelectMany(c => c.VisibleMeshes()).ToList();
if (removeVisibleItems.Any()
&& keepVisibleItems.Any())
{
var totalOperations = removeObjects.Count * keepObjects.Count;
var totalOperations = removeVisibleItems.Count * keepVisibleItems.Count;
double amountPerOperation = 1.0 / totalOperations;
double percentCompleted = 0;
ProgressStatus progressStatus = new ProgressStatus();
progressStatus.Status = "Do CSG";
foreach (var keep in keepObjects)
foreach (var keep in keepVisibleItems)
{
var resultsMesh = keep.Mesh;
var keepWorldMatrix = keep.WorldMatrix(SourceContainer);
foreach (var remove in removeObjects)
foreach (var remove in removeVisibleItems)
{
resultsMesh = BooleanProcessing.Do(resultsMesh, keepWorldMatrix,
remove.Mesh, remove.WorldMatrix(SourceContainer),
@ -209,7 +226,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
Visible = false
};
// copy all the properties but the matrix
resultsItem.CopyProperties(keep, Object3DPropertyFlags.All & (~(Object3DPropertyFlags.Matrix | Object3DPropertyFlags.Visible)));
resultsItem.CopyWorldProperties(keep, SourceContainer, Object3DPropertyFlags.All & (~(Object3DPropertyFlags.Matrix | Object3DPropertyFlags.Visible)));
// and add it to this
this.Children.Add(resultsItem);
}
@ -235,8 +252,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
if (item is ISelectableChildContainer selectableChildContainer)
{
var allVisibleNames = item.SourceContainer.VisibleMeshes().Select(i => i.Name);
// remove any names from SelectedChildren that are not in visible meshes
var parentOfSubtractTargets = item.DescendantsAndSelfMultipleChildrenFirstOrSelf();
var allVisibleNames = parentOfSubtractTargets.Children.Select(i => i.Name);
// remove any names from SelectedChildren that are not a child we can select
foreach (var name in selectableChildContainer.SelectedChildren.ToArray())
{
if (!allVisibleNames.Contains(name))