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

Cleaned up bug with union and intersection editor re-doing work

Browse source 
Made drawing selection optional
This commit is contained in:
Lars Brubaker 2018-03-06 14:48:14 -08:00
parent 2de4a22810
commit c2adfbc48f
6 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/PlatingHelper.cs
View file

@ -149,7 +149,7 @@ namespace MatterHackers.MatterControl
public static void PlaceOnBed(IObject3D object3D) public static void PlaceOnBed(IObject3D object3D)
{ {
AxisAlignedBoundingBox bounds = object3D.GetAxisAlignedBoundingBox(Matrix4X4.Identity, true); AxisAlignedBoundingBox bounds = object3D.GetAxisAlignedBoundingBox(Matrix4X4.Identity);
Vector3 boundsCenter = (bounds.maxXYZ + bounds.minXYZ) / 2; Vector3 boundsCenter = (bounds.maxXYZ + bounds.minXYZ) / 2;
object3D.Matrix *= Matrix4X4.CreateTranslation(new Vector3(0, 0, -boundsCenter.Z + bounds.ZSize / 2)); object3D.Matrix *= Matrix4X4.CreateTranslation(new Vector3(0, 0, -boundsCenter.Z + bounds.ZSize / 2));

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

@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
if (group is MeshWrapperOperation operationNode if (group is MeshWrapperOperation operationNode
&& operationNode.Children.All(c => c.OutputType != PrintOutputTypes.Hole)) && operationNode.Descendants().Where((obj) => obj.OwnerID == group.ID).All(c => c.OutputType != PrintOutputTypes.Hole))
{ {
bool first = true; bool first = true;
// set all but one mesh to look like holes // set all but one mesh to look like holes

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

@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
if (group is MeshWrapperOperation operationNode if (group is MeshWrapperOperation operationNode
&& operationNode.Children.All(c => c.OutputType != PrintOutputTypes.Hole)) && operationNode.Descendants().Where((obj) => obj.OwnerID == group.ID).All(c => c.OutputType != PrintOutputTypes.Hole))
{ {
bool first = true; bool first = true;
// set all but one mesh to look like holes // set all but one mesh to look like holes

8
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -484,15 +484,16 @@ namespace MatterHackers.MeshVisualizer
bool isSelected = parentSelected || bool isSelected = parentSelected ||
scene.HasSelection && (object3D == scene.SelectedItem || scene.SelectedItem.Children.Contains(object3D)); scene.HasSelection && (object3D == scene.SelectedItem || scene.SelectedItem.Children.Contains(object3D));
if (isSelected) if (isSelected && scene.DrawSelection)
{ {
var totalVertices = 0; var totalVertices = 0;
int maxVerticesToRenderOutline = 1000;
foreach (var visibleMesh in object3D.VisibleMeshes()) foreach (var visibleMesh in object3D.VisibleMeshes())
{ {
totalVertices += visibleMesh.Mesh.Vertices.Count; totalVertices += visibleMesh.Mesh.Vertices.Count;
if (totalVertices > 1000) if (totalVertices > maxVerticesToRenderOutline)
{ {
break; break;
} }
@ -517,8 +518,7 @@ namespace MatterHackers.MeshVisualizer
Invalidate(); Invalidate();
} }
bool tooBigForComplexSelection = totalVertices > 1000; if (totalVertices > maxVerticesToRenderOutline
if (tooBigForComplexSelection
&& scene.DebugItem == null) && scene.DebugItem == null)
{ {
GLHelper.PrepareFor3DLineRender(true); GLHelper.PrepareFor3DLineRender(true);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 2e011242b083bf6ebdc723dc5768a85ac6b8227d Subproject commit d0db172015d632bda42184e18a63158c94b7dd97

16
TextCreator/app.config
View file

@ -1,11 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral"/> <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0"/> <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>