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

+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds

Browse Source
This commit is contained in:
DrabWeb
2017-05-19 15:43:18 -03:00
parent 3b8cadd4df
commit e1c4c36122
9 changed files with 284 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
osu.Game/Overlays/Direct/DirectGridPanel.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System.Linq;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
@ -9,8 +9,8 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Localisation;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Direct
}
[BackgroundDependencyLoader]
private void load(OsuColour colours, LocalisationEngine localisation)
private void load(OsuColour colours, LocalisationEngine localisation, TextureStore textures)
{
Children = new Drawable[]
{
@ -46,9 +46,13 @@ namespace osu.Game.Overlays.Direct
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
new Sprite
new Container
{
FillMode = FillMode.Fill,
RelativeSizeAxes = Axes.Both,
Children = new[]
{
GetBackground(textures),
},
},
new Box
{
@ -126,18 +130,27 @@ namespace osu.Game.Overlays.Direct
},
},
},
new OsuSpriteText
new Container
{
Text = $@"from {SetInfo.Metadata.Source}",
TextSize = 14,
Shadow = false,
Colour = colours.Gray5,
AutoSizeAxes = Axes.X,
Height = 14,
Children = new[]
{
new OsuSpriteText
{
Text = $@"from {SetInfo.Metadata.Source}",
TextSize = 14,
Shadow = false,
Colour = colours.Gray5,
Alpha = SetInfo.Metadata.Source == @"" ? 0 : 1,
},
},
},
new FillFlowContainer
{
AutoSizeAxes = Axes.X,
Height = 20,
Margin = new MarginPadding { Top = vertical_padding, Bottom = vertical_padding },
Margin = new MarginPadding { Top = vertical_padding, Bottom = vertical_padding },
Children = DifficultyIcons,
},
},
@ -155,11 +168,11 @@ namespace osu.Game.Overlays.Direct
Margin = new MarginPadding { Top = vertical_padding, Right = vertical_padding },
Children = new[]
{
new Statistic(FontAwesome.fa_play_circle)
new Statistic(FontAwesome.fa_play_circle, SetInfo.Beatmaps.FirstOrDefault()?.OnlineInfo.PlayCount ?? 0)
{
Margin = new MarginPadding { Right = 1 },
},
new Statistic(FontAwesome.fa_heart),
new Statistic(FontAwesome.fa_heart, SetInfo.Beatmaps.FirstOrDefault()?.OnlineInfo.FavouriteCount ?? 0),
},
},
};

17
osu.Game/Overlays/Direct/DirectListPanel.cs
View File

@ -13,6 +13,8 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Database;
using osu.Framework.Allocation;
using osu.Framework.Localisation;
using osu.Framework.Graphics.Textures;
using System.Linq;
namespace osu.Game.Overlays.Direct
{
@ -38,7 +40,7 @@ namespace osu.Game.Overlays.Direct
}
[BackgroundDependencyLoader]
private void load(LocalisationEngine localisation)
private void load(LocalisationEngine localisation, TextureStore textures)
{
Children = new Drawable[]
{
@ -47,9 +49,13 @@ namespace osu.Game.Overlays.Direct
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
new Sprite
new Container
{
FillMode = FillMode.Fill,
RelativeSizeAxes = Axes.Both,
Children = new[]
{
GetBackground(textures),
},
},
new Box
{
@ -97,11 +103,11 @@ namespace osu.Game.Overlays.Direct
Margin = new MarginPadding { Right = (height - vertical_padding * 2) + vertical_padding },
Children = new Drawable[]
{
new Statistic(FontAwesome.fa_play_circle)
new Statistic(FontAwesome.fa_play_circle, SetInfo.Beatmaps.FirstOrDefault()?.OnlineInfo.PlayCount ?? 0)
{
Margin = new MarginPadding { Right = 1 },
},
new Statistic(FontAwesome.fa_heart),
new Statistic(FontAwesome.fa_heart, SetInfo.Beatmaps.FirstOrDefault()?.OnlineInfo.FavouriteCount ?? 0),
new FillFlowContainer
{
Anchor = Anchor.TopRight,
@ -129,6 +135,7 @@ namespace osu.Game.Overlays.Direct
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
TextSize = 14,
Alpha = SetInfo.Metadata.Source == @"" ? 0 : 1,
},
},
},

11
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -2,10 +2,12 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System.Linq;
using OpenTK;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Database;
using osu.Game.Graphics;
@ -30,7 +32,14 @@ namespace osu.Game.Overlays.Direct
}
}
//todo: Direct panel backgrounds
protected Drawable GetBackground(TextureStore textures)
{
return new AsyncLoadWrapper(new Sprite
{
FillMode = FillMode.Fill,
Texture = new OnlineWorkingBeatmap(SetInfo.Beatmaps.FirstOrDefault(), textures, null).Background,
}) { RelativeSizeAxes = Axes.Both };
}
public DirectPanel(BeatmapSetInfo setInfo)
{