sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

there's probably something in here I overlooked

Browse Source
This commit is contained in:
Jorolf
2017-03-30 17:32:18 +02:00
parent 15326204d5
commit 0d4f2c59a5
7 changed files with 98 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/BeatmapDetailArea.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics.Primitives;
using osu.Game.Beatmaps;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Screens.Select.Details;
using osu.Game.Screens.Select.Leaderboards;
namespace osu.Game.Screens.Select
@ -17,7 +18,7 @@ namespace osu.Game.Screens.Select
private readonly Container content;
protected override Container<Drawable> Content => content;
public readonly Details Details;
public readonly BeatmapDetails Details;
public readonly Leaderboard Leaderboard;
private BeatmapDetailTab currentTab;
@ -75,7 +76,7 @@ namespace osu.Game.Screens.Select
Add(new Drawable[]
{
Details = new Details
Details = new BeatmapDetails
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(5),

112
osu.Game/Screens/Select/Details.cs → osu.Game/Screens/Select/Details/BeatmapDetails.cs
View File

@ -15,9 +15,9 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
namespace osu.Game.Screens.Select
namespace osu.Game.Screens.Select.Details
{
public class Details : Container
public class BeatmapDetails : Container
{
private readonly SpriteText description;
private readonly SpriteText source;
@ -29,12 +29,13 @@ namespace osu.Game.Screens.Select
private readonly DifficultyRow approachRate;
private readonly DifficultyRow stars;
private readonly DetailsBar ratingsBar;
private readonly BeatmapDetailsBar ratingsBar;
private readonly SpriteText negativeRatings;
private readonly SpriteText positiveRatings;
private readonly FillFlowContainer<DetailsBar> ratingsGraph;
private readonly BeatmapDetailsGraph ratingsGraph;
private readonly FillFlowContainer<RetryAndFailBar> retryAndFailGraph;
private readonly BeatmapDetailsGraph retryGraph;
private readonly BeatmapDetailsGraph failGraph;
private BeatmapInfo beatmap;
public BeatmapInfo Beatmap
@ -79,19 +80,7 @@ namespace osu.Game.Screens.Select
positiveRatings.Text = ratings.GetRange(5, 5).Sum().ToString();
ratingsBar.Length = (float)ratings.GetRange(0, 5).Sum() / ratings.Sum();
List<DetailsBar> ratingsGraphBars = ratingsGraph.Children.ToList();
for (int i = 0; i < 10; i++)
if(ratingsGraphBars.Count > i)
ratingsGraphBars[i].Length = (float)ratings[i] / ratings.Max();
else
ratingsGraph.Add(new DetailsBar
{
RelativeSizeAxes = Axes.Both,
Width = 0.1f,
Length = (float)ratings[i] / ratings.Max(),
Direction = BarDirection.BottomToTop,
BackgroundColour = new Color4(0, 0, 0, 0),
});
ratingsGraph.Values = ratings.Select(rating => (float)rating / ratings.Max());
}
}
@ -105,7 +94,7 @@ namespace osu.Game.Screens.Select
set
{
retries = value.ToList();
calcRetryAndFailBarLength();
calcRetryAndFailGraph();
}
}
@ -119,31 +108,18 @@ namespace osu.Game.Screens.Select
set
{
fails = value.ToList();
calcRetryAndFailBarLength();
calcRetryAndFailGraph();
}
}
private void calcRetryAndFailBarLength()
private void calcRetryAndFailGraph()
{
List<RetryAndFailBar> retryAndFailGraphBars = retryAndFailGraph.Children.ToList();
float maxValue = fails.Select((value, index) => value + retries[index]).Max();
for (int i = 0; i < 100; i++)
if (retryAndFailGraphBars.Count > i)
{
retryAndFailGraphBars[i].FailLength = fails[i] / maxValue;
retryAndFailGraphBars[i].RetryLength = retries[i] / maxValue;
}
else
retryAndFailGraph.Add(new RetryAndFailBar
{
RelativeSizeAxes = Axes.Both,
Width = 0.01f,
FailLength = fails[i] / maxValue,
RetryLength = retries[i] / maxValue,
});
failGraph.Values = fails.Select(fail => (float)fail / fails.Max());
List<float> retryAndFails = retries.Select((retry, index) => (float)retry + fails[index]).ToList();
retryGraph.Values = retryAndFails.Select(value => value / retryAndFails.Max());
}
public Details()
public BeatmapDetails()
{
Children = new Drawable[]
{
@ -211,7 +187,7 @@ namespace osu.Game.Screens.Select
Direction = FillDirection.Vertical,
Spacing = new Vector2(0,15),
Padding = new MarginPadding(10) { Top = 0 },
Children = new []
Children = new Drawable[]
{
new Container
{
@ -297,7 +273,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
ratingsBar = new DetailsBar
ratingsBar = new BeatmapDetailsBar
{
RelativeSizeAxes = Axes.X,
Height = 5,
@ -333,7 +309,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
ratingsGraph = new FillFlowContainer<DetailsBar>
ratingsGraph = new BeatmapDetailsGraph
{
RelativeSizeAxes = Axes.X,
Direction = FillDirection.Horizontal,
@ -343,32 +319,27 @@ namespace osu.Game.Screens.Select
},
},
},
},
},
new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Direction = FillDirection.Vertical,
Padding = new MarginPadding { Left = 10, Right = 10 },
Children = new Drawable[]
{
retryAndFailGraph = new FillFlowContainer<RetryAndFailBar>
{
RelativeSizeAxes = Axes.X,
Direction = FillDirection.Horizontal,
Height = 50,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
},
new SpriteText
{
Text = "Points of Failure",
TextSize = 14,
Font = @"Exo2.0-Medium",
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
},
new Container<BeatmapDetailsGraph>
{
RelativeSizeAxes = Axes.X,
Size = new Vector2(1/0.6f, 50),
Children = new[]
{
retryGraph = new BeatmapDetailsGraph
{
RelativeSizeAxes = Axes.Both,
},
failGraph = new BeatmapDetailsGraph
{
RelativeSizeAxes = Axes.Both,
},
},
},
},
},
@ -387,12 +358,15 @@ namespace osu.Game.Screens.Select
ratingsBar.BackgroundColour = colour.Green;
ratingsBar.BarColour = colour.YellowDark;
ratingsGraph.Colour = colour.BlueDark;
failGraph.Colour = colour.YellowDarker;
retryGraph.Colour = colour.Yellow;
}
private class DifficultyRow : Container
{
private readonly SpriteText name;
private readonly DetailsBar bar;
private readonly BeatmapDetailsBar bar;
private readonly SpriteText valueText;
private float difficultyValue;
@ -457,7 +431,7 @@ namespace osu.Game.Screens.Select
TextSize = 14,
Font = @"Exo2.0-Medium",
},
bar = new DetailsBar
bar = new BeatmapDetailsBar
{
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
@ -484,10 +458,10 @@ namespace osu.Game.Screens.Select
}
}
private class RetryAndFailBar : Container<DetailsBar>
private class RetryAndFailBar : Container<BeatmapDetailsBar>
{
private readonly DetailsBar retryBar;
private readonly DetailsBar failBar;
private readonly BeatmapDetailsBar retryBar;
private readonly BeatmapDetailsBar failBar;
public float RetryLength
{
@ -517,14 +491,14 @@ namespace osu.Game.Screens.Select
{
Children = new[]
{
retryBar = new DetailsBar
retryBar = new BeatmapDetailsBar
{
RelativeSizeAxes = Axes.Both,
Direction = BarDirection.BottomToTop,
Length = 0,
BackgroundColour = new Color4(0,0,0,0),
},
failBar = new DetailsBar
failBar = new BeatmapDetailsBar
{
RelativeSizeAxes = Axes.Both,
Direction = BarDirection.BottomToTop,

6
osu.Game/Screens/Select/DetailsBar.cs → osu.Game/Screens/Select/Details/BeatmapDetailsBar.cs
View File

@ -7,9 +7,9 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Screens.Select
namespace osu.Game.Screens.Select.Details
{
public class DetailsBar : Container
public class BeatmapDetailsBar : Container
{
private readonly Box background;
private readonly Box bar;
@ -70,7 +70,7 @@ namespace osu.Game.Screens.Select
}
}
public DetailsBar()
public BeatmapDetailsBar()
{
Children = new []
{

38
osu.Game/Screens/Select/Details/BeatmapDetailsGraph.cs Normal file
View File

@ -0,0 +1,38 @@
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using System.Collections.Generic;
using System.Linq;
namespace osu.Game.Screens.Select.Details
{
public class BeatmapDetailsGraph : FillFlowContainer<BeatmapDetailsBar>
{
public IEnumerable<float> Values
{
set
{
List<float> values = value.ToList();
List<BeatmapDetailsBar> graphBars = Children.ToList();
for (int i = 0; i < values.Count; i++)
if (graphBars.Count > i)
{
graphBars[i].Length = values[i] / values.Max();
graphBars[i].Width = 1.0f / values.Count;
}
else
Add(new BeatmapDetailsBar
{
RelativeSizeAxes = Axes.Both,
Width = 1.0f / values.Count,
Length = values[i] / values.Max(),
Direction = BarDirection.BottomToTop,
BackgroundColour = new Color4(0, 0, 0, 0),
});
}
}
}
}