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

Changed RGBA_Bytes -> Color

Browse source
This commit is contained in:
Lars Brubaker 2017-10-31 11:43:25 -07:00
parent c6a3c14118
commit 8d1fecab8c
107 changed files with 495 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PartPreviewWindow/View3D/BedMeshGenerator.cs
View file

@ -44,8 +44,8 @@ namespace MatterHackers.MatterControl
{
private static ImageBuffer watermarkImage = null;
private RGBA_Bytes bedBaseColor = new RGBA_Bytes(245, 245, 255);
private RGBA_Bytes bedMarkingsColor = RGBA_Bytes.Black;
private Color bedBaseColor = new Color(245, 245, 255);
private Color bedMarkingsColor = Color.Black;
private Mesh printerBed = null;
public Mesh CreatePrintBed(PrinterConfig printer)

6
PartPreviewWindow/View3D/ColorSwatchSelector.cs
View file

@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
var colorCount = 9;
double[] lightness = new double[] { .7, .5, .3 };
RGBA_Bytes[] grayLevel = new RGBA_Bytes[] { RGBA_Bytes.White, new RGBA_Bytes(180, 180, 180), RGBA_Bytes.Gray };
Color[] grayLevel = new Color[] { Color.White, new Color(180, 180, 180), Color.Gray };
for (int rowIndex = 0; rowIndex < lightness.Length; rowIndex++)
{
var colorRow = new FlowLayoutWidget();
@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
for (int colorIndex = 0; colorIndex < colorCount; colorIndex++)
{
var color = RGBA_Floats.FromHSL(colorIndex / (double)colorCount, 1, lightness[rowIndex]).GetAsRGBA_Bytes();
var color = ColorF.FromHSL(colorIndex / (double)colorCount, 1, lightness[rowIndex]).GetAsRGBA_Bytes();
colorRow.AddChild(MakeColorButton(scene, color));
}
@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
private Button MakeColorButton(InteractiveScene scene, RGBA_Bytes color)
private Button MakeColorButton(InteractiveScene scene, Color color)
{
GuiWidget colorWidget;
var button = new Button(colorWidget = new GuiWidget()

8
PartPreviewWindow/View3D/DebugBvh.cs
View file

@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
Mesh lineMesh = PlatonicSolids.CreateCube(1, 1, 1);
private void RenderLine(Matrix4X4 transform, Vector3 start, Vector3 end, RGBA_Bytes color, bool zBuffered = true)
private void RenderLine(Matrix4X4 transform, Vector3 start, Vector3 end, Color color, bool zBuffered = true)
{
Vector3 lineCenter = (start + end) / 2;
@ -71,19 +71,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (zBuffered)
{
GLHelper.Render(lineMesh, RGBA_Bytes.Black, lineTransform, RenderTypes.Shaded);
GLHelper.Render(lineMesh, Color.Black, lineTransform, RenderTypes.Shaded);
//drawEvent.graphics2D.Line(cornerPositionScreen, cornerPositionCcwScreen, RGBA_Bytes.Gray);
}
else
{
// render on top of everything very lightly
GLHelper.Render(lineMesh, new RGBA_Bytes(RGBA_Bytes.Black, 5), lineTransform, RenderTypes.Shaded);
GLHelper.Render(lineMesh, new Color(Color.Black, 5), lineTransform, RenderTypes.Shaded);
}
}
private void RenderBounds(AxisAlignedBoundingBox aabb)
{
RGBA_Bytes color = RGBA_Bytes.Red;
Color color = Color.Red;
// the bottom
RenderLine(transform.Peek(), aabb.GetBottomCorner(0), aabb.GetBottomCorner(1), color);

4
PartPreviewWindow/View3D/GridOptionsPanel.cs
View file

@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.AddChild(new TextWidget("Snap Grid".Localize())
{
TextColor = RGBA_Bytes.Black,
TextColor = Color.Black,
Margin = new BorderDouble(0, 0, 0, 10)
});
@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var dropDownList = new DropDownList("Custom", Direction.Down)
{
TextColor = RGBA_Bytes.Black
TextColor = Color.Black
};
foreach (var snapSetting in snapSettings)

8
PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs
View file

@ -162,11 +162,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// don't draw if any other control is dragging
if (MouseOver)
{
GLHelper.Render(upArrowMesh, RGBA_Bytes.Red, TotalTransform, RenderTypes.Shaded);
GLHelper.Render(upArrowMesh, Color.Red, TotalTransform, RenderTypes.Shaded);
}
else
{
GLHelper.Render(upArrowMesh, RGBA_Bytes.Black, TotalTransform, RenderTypes.Shaded);
GLHelper.Render(upArrowMesh, Color.Black, TotalTransform, RenderTypes.Shaded);
}
}
}
@ -297,12 +297,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
for (int i = 0; i < lines.Count; i += 2)
{
// draw the measure line
drawEvent.graphics2D.Line(lines[i], lines[i + 1], RGBA_Bytes.Black);
drawEvent.graphics2D.Line(lines[i], lines[i + 1], Color.Black);
}
for (int i = 0; i < lines.Count; i += 4)
{
DrawMeasureLine(drawEvent.graphics2D, (lines[i] + lines[i + 1]) / 2, (lines[i + 2] + lines[i + 3]) / 2, RGBA_Bytes.Black, LineArrows.Both);
DrawMeasureLine(drawEvent.graphics2D, (lines[i] + lines[i + 1]) / 2, (lines[i + 2] + lines[i + 3]) / 2, Color.Black, LineArrows.Both);
}
AxisAlignedBoundingBox selectedBounds = selectedItem.GetAxisAlignedBoundingBox(Matrix4X4.Identity);

10
PartPreviewWindow/View3D/Gui3D/SelectionShadow.cs
View file

@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
static Mesh normalShadowMesh;
static Mesh demoShadowMesh;
static RGBA_Bytes shadowColor = new RGBA_Bytes(22, 80, 220);
static Color shadowColor = new Color(22, 80, 220);
readonly int shadowAlpha = 40;
@ -88,9 +88,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
demoTextPrinter.Origin = new Vector2(0, -bounds.Bottom / scale / 2);
Graphics2D imageGraphics = demoTexture.NewGraphics2D();
imageGraphics.Clear(new RGBA_Bytes(RGBA_Bytes.White, shadowAlpha));
imageGraphics.Clear(new Color(Color.White, shadowAlpha));
imageGraphics.Render(new VertexSourceApplyTransform(demoTextPrinter, Affine.NewScaling(scale, scale)), new RGBA_Bytes(RGBA_Bytes.White, 100));
imageGraphics.Render(new VertexSourceApplyTransform(demoTextPrinter, Affine.NewScaling(scale, scale)), new Color(Color.White, 100));
int count = 0;
ImageBuffer clearImage = new ImageBuffer(2, 2, 32, new BlenderBGRA());
@ -126,11 +126,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
//bool authorized = ApplicationController.Instance.ActiveView3DWidget?.ActiveSelectionEditor?.Unlocked == true;
if (true) //authorized)
{
GLHelper.Render(GetNormalShadowMesh(), new RGBA_Bytes(shadowColor, shadowAlpha), withScale, RenderTypes.Shaded);
GLHelper.Render(GetNormalShadowMesh(), new Color(shadowColor, shadowAlpha), withScale, RenderTypes.Shaded);
}
else
{
GLHelper.Render(GetDemoShadowMesh(), new RGBA_Bytes(shadowColor, 254), withScale, RenderTypes.Shaded);
GLHelper.Render(GetDemoShadowMesh(), new Color(shadowColor, 254), withScale, RenderTypes.Shaded);
}
}

4
PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs
View file

@ -123,8 +123,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (drawEvent != null)
{
// draw the line that is on the ground
drawEvent.graphics2D.Line(lines[0], lines[1], RGBA_Bytes.Red);
drawEvent.graphics2D.Line(lines[2], lines[3], RGBA_Bytes.Red);
drawEvent.graphics2D.Line(lines[0], lines[1], Color.Red);
drawEvent.graphics2D.Line(lines[2], lines[3], Color.Red);
}
}
}

8
PartPreviewWindow/View3D/InteractionVolume.cs
View file

@ -82,9 +82,9 @@ namespace MatterHackers.MeshVisualizer
protected double SecondsToShowNumberEdit { get; private set; } = 4;
protected Stopwatch timeSinceMouseUp { get; private set; } = new Stopwatch();
public static void DrawMeasureLine(Graphics2D graphics2D, Vector2 lineStart, Vector2 lineEnd, RGBA_Bytes color, LineArrows arrows)
public static void DrawMeasureLine(Graphics2D graphics2D, Vector2 lineStart, Vector2 lineEnd, Color color, LineArrows arrows)
{
graphics2D.Line(lineStart, lineEnd, RGBA_Bytes.Black);
graphics2D.Line(lineStart, lineEnd, Color.Black);
Vector2 direction = lineEnd - lineStart;
if (direction.LengthSquared > 0
@ -99,14 +99,14 @@ namespace MatterHackers.MeshVisualizer
double rotation = Math.Atan2(direction.y, direction.x);
IVertexSource correctRotation = new VertexSourceApplyTransform(arrow, Affine.NewRotation(rotation - MathHelper.Tau / 4));
IVertexSource inPosition = new VertexSourceApplyTransform(correctRotation, Affine.NewTranslation(lineEnd));
graphics2D.Render(inPosition, RGBA_Bytes.Black);
graphics2D.Render(inPosition, Color.Black);
}
if (arrows.HasFlag(LineArrows.Start))
{
double rotation = Math.Atan2(direction.y, direction.x) + MathHelper.Tau / 2;
IVertexSource correctRotation = new VertexSourceApplyTransform(arrow, Affine.NewRotation(rotation - MathHelper.Tau / 4));
IVertexSource inPosition = new VertexSourceApplyTransform(correctRotation, Affine.NewTranslation(lineStart));
graphics2D.Render(inPosition, RGBA_Bytes.Black);
graphics2D.Render(inPosition, Color.Black);
}
}
}

42
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -61,9 +61,9 @@ namespace MatterHackers.MeshVisualizer
public static class MatterialRendering
{
public static RGBA_Bytes Color(int materialIndex)
public static Color Color(int materialIndex)
{
return RGBA_Floats.FromHSL(Math.Max(materialIndex, 0) / 10.0, .99, .49).GetAsRGBA_Bytes();
return ColorF.FromHSL(Math.Max(materialIndex, 0) / 10.0, .99, .49).GetAsRGBA_Bytes();
}
}
@ -80,8 +80,8 @@ 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);
private Color debugBorderColor = Color.Green;
private Color debugNotSelectedFillColor = new Color(Color.White, 120);
public MeshViewerWidget(BedConfig sceneContext, InteractionLayer interactionLayer, string startingTextMessage = "", EditorType editorType = EditorType.Part)
{
@ -98,8 +98,8 @@ namespace MatterHackers.MeshVisualizer
RenderType = RenderTypes.Shaded;
RenderBed = true;
RenderBuildVolume = false;
BedColor = new RGBA_Floats(.8, .8, .8, .7).GetAsRGBA_Bytes();
BuildVolumeColor = new RGBA_Floats(.2, .8, .3, .2).GetAsRGBA_Bytes();
BedColor = new ColorF(.8, .8, .8, .7).GetAsRGBA_Bytes();
BuildVolumeColor = new ColorF(.2, .8, .3, .2).GetAsRGBA_Bytes();
this.interactionLayer.DrawGlOpaqueContent += Draw_GlOpaqueContent;
this.interactionLayer.DrawGlTransparentContent += Draw_GlTransparentContent;
@ -117,9 +117,9 @@ namespace MatterHackers.MeshVisualizer
public bool AllowBedRenderingWhenEmpty { get; set; }
public RGBA_Bytes BedColor { get; set; }
public Color BedColor { get; set; }
public RGBA_Bytes BuildVolumeColor { get; set; }
public Color BuildVolumeColor { get; set; }
public static AxisAlignedBoundingBox GetAxisAlignedBoundingBox(List<MeshGroup> meshGroups)
{
@ -288,7 +288,7 @@ namespace MatterHackers.MeshVisualizer
#endif
}
public static RGBA_Bytes GetExtruderColor(int extruderIndex)
public static Color GetExtruderColor(int extruderIndex)
{
return MatterialRendering.Color(extruderIndex);
}
@ -390,7 +390,7 @@ namespace MatterHackers.MeshVisualizer
&& (object3D == scene.SelectedItem || scene.SelectedItem.Children.Contains(object3D)))
{
GLHelper.PrepareFor3DLineRender(true);
RenderAABB(frustum, object3D.GetAxisAlignedBoundingBox(Matrix4X4.Identity), Matrix4X4.Identity, RGBA_Bytes.White, selectionHighlightWidth);
RenderAABB(frustum, object3D.GetAxisAlignedBoundingBox(Matrix4X4.Identity), Matrix4X4.Identity, Color.White, selectionHighlightWidth);
GL.Enable(EnableCap.Lighting);
}
@ -399,14 +399,14 @@ namespace MatterHackers.MeshVisualizer
bool isSelected = parentSelected ||
scene.HasSelection && (object3D == scene.SelectedItem || scene.SelectedItem.Children.Contains(object3D));
RGBA_Bytes drawColor = renderData.WorldColor();
Color drawColor = renderData.WorldColor();
if (renderData.WorldOutputType() == PrintOutputTypes.Support)
{
drawColor = new RGBA_Bytes(RGBA_Bytes.Yellow, 120);
drawColor = new Color(Color.Yellow, 120);
}
else if (renderData.WorldOutputType() == PrintOutputTypes.Hole)
{
drawColor = new RGBA_Bytes(RGBA_Bytes.Gray, 120);
drawColor = new Color(Color.Gray, 120);
}
// check if we should be rendering materials (this overrides the other colors)
@ -484,7 +484,7 @@ namespace MatterHackers.MeshVisualizer
var transformed1 = Vector3.Transform(faceCenter, renderData.Matrix);
var normal = Vector3.TransformNormal(face.Normal, renderData.Matrix).GetNormal();
GLHelper.Render3DLineNoPrep(frustum, World, transformed1, transformed1 + normal, RGBA_Bytes.Red, 2);
GLHelper.Render3DLineNoPrep(frustum, World, transformed1, transformed1 + normal, Color.Red, 2);
}
}
@ -517,18 +517,18 @@ namespace MatterHackers.MeshVisualizer
var transformed1 = Vector3.Transform(meshEdge.VertexOnEnd[0].Position, renderData.WorldMatrix());
var transformed2 = Vector3.Transform(meshEdge.VertexOnEnd[1].Position, renderData.WorldMatrix());
GLHelper.Render3DLineNoPrep(frustum, World, transformed1, transformed2, RGBA_Bytes.White, selectionHighlightWidth);
GLHelper.Render3DLineNoPrep(frustum, World, transformed1, transformed2, Color.White, selectionHighlightWidth);
}
}
}
}
else // just render the bounding box
{
RenderAABB(frustum, renderData.Mesh.GetAxisAlignedBoundingBox(), renderData.WorldMatrix(), RGBA_Bytes.White, selectionHighlightWidth);
RenderAABB(frustum, renderData.Mesh.GetAxisAlignedBoundingBox(), renderData.WorldMatrix(), Color.White, selectionHighlightWidth);
}
}
void RenderAABB(Frustum frustum, AxisAlignedBoundingBox bounds, Matrix4X4 matrix, RGBA_Bytes color, double width)
void RenderAABB(Frustum frustum, AxisAlignedBoundingBox bounds, Matrix4X4 matrix, Color color, double width)
{
for (int i = 0; i < 4; i++)
{
@ -618,11 +618,11 @@ namespace MatterHackers.MeshVisualizer
double big = 10;
double small = 1;
Mesh xAxis = PlatonicSolids.CreateCube(big, small, small);
GLHelper.Render(xAxis, RGBA_Bytes.Red);
GLHelper.Render(xAxis, Color.Red);
Mesh yAxis = PlatonicSolids.CreateCube(small, big, small);
GLHelper.Render(yAxis, RGBA_Bytes.Green);
GLHelper.Render(yAxis, Color.Green);
Mesh zAxis = PlatonicSolids.CreateCube(small, small, big);
GLHelper.Render(zAxis, RGBA_Bytes.Blue);
GLHelper.Render(zAxis, Color.Blue);
}
}
@ -645,7 +645,7 @@ namespace MatterHackers.MeshVisualizer
var bedColor = this.BedColor;
if (!lookingDownOnBed)
{
bedColor = new RGBA_Bytes(this.BedColor, this.BedColor.alpha / 4);
bedColor = new Color(this.BedColor, this.BedColor.alpha / 4);
}
GLHelper.Render(sceneContext.Mesh, bedColor, RenderTypes.Shaded, World.ModelviewMatrix);
if (sceneContext.PrinterShape != null)

2
PartPreviewWindow/View3D/SlicePopupMenu.cs
View file

@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
this.AddChild(operationText);
progressControl = new ProgressControl("", RGBA_Bytes.Black, RGBA_Bytes.Black)
progressControl = new ProgressControl("", Color.Black, Color.Black)
{
HAnchor = HAnchor.Left
};

36
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private bool hasDrawn = false;
private ProgressControl processingProgressControl;
private RGBA_Bytes[] SelectionColors = new RGBA_Bytes[] { new RGBA_Bytes(131, 4, 66), new RGBA_Bytes(227, 31, 61), new RGBA_Bytes(255, 148, 1), new RGBA_Bytes(247, 224, 23), new RGBA_Bytes(143, 212, 1) };
private Color[] SelectionColors = new Color[] { new Color(131, 4, 66), new Color(227, 31, 61), new Color(255, 148, 1), new Color(247, 224, 23), new Color(143, 212, 1) };
private Stopwatch timeSinceLastSpin = new Stopwatch();
private Stopwatch timeSinceReported = new Stopwatch();
private Matrix4X4 transformOnMouseDown = Matrix4X4.Identity;
@ -423,7 +423,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
selectedObjectPanel = new SelectedObjectPanel(this, this.Scene, theme)
{
BackgroundColor = new RGBA_Bytes(0, 0, 0, theme.OverlayAlpha),
BackgroundColor = new Color(0, 0, 0, theme.OverlayAlpha),
VAnchor = VAnchor.Top | VAnchor.Fit,
HAnchor = HAnchor.Left | HAnchor.Fit,
};
@ -567,7 +567,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
AxisAlignedBoundingBox selectedBounds = this.Scene.SelectedItem.GetAxisAlignedBoundingBox(Matrix4X4.Identity);
var drawCenter = CurrentSelectInfo.PlaneDownHitPos;
var drawColor = new RGBA_Bytes(RGBA_Bytes.Red, 20);
var drawColor = new Color(Color.Red, 20);
bool zBuffer = false;
for (int i = 0; i < 2; i++)
@ -580,7 +580,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
drawCenter - new Vector3(0, -50, 0),
drawCenter - new Vector3(0, 50, 0), drawColor, zBuffer, 2);
drawColor = RGBA_Bytes.Black;
drawColor = Color.Black;
drawCenter.z = 0;
zBuffer = true;
}
@ -978,7 +978,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (DragSelectionInProgress)
{
var selectionRectangle = new RectangleDouble(DragSelectionStartPosition, DragSelectionEndPosition);
e.graphics2D.Rectangle(selectionRectangle, RGBA_Bytes.Red);
e.graphics2D.Rectangle(selectionRectangle, Color.Red);
}
}
@ -1107,9 +1107,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Vector3 topEndPosition = Vector3.Transform(x.Bvh.GetAxisAlignedBoundingBox().GetTopCorner((i + 1) % 4), x.TransformToWorld);
var topEndScreenPos = this.World.GetScreenPosition(topEndPosition);
e.graphics2D.Line(bottomStartScreenPos, bottomEndScreenPos, RGBA_Bytes.Black);
e.graphics2D.Line(topStartScreenPos, topEndScreenPos, RGBA_Bytes.Black);
e.graphics2D.Line(topStartScreenPos, bottomStartScreenPos, RGBA_Bytes.Black);
e.graphics2D.Line(bottomStartScreenPos, bottomEndScreenPos, Color.Black);
e.graphics2D.Line(topStartScreenPos, topEndScreenPos, Color.Black);
e.graphics2D.Line(topStartScreenPos, bottomStartScreenPos, Color.Black);
}
TriangleShape tri = x.Bvh as TriangleShape;
@ -1121,7 +1121,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var screenCenter = Vector3.Transform(vertexPos, x.TransformToWorld);
var screenPos = this.World.GetScreenPosition(screenCenter);
e.graphics2D.Circle(screenPos, 3, RGBA_Bytes.Red);
e.graphics2D.Circle(screenPos, 3, Color.Red);
}
}
else
@ -1129,7 +1129,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var center = x.Bvh.GetCenter();
var worldCenter = Vector3.Transform(center, x.TransformToWorld);
var screenPos2 = this.World.GetScreenPosition(worldCenter);
e.graphics2D.Circle(screenPos2, 3, RGBA_Bytes.Yellow);
e.graphics2D.Circle(screenPos2, 3, Color.Yellow);
e.graphics2D.DrawString($"{x.Depth},", screenPos2.x + 12 * x.Depth, screenPos2.y);
}
}
@ -1474,7 +1474,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
BackgroundColor = RGBA_Bytes.White,
BackgroundColor = Color.White,
Padding = new BorderDouble(5, 5, 5, 0)
};
@ -1557,7 +1557,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
var copy = transform.TransformedObject.Clone();
copy.Matrix = transform.RedoTransform;
copy.Color = new RGBA_Bytes(RGBA_Bytes.Gray, 126);
copy.Color = new Color(Color.Gray, 126);
list.Add(copy);
}
});
@ -1641,7 +1641,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
BackgroundColor = RGBA_Bytes.White,
BackgroundColor = Color.White,
Padding = new BorderDouble(0, 5, 5, 0)
};
@ -1665,7 +1665,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
string materialLabelText = string.Format("{0} {1}", "Material".Localize(), extruderIndex + 1);
RadioButton materialSelection = new RadioButton(materialLabelText, textColor: RGBA_Bytes.Black);
RadioButton materialSelection = new RadioButton(materialLabelText, textColor: Color.Black);
materialButtons.Add(materialSelection);
materialSelection.SiblingRadioButtonList = materialButtons;
colorSelectionContainer.AddChild(materialSelection);
@ -2190,7 +2190,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var popupContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
Padding = 12,
BackgroundColor = RGBA_Bytes.White
BackgroundColor = Color.White
};
var meshViewer = meshViewerWidget;
@ -2259,7 +2259,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
//var itemTextColor = ActiveTheme.Instance.PrimaryTextColor;
var itemTextColor = RGBA_Bytes.Black;
var itemTextColor = Color.Black;
RenderTypes renderType;
bool canParse = Enum.TryParse(renderTypeString, out renderType);
@ -2358,10 +2358,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double endColor = 5.0 / 360.0;
double delta = endColor - startColor;
RGBA_Bytes color = RGBA_Floats.FromHSL(startColor, .99, .49).GetAsRGBA_Bytes();
Color color = ColorF.FromHSL(startColor, .99, .49).GetAsRGBA_Bytes();
if (normal.z < 0)
{
color = RGBA_Floats.FromHSL(startColor - delta * normal.z, .99, .49).GetAsRGBA_Bytes();
color = ColorF.FromHSL(startColor - delta * normal.z, .99, .49).GetAsRGBA_Bytes();
}
colorData.red = color.red;