From 1ca5417fb008977b75a8095566d9cbbcd43fea01 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 10 Mar 2021 17:34:16 -0800 Subject: [PATCH] Don't draw texture when looking up from bed Enable and disable move buttons --- MatterControlLib/PartPreviewWindow/MainViewWidget.cs | 2 ++ .../PartPreviewWindow/SceneViewer/FloorDrawable.cs | 5 +++-- Submodules/agg-sharp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs index b0f8e60a9..a30199ea6 100644 --- a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs +++ b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs @@ -784,6 +784,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow Margin = new BorderDouble(3, 0), HoverColor = theme.AccentMimimalOverlay, VAnchor = VAnchor.Center, + Enabled = tabs.GetTabIndex(printerTab) > tabs.FirstMovableTab, }; moveLeftButton.Click += (s, e) => { @@ -799,6 +800,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow Margin = new BorderDouble(3, 0), HoverColor = theme.AccentMimimalOverlay, VAnchor = VAnchor.Center, + Enabled = printerTab.NextTab != null, }; moveRightButton.Click += (s, e) => diff --git a/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs b/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs index 7fe3d6c60..fe1daf045 100644 --- a/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs +++ b/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs @@ -99,10 +99,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow GLHelper.Render( sceneContext.Mesh, - theme.UnderBedColor, + theme.UnderBedColor.WithAlpha(0), RenderTypes.Shaded, world.ModelviewMatrix, - blendTexture: !this.LookingDownOnBed); + blendTexture: !this.LookingDownOnBed, + forceCullBackFaces: true); if (sceneContext.PrinterShape != null) { diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index be0aedaf8..c0d203ee7 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit be0aedaf800379d1409c5758ddb282fc63b0f98e +Subproject commit c0d203ee77bf0eddc6bd570132a4d2237c44309b