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

Use beatmap background in editor (#7167)

Browse Source 
Use beatmap background in editor
This commit is contained in:
Dean Herbert 2019-12-12 13:26:39 +09:00 committed by GitHub
commit a871ec77a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Edit/Editor.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using osuTK.Graphics; using osuTK.Graphics;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Screens.Backgrounds;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -29,14 +28,13 @@ using osu.Game.Input.Bindings;
using osu.Game.Screens.Edit.Compose; using osu.Game.Screens.Edit.Compose;
using osu.Game.Screens.Edit.Setup; using osu.Game.Screens.Edit.Setup;
using osu.Game.Screens.Edit.Timing; using osu.Game.Screens.Edit.Timing;
using osu.Game.Screens.Play;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Game.Screens.Edit namespace osu.Game.Screens.Edit
{ {
public class Editor : OsuScreen, IKeyBindingHandler<GlobalAction> public class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
{ {
protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
public override float BackgroundParallaxAmount => 0.1f; public override float BackgroundParallaxAmount => 0.1f;
public override bool AllowBackButton => false; public override bool AllowBackButton => false;
@ -250,8 +248,12 @@ namespace osu.Game.Screens.Edit
{ {
base.OnEntering(last); base.OnEntering(last);
// todo: temporary. we want to be applying dim using the UserDimContainer eventually.
Background.FadeColour(Color4.DarkGray, 500); Background.FadeColour(Color4.DarkGray, 500);
Background.EnableUserDim.Value = false;
Background.BlurAmount.Value = 0;
resetTrack(true); resetTrack(true);
} }