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

Add missing changes

Browse source
This commit is contained in:
John Lewin 2017-10-21 16:09:39 -07:00
parent cc0415f3ae
commit f86491f962
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -80,6 +80,9 @@ namespace MatterHackers.MeshVisualizer
private double selectionHighlightWidth = 5;
private RGBA_Bytes debugBorderColor = RGBA_Bytes.Green;
private RGBA_Bytes debugNotSelectedFillColor = new RGBA_Bytes(RGBA_Bytes.White, 120);
public MeshViewerWidget(BedConfig sceneContext, InteractionLayer interactionLayer, string startingTextMessage = "", EditorType editorType = EditorType.Part)
{
this.EditorMode = editorType;
@ -139,9 +142,6 @@ namespace MatterHackers.MeshVisualizer
return totalMeshBounds;
}
private RGBA_Bytes debugBorderColor = RGBA_Bytes.Green;
private RGBA_Bytes debugNotSelectedFillColor = new RGBA_Bytes(RGBA_Bytes.White, 120);
public override void OnLoad(EventArgs args)
{
// some debug code to be able to click on parts
@ -154,13 +154,6 @@ namespace MatterHackers.MeshVisualizer
this.World.RenderDebugAABB(e.graphics2D, child.TraceData().GetAxisAlignedBoundingBox());
this.World.RenderDebugAABB(e.graphics2D, child.GetAxisAlignedBoundingBox(Matrix4X4.Identity));
}
if (scene.DebugItem?.Mesh != null)
{
var debugItem = scene.DebugItem;
GLHelper.Render(debugItem.Mesh, debugBorderColor, debugItem.WorldMatrix(), RenderTypes.Wireframe, debugItem.WorldMatrix() * World.ModelviewMatrix);
}
};
}
@ -588,6 +581,12 @@ namespace MatterHackers.MeshVisualizer
}
DrawInteractionVolumes(e);
if (scene.DebugItem?.Mesh != null)
{
var debugItem = scene.DebugItem;
GLHelper.Render(debugItem.Mesh, debugBorderColor, debugItem.WorldMatrix(), RenderTypes.Wireframe, debugItem.WorldMatrix() * World.ModelviewMatrix);
}
}
private void RenderBedMesh(bool lookingDownOnBed)

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 9db3d4a585f26ab052a4746b276c6a06b9879aab
Subproject commit 4011d93a02003dcaf97a521b4c15ad98aa57a1f0