1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-04 23:43:00 +08:00

Remove AccentColour member variable from LogoVisualisation

This commit is contained in:
Derrick Timmermans 2020-11-22 17:34:56 +01:00
parent 1551402a8d
commit 458016d17d
No known key found for this signature in database
GPG Key ID: 8681B60806EF4A17

View File

@ -11,7 +11,6 @@ using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Shaders; using osu.Framework.Graphics.Shaders;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using JetBrains.Annotations; using JetBrains.Annotations;
@ -27,7 +26,7 @@ namespace osu.Game.Screens.Menu
/// <summary> /// <summary>
/// A visualiser that reacts to music coming from beatmaps. /// A visualiser that reacts to music coming from beatmaps.
/// </summary> /// </summary>
public class LogoVisualisation : Drawable, IHasAccentColour public class LogoVisualisation : Drawable
{ {
private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>(); private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
@ -68,8 +67,6 @@ namespace osu.Game.Screens.Menu
private int indexOffset; private int indexOffset;
public Color4 AccentColour { get; set; } = Color4.White.Opacity(.2f);
/// <summary> /// <summary>
/// The relative movement of bars based on input amplification. Defaults to 1. /// The relative movement of bars based on input amplification. Defaults to 1.
/// </summary> /// </summary>
@ -177,7 +174,7 @@ namespace osu.Game.Screens.Menu
// Assuming the logo is a circle, we don't need a second dimension. // Assuming the logo is a circle, we don't need a second dimension.
private float size; private float size;
private Color4 colour; private Color4 colour = Color4.White.Opacity(.2f);
private float[] audioData; private float[] audioData;
private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10); private readonly QuadBatch<TexturedVertex2D> vertexBatch = new QuadBatch<TexturedVertex2D>(100, 10);
@ -194,7 +191,6 @@ namespace osu.Game.Screens.Menu
shader = Source.shader; shader = Source.shader;
texture = Source.texture; texture = Source.texture;
size = Source.DrawSize.X; size = Source.DrawSize.X;
colour = Source.AccentColour;
audioData = Source.frequencyAmplitudes; audioData = Source.frequencyAmplitudes;
} }