From cdb9598faaf7a642bc69d27d8cf01e1fa423d448 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 20 Nov 2017 13:29:01 -0800 Subject: [PATCH] improved color delegate for mesh --- PartPreviewWindow/View3D/View3DWidget.cs | 10 ++-------- Submodules/agg-sharp | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 8f6157017..b2d24c733 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -2211,9 +2211,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // change the color to be the right thing GLMeshTrianglePlugin.Get( meshRenderData.Mesh, - (faceEdge) => + (normal) => { - Vector3 normal = faceEdge.ContainingFace.Normal; normal = Vector3.TransformVector(normal, meshRenderData.WorldMatrix()).GetNormal(); double startColor = 223.0 / 360.0; @@ -2226,12 +2225,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow color = ColorF.FromHSL(startColor - delta * normal.Z, .99, .49).ToColor(); } - return new VertexColorData - { - red = color.red, - green = color.green, - blue = color.blue - }; + return color; }); } }); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 6d7b1af60..e6da5897e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 6d7b1af6000c63b09302be70cd9757de7eff2f57 +Subproject commit e6da5897ea3f55b60f74281e440ad959a3d86166