RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-25 07:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

A bit more cleanup.

Browse Source
This commit is contained in:
smoogipooo 2017-05-25 22:09:02 +09:00
parent 91dba765c2
commit c8cf387f5f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,13 +107,13 @@ namespace osu.Game.Graphics.Backgrounds
{ {
TriangleParticle newParticle = parts[i]; TriangleParticle newParticle = parts[i];
newParticle.Position += new Vector2(0, -(parts[i].Scale * (50 / DrawHeight)) / triangleScale * Velocity) * ((float)Time.Elapsed / 950);
float adjustedAlpha = HideAlphaDiscrepancies ? float adjustedAlpha = HideAlphaDiscrepancies ?
// Cubically scale alpha to make it drop off more sharply. // Cubically scale alpha to make it drop off more sharply.
(float)Math.Pow(DrawInfo.Colour.AverageColour.Linear.A, 3) : (float)Math.Pow(DrawInfo.Colour.AverageColour.Linear.A, 3) :
1; 1;
newParticle.Position += new Vector2(0, -(parts[i].Scale * (50 / DrawHeight)) / triangleScale * Velocity) * ((float)Time.Elapsed / 950);
newParticle.Colour.A = adjustedAlpha; newParticle.Colour.A = adjustedAlpha;
parts[i] = newParticle; parts[i] = newParticle;
@ -140,7 +140,7 @@ namespace osu.Game.Graphics.Backgrounds
private TriangleParticle createTriangle(bool randomY) private TriangleParticle createTriangle(bool randomY)
{ {
var 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.Colour = CreateTriangleShade(); particle.Colour = CreateTriangleShade();
@ -189,17 +189,16 @@ namespace osu.Game.Graphics.Backgrounds
trianglesNode.Parts.AddRange(parts); trianglesNode.Parts.AddRange(parts);
} }
public class TrianglesDrawNodeSharedData private class TrianglesDrawNodeSharedData
{ {
public LinearBatch<TexturedVertex2D> VertexBatch = new LinearBatch<TexturedVertex2D>(100 * 3, 10, PrimitiveType.Triangles); public readonly LinearBatch<TexturedVertex2D> VertexBatch = new LinearBatch<TexturedVertex2D>(100 * 3, 10, PrimitiveType.Triangles);
} }
public class TrianglesDrawNode : DrawNode private class TrianglesDrawNode : DrawNode
{ {
public Shader Shader; public Shader Shader;
public Texture Texture; public Texture Texture;
public float Time;
public TrianglesDrawNodeSharedData Shared; public TrianglesDrawNodeSharedData Shared;
public readonly List<TriangleParticle> Parts = new List<TriangleParticle>(); public readonly List<TriangleParticle> Parts = new List<TriangleParticle>();
@ -232,10 +231,21 @@ namespace osu.Game.Graphics.Backgrounds
} }
} }
public struct TriangleParticle : IComparable<TriangleParticle> protected struct TriangleParticle : IComparable<TriangleParticle>
{ {
/// <summary>
/// The position of the top vertex of the triangle.
/// </summary>
public Vector2 Position; public Vector2 Position;
/// <summary>
/// The colour of the triangle.
/// </summary>
public Color4 Colour; public Color4 Colour;
/// <summary>
/// The scale of the triangle.
/// </summary>
public float Scale; public float Scale;
/// <summary> /// <summary>