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

Split out component from test scene and fix SongProgress

Browse Source
This commit is contained in:
Dean Herbert 2021-04-30 12:09:58 +09:00
parent 4770a64709
commit 6442fb819f
3 changed files with 149 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
View File

@ -1,18 +1,11 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Screens.Play.HUD;
using osuTK;
using osu.Game.Skinning.Editor;
namespace osu.Game.Tests.Visual.Gameplay
{
@ -21,71 +14,11 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestToggleEditor()
{
AddStep("show available components", () =>
AddStep("show available components", () => SetContents(() => new SkinComponentToolbox
{
SetContents(() =>
{
FillFlowContainer fill;
var scroll = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Child = fill = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Width = 0.5f,
Direction = FillDirection.Vertical,
Spacing = new Vector2(20)
}
};
var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
foreach (var type in skinnableTypes)
{
try
{
fill.Add(new OsuSpriteText { Text = type.Name });
var instance = (Drawable)Activator.CreateInstance(type);
Debug.Assert(instance != null);
instance.Anchor = Anchor.TopCentre;
instance.Origin = Anchor.TopCentre;
var container = new Container
{
RelativeSizeAxes = Axes.X,
Height = 100,
Children = new[]
{
instance
}
};
switch (instance)
{
case IScoreCounter score:
score.Current.Value = 133773;
break;
case IComboCounter combo:
combo.Current.Value = 727;
break;
}
fill.Add(container);
}
catch { }
}
return scroll;
});
});
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
}));
}
protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();

16
osu.Game/Screens/Play/SongProgress.cs
View File

@ -76,10 +76,6 @@ namespace osu.Game.Screens.Play
{
new SongProgressDisplay
{
Masking = true,
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Children = new Drawable[]
{
info = new SongProgressInfo
@ -187,8 +183,16 @@ namespace osu.Game.Screens.Play
public class SongProgressDisplay : Container, ISkinnableComponent
{
// TODO: move actual implementation into this.
// exists for skin customisation purposes.
public SongProgressDisplay()
{
// TODO: move actual implementation into this.
// exists for skin customisation purposes.
Masking = true;
RelativeSizeAxes = Axes.Both;
Anchor = Anchor.BottomCentre;
Origin = Anchor.BottomCentre;
}
}
}
}

134
osu.Game/Skinning/Editor/SkinComponentToolbox.cs Normal file
View File

@ -0,0 +1,134 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Diagnostics;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Screens.Play.HUD;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Skinning.Editor
{
public class SkinComponentToolbox : CompositeDrawable
{
public SkinComponentToolbox()
{
RelativeSizeAxes = Axes.Y;
Width = 500;
}
[BackgroundDependencyLoader]
private void load()
{
FillFlowContainer fill;
InternalChild = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Child = fill = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Width = 0.5f,
Direction = FillDirection.Vertical,
Spacing = new Vector2(20)
}
};
var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
foreach (var type in skinnableTypes)
{
var container = attemptAddComponent(type);
if (container != null)
fill.Add(container);
}
}
private static Drawable attemptAddComponent(Type type)
{
try
{
var instance = (Drawable)Activator.CreateInstance(type);
Debug.Assert(instance != null);
return new ToolboxComponent(instance);
}
catch
{
}
return null;
}
private class ToolboxComponent : CompositeDrawable
{
public ToolboxComponent(Drawable instance)
{
Container innerContainer;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
InternalChild = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{
new OsuSpriteText { Text = instance.GetType().Name },
innerContainer = new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Masking = true,
CornerRadius = 10,
Children = new[]
{
new Box
{
Colour = Color4.Black,
Alpha = 0.5f,
RelativeSizeAxes = Axes.Both,
},
instance
}
},
}
};
// adjust provided component to fit / display in a known state.
instance.Anchor = Anchor.Centre;
instance.Origin = Anchor.Centre;
if (instance.RelativeSizeAxes != Axes.None)
{
innerContainer.AutoSizeAxes = Axes.None;
innerContainer.Height = 100;
}
switch (instance)
{
case IScoreCounter score:
score.Current.Value = 133773;
break;
case IComboCounter combo:
combo.Current.Value = 727;
break;
}
}
}
}
}