Skip to content
This repository was archived by the owner on Aug 6, 2021. It is now read-only.

Commit 7216eae

Browse files
DarthAffeDarthAffe
committed
Updated RGB.NET
1 parent e94c072 commit 7216eae

File tree

10 files changed

+91
-91
lines changed

10 files changed

+91
-91
lines changed

‎KeyboardAudioVisualizer/Configuration/Settings.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ public VisualizationSettings(VisualizationIndex visualizationIndex)
8888
{
8989
case VisualizationIndex.Primary:
9090
SelectedVisualization = VisualizationType.FrequencyBars;
91-
Gradient = new LinearGradient(new GradientStop(0, Color.FromHSV(300, 1, 1)),
92-
new GradientStop(0.20, Color.FromHSV(225, 1, 1)),
93-
new GradientStop(0.35, Color.FromHSV(180, 1, 1)),
94-
new GradientStop(0.50, Color.FromHSV(135, 1, 1)),
95-
new GradientStop(0.65, Color.FromHSV(90, 1, 1)),
96-
new GradientStop(0.80, Color.FromHSV(45, 1, 1)),
97-
new GradientStop(0.95, Color.FromHSV(0, 1, 1)));
91+
Gradient = new LinearGradient(new GradientStop(0, HSVColor.Create(300, 1, 1)),
92+
new GradientStop(0.20, HSVColor.Create(225, 1, 1)),
93+
new GradientStop(0.35, HSVColor.Create(180, 1, 1)),
94+
new GradientStop(0.50, HSVColor.Create(135, 1, 1)),
95+
new GradientStop(0.65, HSVColor.Create(90, 1, 1)),
96+
new GradientStop(0.80, HSVColor.Create(45, 1, 1)),
97+
new GradientStop(0.95, HSVColor.Create(0, 1, 1)));
9898
break;
9999

100100
case VisualizationIndex.Secondary:

‎KeyboardAudioVisualizer/Controls/ColorSelector.cs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ private void ValueChanged(object sender, RoutedPropertyChangedEventArgs<double>
320320

321321
private void HSVChanged()
322322
{
323-
Color color = Color.FromHSV(_a, _hue, _saturation, _value);
323+
Color color = HSVColor.Create(_a, _hue, _saturation, _value);
324324
UpdateSelectedColor(color);
325325
SetRGB(color);
326326
UpdateUIColors();
@@ -331,7 +331,7 @@ private void SetA(Color color)
331331
{
332332
_ignorePropertyChanged = true;
333333

334-
_a = color.A;
334+
_a = color.GetA();
335335
if (_sliderAlpha != null)
336336
_sliderAlpha.Value = _a;
337337

@@ -342,15 +342,15 @@ private void SetRGB(Color color)
342342
{
343343
_ignorePropertyChanged = true;
344344

345-
_r = color.R;
345+
_r = color.GetR();
346346
if (_sliderRed != null)
347347
_sliderRed.Value = _r;
348348

349-
_g = color.G;
349+
_g = color.GetG();
350350
if (_sliderGreen != null)
351351
_sliderGreen.Value = _g;
352352

353-
_b = color.B;
353+
_b = color.GetB();
354354
if (_sliderBlue != null)
355355
_sliderBlue.Value = _b;
356356

@@ -361,15 +361,15 @@ private void SetHSV(Color color)
361361
{
362362
_ignorePropertyChanged = true;
363363

364-
_hue = color.Hue;
364+
_hue = color.GetHue();
365365
if (_sliderHue != null)
366366
_sliderHue.Value = _hue;
367367

368-
_saturation = color.Saturation;
368+
_saturation = color.GetSaturation();
369369
if (_sliderSaturation != null)
370370
_sliderSaturation.Value = _saturation;
371371

372-
_value = color.Value;
372+
_value = color.GetValue();
373373
if (_sliderValue != null)
374374
_sliderValue.Value = _value;
375375

@@ -411,13 +411,13 @@ private void UpdateSelectorValue(Point mouseLocation)
411411

412412
private void UpdateUIColors()
413413
{
414-
Color hueColor = Color.FromHSV(_hue, 1, 1);
414+
Color hueColor = HSVColor.Create(_hue, 1, 1);
415415

416416
if (_previewBrush != null)
417417
_previewBrush.Color = WpfColor.FromArgb(_a, _r, _g, _b);
418418

419419
if (_selectorBrush != null)
420-
_selectorBrush.Color = WpfColor.FromRgb(hueColor.R, hueColor.G, hueColor.B);
420+
_selectorBrush.Color = WpfColor.FromRgb(hueColor.GetR(), hueColor.GetG(), hueColor.GetB());
421421

422422
if (_alphaBrush != null)
423423
{
@@ -445,36 +445,36 @@ private void UpdateUIColors()
445445

446446
if (_hueBrush != null)
447447
{
448-
Color referenceColor1 = Color.FromHSV(0, _saturation, _value);
449-
Color referenceColor2 = Color.FromHSV(60, _saturation, _value);
450-
Color referenceColor3 = Color.FromHSV(120, _saturation, _value);
451-
Color referenceColor4 = Color.FromHSV(180, _saturation, _value);
452-
Color referenceColor5 = Color.FromHSV(240, _saturation, _value);
453-
Color referenceColor6 = Color.FromHSV(300, _saturation, _value);
454-
455-
_hueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, referenceColor1.R, referenceColor1.G, referenceColor1.B);
456-
_hueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor2.R, referenceColor2.G, referenceColor2.B);
457-
_hueBrush.GradientStops[2].Color = WpfColor.FromArgb(_a, referenceColor3.R, referenceColor3.G, referenceColor3.B);
458-
_hueBrush.GradientStops[3].Color = WpfColor.FromArgb(_a, referenceColor4.R, referenceColor4.G, referenceColor4.B);
459-
_hueBrush.GradientStops[4].Color = WpfColor.FromArgb(_a, referenceColor5.R, referenceColor5.G, referenceColor5.B);
460-
_hueBrush.GradientStops[5].Color = WpfColor.FromArgb(_a, referenceColor6.R, referenceColor6.G, referenceColor6.B);
461-
_hueBrush.GradientStops[6].Color = WpfColor.FromArgb(_a, referenceColor1.R, referenceColor1.G, referenceColor1.B);
448+
Color referenceColor1 = HSVColor.Create(0, _saturation, _value);
449+
Color referenceColor2 = HSVColor.Create(60, _saturation, _value);
450+
Color referenceColor3 = HSVColor.Create(120, _saturation, _value);
451+
Color referenceColor4 = HSVColor.Create(180, _saturation, _value);
452+
Color referenceColor5 = HSVColor.Create(240, _saturation, _value);
453+
Color referenceColor6 = HSVColor.Create(300, _saturation, _value);
454+
455+
_hueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, referenceColor1.GetR(), referenceColor1.GetG(), referenceColor1.GetB());
456+
_hueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor2.GetR(), referenceColor2.GetG(), referenceColor2.GetB());
457+
_hueBrush.GradientStops[2].Color = WpfColor.FromArgb(_a, referenceColor3.GetR(), referenceColor3.GetG(), referenceColor3.GetB());
458+
_hueBrush.GradientStops[3].Color = WpfColor.FromArgb(_a, referenceColor4.GetR(), referenceColor4.GetG(), referenceColor4.GetB());
459+
_hueBrush.GradientStops[4].Color = WpfColor.FromArgb(_a, referenceColor5.GetR(), referenceColor5.GetG(), referenceColor5.GetB());
460+
_hueBrush.GradientStops[5].Color = WpfColor.FromArgb(_a, referenceColor6.GetR(), referenceColor6.GetG(), referenceColor6.GetB());
461+
_hueBrush.GradientStops[6].Color = WpfColor.FromArgb(_a, referenceColor1.GetR(), referenceColor1.GetG(), referenceColor1.GetB());
462462
}
463463

464464
if (_saturationBrush != null)
465465
{
466-
Color referenceColor = Color.FromHSV(_hue, 1, _value);
466+
Color referenceColor = HSVColor.Create(_hue, 1, _value);
467467

468468
_saturationBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 255, 255, 255);
469-
_saturationBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.R, referenceColor.G, referenceColor.B);
469+
_saturationBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.GetR(), referenceColor.GetG(), referenceColor.GetB());
470470
}
471471

472472
if (_valueBrush != null)
473473
{
474-
Color referenceColor = Color.FromHSV(_hue, _saturation, 1);
474+
Color referenceColor = HSVColor.Create(_hue, _saturation, 1);
475475

476476
_valueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 0, 0, 0);
477-
_valueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.R, referenceColor.G, referenceColor.B);
477+
_valueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.GetR(), referenceColor.GetG(), referenceColor.GetB());
478478
}
479479
}
480480

‎KeyboardAudioVisualizer/Controls/GradientEditor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ private void UpdateGradientPreview()
167167
private void UpdatePreviewRectangle(Rectangle rect, double referenceWidth, double referenceHeight, double from, double to,
168168
RGB.NET.Core.Color startColor, RGB.NET.Core.Color endColor)
169169
{
170-
rect.Fill = new LinearGradientBrush(Color.FromArgb(startColor.A, startColor.R, startColor.G, startColor.B),
171-
Color.FromArgb(endColor.A, endColor.R, endColor.G, endColor.B),
170+
rect.Fill = new LinearGradientBrush(Color.FromArgb(startColor.GetA(), startColor.GetR(), startColor.GetG(), startColor.GetB()),
171+
Color.FromArgb(endColor.GetA(), endColor.GetR(), endColor.GetG(), endColor.GetB()),
172172
new Point(0, 0.5), new Point(1, 0.5));
173173

174174
//DarthAffe 09.02.2018: Forced rounding to prevent render issues on resize
@@ -212,7 +212,7 @@ private void UpdateGradientStops()
212212

213213
private void UpdateGradientStop(ContentControl control, double referenceWidth, double referenceHeight, GradientStop stop)
214214
{
215-
control.Background = new SolidColorBrush(Color.FromArgb(stop.Color.A, stop.Color.R, stop.Color.G, stop.Color.B));
215+
control.Background = new SolidColorBrush(Color.FromArgb(stop.Color.GetA(), stop.Color.GetR(), stop.Color.GetG(), stop.Color.GetB()));
216216

217217
Canvas.SetLeft(control, (referenceWidth * stop.Offset.Clamp(0, 1)) - (control.Width / 2.0));
218218

‎KeyboardAudioVisualizer/Decorators/BeatDecorator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ public BeatDecorator(IVisualizationProvider visualizationProvider)
2626

2727
#endregion
2828

29-
public Color ManipulateColor(Rectangle rectangle, BrushRenderTarget renderTarget, Color color) => color.SetAPercent(color.APercent * _visualizationProvider.VisualizationData[0]);
29+
public Color ManipulateColor(Rectangle rectangle, BrushRenderTarget renderTarget, Color color) => color.SetA(color.A * _visualizationProvider.VisualizationData[0]);
3030
}
3131
}

0 commit comments

Comments
 (0)