From 721f41e74da485cba60b7b26cd93ee43f0daafe4 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 12 May 2022 18:15:07 -0700 Subject: [PATCH] Making abutted faces union correctly --- .../PartPreviewWindow/SelectedObjectPanel.cs | 16 +++++++++++----- Submodules/agg-sharp | 2 +- .../MatterControl/InteractiveSceneTests.cs | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs index 1b5bc7b90..5d6f4bf35 100644 --- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs +++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs @@ -368,11 +368,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow void SetToSolid() { // make sure the render mode is set to shaded or outline - if (sceneContext.ViewState.RenderType != RenderOpenGl.RenderTypes.Shaded - && sceneContext.ViewState.RenderType != RenderOpenGl.RenderTypes.Outlines) - { - // make sure the render mode is set to outline - sceneContext.ViewState.RenderType = RenderOpenGl.RenderTypes.Outlines; + switch(sceneContext.ViewState.RenderType) + { + case RenderOpenGl.RenderTypes.Shaded: + case RenderOpenGl.RenderTypes.Outlines: + case RenderOpenGl.RenderTypes.Polygons: + break; + + default: + // make sure the render mode is set to outline + sceneContext.ViewState.RenderType = RenderOpenGl.RenderTypes.Outlines; + break; } var currentOutputType = selectedItem.WorldOutputType(); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 8b8b6938b..575426301 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 8b8b6938b05a8780f079d2f2b6f9a69d621e090e +Subproject commit 5754263017523527f1c076b0c667fe56abb6e5bd diff --git a/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs b/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs index 60aa6a925..83d40c980 100644 --- a/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs @@ -625,7 +625,7 @@ namespace MatterControl.Tests.MatterControl new CancellationToken()); Assert.AreEqual(12, mesh.Faces.Count()); var aabb = mesh.GetAxisAlignedBoundingBox(); - Assert.AreEqual(15, aabb.YSize, .001); + Assert.AreEqual(20, aabb.YSize, .001); } }