From e57bf9daaeaac0fdf30afaa748171d6cdaa7b1ce Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 13 Aug 2018 18:39:09 -0700 Subject: [PATCH] Initialize new agg FileMissingMesh on load --- ApplicationView/ApplicationController.cs | 6 ++++++ StaticData/Stls/missing.stl | Bin 0 -> 18284 bytes Submodules/agg-sharp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 StaticData/Stls/missing.stl diff --git a/ApplicationView/ApplicationController.cs b/ApplicationView/ApplicationController.cs index d7667ea07..3a2bc47a2 100644 --- a/ApplicationView/ApplicationController.cs +++ b/ApplicationView/ApplicationController.cs @@ -69,6 +69,7 @@ namespace MatterHackers.MatterControl using MatterHackers.MatterControl.PrinterControls.PrinterConnections; using MatterHackers.MatterControl.SetupWizard; using MatterHackers.PolygonMesh; + using MatterHackers.PolygonMesh.Processors; using MatterHackers.RenderOpenGl; using MatterHackers.SerialPortCommunication; using MatterHackers.VectorMath; @@ -760,6 +761,11 @@ namespace MatterHackers.MatterControl Object3D.AssetsPath = Path.Combine(ApplicationDataStorage.Instance.ApplicationLibraryDataPath, "Assets"); + using (var meshSteam = AggContext.StaticData.OpenStream(Path.Combine("Stls", "missing.stl"))) + { + Object3D.FileMissingMesh = StlProcessing.Load(meshSteam, CancellationToken.None); + } + ScrollBar.DefaultMargin = new BorderDouble(right: 1); ScrollBar.ScrollBarWidth = 8 * GuiWidget.DeviceScale; ScrollBar.GrowThumbBy = 2; diff --git a/StaticData/Stls/missing.stl b/StaticData/Stls/missing.stl new file mode 100644 index 0000000000000000000000000000000000000000..526d71ceba29352289fc41dfcfecba8e82b546ef GIT binary patch literal 18284 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 NtpmAdf~*@=2LNHmSA+ln literal 0 HcmV?d00001 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 2edd3b61b..8949b3338 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 2edd3b61b87d29d1f70e9e0a36c5e25adf266726 +Subproject commit 8949b3338df5c93e674952a050443329784e782b