h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:07:52 +08:00
Code Issues Releases Wiki Activity

Read videos from storage

Browse Source
This commit is contained in:
Dean Herbert 2018-11-04 21:15:02 +09:00
parent 89a1414c63
commit 7e092c6084
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tournament.Tests/TestCaseSceneManager.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Video;
using osu.Framework.Platform;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Screens.Drawings;
using osu.Game.Tournament.Screens.Ladder;
@ -27,7 +28,7 @@ namespace osu.Game.Tournament.Tests
private ShowcaseScreen showcase;
[BackgroundDependencyLoader]
private void load()
private void load(Storage storage)
{
Children = new Drawable[]
{
@ -70,7 +71,7 @@ namespace osu.Game.Tournament.Tests
//Masking = true,
Children = new Drawable[]
{
new VideoSprite(@"C:\Users\Dean\BG Side Logo - OWC.m4v")
new VideoSprite(storage.GetStream(@"BG Side Logo - OWC.m4v"))
{
Loop = true,
RelativeSizeAxes = Axes.Both,

2
osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Tournament.Screens.Drawings
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
new VideoSprite(@"C:\Users\Dean\BG Logoless - OWC.m4v")
new VideoSprite(storage.GetStream("BG Logoless - OWC.m4v"))
{
RelativeSizeAxes = Axes.Both,
Loop = true,

2
osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
View File

@ -126,7 +126,7 @@ namespace osu.Game.Tournament.Screens.Showcase
}
}
},
new OsuLogo()
new OsuLogo
{
Triangles = false,
Colour = OsuColour.Gray(0.33f),

16
osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
View File

@ -2,9 +2,11 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Video;
using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Screens;
@ -17,13 +19,25 @@ namespace osu.Game.Tournament.Screens.TeamIntro
{
public class TeamIntroScreen : OsuScreen
{
private readonly TournamentTeam team1;
private readonly TournamentTeam team2;
private readonly TournamentGrouping round;
public TeamIntroScreen(TournamentTeam team1, TournamentTeam team2, TournamentGrouping round)
{
this.team1 = team1;
this.team2 = team2;
this.round = round;
}
[BackgroundDependencyLoader]
private void load(Storage storage)
{
RelativeSizeAxes = Axes.Both;
InternalChildren = new Drawable[]
{
new VideoSprite(@"C:\Users\Dean\BG Team - Both OWC.m4v")
new VideoSprite(storage.GetStream(@"BG Team - Both OWC.m4v"))
{
RelativeSizeAxes = Axes.Both,
Loop = true,