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

Merge pull request #2559 from larsbrubaker/design_tools

Browse source 
Filter visible objects
This commit is contained in:
johnlewin 2017-10-17 19:17:08 -07:00 • committed by GitHub
commit c8e2c0ab37
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PartPreviewWindow/View3D/DifferenceObject3D.cs
View file

@ -122,9 +122,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
if (removeObjects.Any()
&& keepObjects.Any())
{
foreach (var keep in keepObjects)
foreach (var remove in removeObjects)
{
foreach (var remove in removeObjects)
foreach (var keep in keepObjects)
{
var transformedRemove = Mesh.Copy(remove.Mesh, CancellationToken.None);
transformedRemove.Transform(remove.WorldMatrix());
@ -138,6 +138,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
transformedKeep.Transform(inverse);
keep.Mesh = transformedKeep;
}
remove.Visible = false;
}
}
});

5
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -498,7 +498,10 @@ namespace MatterHackers.MeshVisualizer
List<MeshRenderData> transparentMeshes = new List<MeshRenderData>();
foreach (var object3D in scene.Children)
{
DrawObject(object3D, transparentMeshes, false, e);
if (object3D.Visible)
{
DrawObject(object3D, transparentMeshes, false, e);
}
}
transparentMeshes.Sort(BackToFrontXY);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 48c14ef068f4ca06f2c5c60d9c4fd9baf282575a
Subproject commit 0a95f55e75773792ee7d9e5be709d73e6a615b35