sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-18 01:37:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move colour generation to TriangleParticle"

Browse Source 
This reverts commit de4c62788c88bb9ced4e976c9a32ccafba3f4266.
This commit is contained in:
Sebastian Krajewski 2020-01-06 12:51:38 +01:00 committed by Dean Herbert
parent de4c62788c
commit 0b9cc8ed1b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Graphics/Backgrounds/Triangles.cs
View File

@ -176,7 +176,8 @@ namespace osu.Game.Graphics.Backgrounds
TriangleParticle particle = CreateTriangle(); TriangleParticle particle = CreateTriangle();
particle.Position = new Vector2(RNG.NextSingle(), randomY ? RNG.NextSingle() : 1); particle.Position = new Vector2(RNG.NextSingle(), randomY ? RNG.NextSingle() : 1);
particle.UpdateColour(colourDark, colourLight); particle.ColourShade = RNG.NextSingle();
particle.Colour = CreateTriangleShade(particle.ColourShade);
return particle; return particle;
} }
@ -198,12 +199,18 @@ namespace osu.Game.Graphics.Backgrounds
return new TriangleParticle { Scale = scale }; return new TriangleParticle { Scale = scale };
} }
/// <summary>
/// Creates a shade of colour for the triangles.
/// </summary>
/// <returns>The colour.</returns>
protected virtual Color4 CreateTriangleShade(float shade) => Interpolation.ValueAt(shade, colourDark, colourLight, 0, 1);
private void updateColours() private void updateColours()
{ {
for (int i = 0; i < parts.Count; i++) for (int i = 0; i < parts.Count; i++)
{ {
TriangleParticle newParticle = parts[i]; TriangleParticle newParticle = parts[i];
newParticle.UpdateColour(colourDark, colourLight); newParticle.Colour = CreateTriangleShade(newParticle.ColourShade);
parts[i] = newParticle; parts[i] = newParticle;
} }
} }
@ -286,7 +293,7 @@ namespace osu.Game.Graphics.Backgrounds
} }
} }
protected class TriangleParticle : IComparable<TriangleParticle> protected struct TriangleParticle : IComparable<TriangleParticle>
{ {
/// <summary> /// <summary>
/// The position of the top vertex of the triangle. /// The position of the top vertex of the triangle.
@ -297,7 +304,7 @@ namespace osu.Game.Graphics.Backgrounds
/// The colour shade of the triangle. /// The colour shade of the triangle.
/// This is needed for colour recalculation of visible triangles when <see cref="ColourDark"/> or <see cref="ColourLight"/> is changed. /// This is needed for colour recalculation of visible triangles when <see cref="ColourDark"/> or <see cref="ColourLight"/> is changed.
/// </summary> /// </summary>
private readonly float colourShade = RNG.NextSingle(); public float ColourShade;
/// <summary> /// <summary>
/// The colour of the triangle. /// The colour of the triangle.
@ -309,11 +316,6 @@ namespace osu.Game.Graphics.Backgrounds
/// </summary> /// </summary>
public float Scale; public float Scale;
public void UpdateColour(Color4 colourDark, Color4 colourLight)
{
Colour = Interpolation.ValueAt(colourShade, colourDark, colourLight, 0, 1);
}
/// <summary> /// <summary>
/// Compares two <see cref="TriangleParticle"/>s. This is a reverse comparer because when the /// Compares two <see cref="TriangleParticle"/>s. This is a reverse comparer because when the
/// triangles are added to the particles list, they should be drawn from largest to smallest /// triangles are added to the particles list, they should be drawn from largest to smallest