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

Merge pull request #3083 from larsbrubaker/design_tools

Browse source 
Made subtract and replace ensure contrast with the inserted part
This commit is contained in:
Lars Brubaker 2018-03-15 22:24:24 -07:00 • committed by GitHub
commit e2229bbd56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
View file

@ -138,6 +138,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
item.Visible = true;
// set the mesh back to the child mesh
item.Mesh = item.Children.First().Mesh;
// and set the color back
item.Color = item.Children.First().Color;
}
}
}

2
PartPreviewWindow/View3D/Actions/SubtractAndReplace.cs
View file

@ -252,6 +252,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
paint.Mesh = paintMesh;
paint.Color = paint.WorldColor().AdjustContrast(keepObjects.First().WorldColor(), 2).ToColor();
// now set it to the new solid color
paint.OutputType = PrintOutputTypes.Solid;
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 6e7df2a849ad4028c4f451dea4b1fa220ef368e8
Subproject commit 11144110b2f997f2b107ff7c598ec243a9f4109a