DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 01:58:30 +00:00
Code Issues Releases Wiki Activity

Fixed gradient calculation (moving gradients caused issues)

Browse Source
This commit is contained in:
Darth Affe 2017-08-05 16:32:10 +02:00
parent d50deaf686
commit 8e0b8ae883
3 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RGB.NET.Brushes/Gradients/AbstractGradient.cs
View File

@ -88,14 +88,15 @@ namespace RGB.NET.Brushes.Gradients
offset /= 360.0;
foreach (GradientStop gradientStop in GradientStops)
{
gradientStop.Offset = gradientStop.Offset + offset;
gradientStop.Offset += offset;
if (gradientStop.Offset > 1)
while (GradientStops.All(x => x.Offset > 1))
foreach (GradientStop gradientStop in GradientStops)
gradientStop.Offset -= 1;
else if (gradientStop.Offset < 0)
while (GradientStops.All(x => x.Offset < 0))
foreach (GradientStop gradientStop in GradientStops)
gradientStop.Offset += 1;
}
}
#endregion

72
RGB.NET.Brushes/Gradients/LinearGradient.cs
View File

@ -48,35 +48,9 @@ namespace RGB.NET.Brushes.Gradients
public override Color GetColor(double offset)
{
if (GradientStops.Count == 0) return Color.Transparent;
if (GradientStops.Count == 1) return new Color(GradientStops.First().Color);
if (GradientStops.Count == 1) return new Color(GradientStops[0].Color);
GradientStop gsBefore;
GradientStop gsAfter;
IList<GradientStop> orderedStops = GradientStops.OrderBy(x => x.Offset).ToList();
if (WrapGradient)
{
gsBefore = orderedStops.LastOrDefault(n => n.Offset <= offset);
if (gsBefore == null)
{
GradientStop lastStop = orderedStops[orderedStops.Count - 1];
gsBefore = new GradientStop(lastStop.Offset - 1, lastStop.Color);
}
gsAfter = orderedStops.FirstOrDefault(n => n.Offset >= offset);
if (gsAfter == null)
{
GradientStop firstStop = orderedStops[0];
gsAfter = new GradientStop(firstStop.Offset + 1, firstStop.Color);
}
}
else
{
offset = ClipOffset(offset);
gsBefore = orderedStops.Last(n => n.Offset <= offset);
gsAfter = orderedStops.First(n => n.Offset >= offset);
}
(GradientStop gsBefore, GradientStop gsAfter) = GetEnclosingGradientStops(offset, GradientStops, WrapGradient);
double blendFactor = 0;
if (!gsBefore.Offset.Equals(gsAfter.Offset))
@ -90,6 +64,48 @@ namespace RGB.NET.Brushes.Gradients
return new Color(colA, colR, colG, colB);
}
/// <summary>
/// Get the two <see cref="GradientStop"/>s encapsulating the given offset.
/// </summary>
/// <param name="offset">The reference offset.</param>
/// <param name="stops">The <see cref="GradientStop"/> to choose from.</param>
/// <param name="wrap">Bool indicating if the gradient should be wrapped or not.</param>
/// <returns></returns>
protected virtual (GradientStop gsBefore, GradientStop gsAfter) GetEnclosingGradientStops(double offset, IEnumerable<GradientStop> stops, bool wrap)
{
LinkedList<GradientStop> orderedStops = new LinkedList<GradientStop>(stops.OrderBy(x => x.Offset));
if (wrap)
{
GradientStop gsBefore, gsAfter;
do
{
gsBefore = orderedStops.LastOrDefault(n => n.Offset <= offset);
if (gsBefore == null)
{
GradientStop lastStop = orderedStops.Last.Value;
orderedStops.AddFirst(new GradientStop(lastStop.Offset - 1, lastStop.Color));
orderedStops.RemoveLast();
}
gsAfter = orderedStops.FirstOrDefault(n => n.Offset >= offset);
if (gsAfter == null)
{
GradientStop firstStop = orderedStops.First.Value;
orderedStops.AddLast(new GradientStop(firstStop.Offset + 1, firstStop.Color));
orderedStops.RemoveFirst();
}
} while ((gsBefore == null) || (gsAfter == null));
return (gsBefore, gsAfter);
}
offset = ClipOffset(offset);
return (orderedStops.Last(n => n.Offset <= offset), orderedStops.First(n => n.Offset >= offset));
}
#endregion
}
}

4
RGB.NET.Brushes/Gradients/RainbowGradient.cs
View File

@ -65,12 +65,12 @@ namespace RGB.NET.Brushes.Gradients
StartHue += offset;
EndHue += offset;
if ((StartHue > 360) && (EndHue > 360))
while ((StartHue > 360) && (EndHue > 360))
{
StartHue -= 360;
EndHue -= 360;
}
else if ((StartHue < -360) && (EndHue < -360))
while ((StartHue < -360) && (EndHue < -360))
{
StartHue += 360;
EndHue += 360;