sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Store barBreadth as a separate float

Browse Source
This commit is contained in:
Andrei Zavatski
2022-11-19 23:40:02 +03:00
parent 67ee9f3915
commit 6c62cfb830
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Graphics/UserInterface/BarGraph.cs
View File

@ -43,6 +43,7 @@ namespace osu.Game.Graphics.UserInterface
} }
private readonly List<BarInfo> bars = new List<BarInfo>(); private readonly List<BarInfo> bars = new List<BarInfo>();
private float barBreadth;
/// <summary> /// <summary>
/// A list of floats that defines the length of each <see cref="Bar"/> /// A list of floats that defines the length of each <see cref="Bar"/>
@ -60,7 +61,7 @@ namespace osu.Game.Graphics.UserInterface
int newCount = value.Count(); int newCount = value.Count();
float size = 1.0f / newCount; barBreadth = 1.0f / newCount;
float maxLength = MaxValue ?? value.Max(); float maxLength = MaxValue ?? value.Max();
@ -74,18 +75,12 @@ namespace osu.Game.Graphics.UserInterface
b.InitialLength = b.FinalLength; b.InitialLength = b.FinalLength;
b.FinalLength = length; b.FinalLength = length;
b.Breadth = size;
bars[bar.Index] = b; bars[bar.Index] = b;
continue;
} }
else
{ bars.Add(new BarInfo { FinalLength = length });
bars.Add(new BarInfo
{
FinalLength = length,
Breadth = size
});
}
} }
if (bars.Count > newCount) if (bars.Count > newCount)
@ -159,6 +154,7 @@ namespace osu.Game.Graphics.UserInterface
private Texture texture = null!; private Texture texture = null!;
private Vector2 drawSize; private Vector2 drawSize;
private BarDirection direction; private BarDirection direction;
private float barBreadth;
private readonly List<BarInfo> bars = new List<BarInfo>(); private readonly List<BarInfo> bars = new List<BarInfo>();
@ -170,6 +166,7 @@ namespace osu.Game.Graphics.UserInterface
texture = Source.texture; texture = Source.texture;
drawSize = Source.DrawSize; drawSize = Source.DrawSize;
direction = Source.direction; direction = Source.direction;
barBreadth = Source.barBreadth;
bars.Clear(); bars.Clear();
bars.AddRange(Source.bars); bars.AddRange(Source.bars);
@ -188,8 +185,8 @@ namespace osu.Game.Graphics.UserInterface
{ {
var bar = bars[i]; var bar = bars[i];
float barHeight = drawSize.Y * ((direction == BarDirection.TopToBottom || direction == BarDirection.BottomToTop) ? bar.InstantaneousLength : bar.Breadth); float barHeight = drawSize.Y * ((direction == BarDirection.TopToBottom || direction == BarDirection.BottomToTop) ? bar.InstantaneousLength : barBreadth);
float barWidth = drawSize.X * ((direction == BarDirection.LeftToRight || direction == BarDirection.RightToLeft) ? bar.InstantaneousLength : bar.Breadth); float barWidth = drawSize.X * ((direction == BarDirection.LeftToRight || direction == BarDirection.RightToLeft) ? bar.InstantaneousLength : barBreadth);
Vector2 topLeft; Vector2 topLeft;
@ -236,7 +233,6 @@ namespace osu.Game.Graphics.UserInterface
public float InitialLength { get; set; } public float InitialLength { get; set; }
public float FinalLength { get; set; } public float FinalLength { get; set; }
public float InstantaneousLength { get; set; } public float InstantaneousLength { get; set; }
public float Breadth { get; set; }
} }
} }
} }