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

Putting in info for tool change timing

Browse source 
refactoring extruder index to tool index
This commit is contained in:
LarsBrubaker 2019-03-04 08:04:29 -08:00
parent 0c6a0fe4be
commit 457e31ef10
8 changed files with 41 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureExtrusion.cs
View file

@ -42,8 +42,8 @@ namespace MatterHackers.GCodeVisualizer
private Color color;
private Color gray;
public RenderFeatureExtrusion(Vector3 start, Vector3 end, int extruderIndex, double travelSpeed, double totalExtrusionMm, double filamentDiameterMm, double layerHeight, Color color, Color gray)
: base(start, end, extruderIndex, travelSpeed)
public RenderFeatureExtrusion(Vector3 start, Vector3 end, int toolIndex, double travelSpeed, double totalExtrusionMm, double filamentDiameterMm, double layerHeight, Color color, Color gray)
: base(start, end, toolIndex, travelSpeed)
{
this.color = color;
this.gray = gray;
@ -101,7 +101,7 @@ namespace MatterHackers.GCodeVisualizer
}
else
{
lineColor = renderInfo.GetMaterialColor(extruderIndex);
lineColor = renderInfo.GetMaterialColor(toolIndex);
}
CreateCylinder(colorVertexData, indexData, new Vector3(start), new Vector3(end), radius, 6, lineColor, layerHeight);
@ -130,7 +130,7 @@ namespace MatterHackers.GCodeVisualizer
}
else
{
extrusionColor = renderInfo.GetMaterialColor(extruderIndex);
extrusionColor = renderInfo.GetMaterialColor(toolIndex);
}
if (renderInfo.CurrentRenderType.HasFlag(RenderType.TransparentExtrusion))