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

Rename taiko HitTarget classes to avoid conflict with mania

Browse Source
This commit is contained in:
Dean Herbert 2020-04-23 12:10:26 +09:00
parent aaa0f908d5
commit ca56e6c0d2
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
View File

@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
{ {
public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
{ {
typeof(HitTarget), typeof(TaikoHitTarget),
typeof(LegacyHitTarget), typeof(TaikoLegacyHitTarget),
}).ToList(); }).ToList();
[Cached(typeof(IScrollingInfo))] [Cached(typeof(IScrollingInfo))]

8
osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs → osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
View File

@ -10,7 +10,7 @@ using osuTK;
namespace osu.Game.Rulesets.Taiko.Skinning namespace osu.Game.Rulesets.Taiko.Skinning
{ {
public class LegacyHitTarget : CompositeDrawable public class TaikoLegacyHitTarget : CompositeDrawable
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ISkinSource skin) private void load(ISkinSource skin)
@ -22,7 +22,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
new Sprite new Sprite
{ {
Texture = skin.GetTexture("approachcircle"), Texture = skin.GetTexture("approachcircle"),
Scale = new Vector2(0.73f), RelativeSizeAxes = Axes.Both,
Size = new Vector2(0.73f) * 0.625f,
Alpha = 0.7f, Alpha = 0.7f,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -30,7 +31,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
new Sprite new Sprite
{ {
Texture = skin.GetTexture("taikobigcircle"), Texture = skin.GetTexture("taikobigcircle"),
Scale = new Vector2(0.7f), RelativeSizeAxes = Axes.Both,
Size = new Vector2(0.7f) * 0.625f,
Alpha = 0.5f, Alpha = 0.5f,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

2
osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
case TaikoSkinComponents.HitTarget: case TaikoSkinComponents.HitTarget:
if (GetTexture("taikobigcircle") != null) if (GetTexture("taikobigcircle") != null)
return new LegacyHitTarget(); return new TaikoLegacyHitTarget();
return null; return null;
} }

6
osu.Game.Rulesets.Taiko/UI/HitTarget.cs → osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
View File

@ -13,14 +13,14 @@ namespace osu.Game.Rulesets.Taiko.UI
/// <summary> /// <summary>
/// A component that is displayed at the hit position in the taiko playfield. /// A component that is displayed at the hit position in the taiko playfield.
/// </summary> /// </summary>
internal class HitTarget : Container internal class TaikoHitTarget : Container
{ {
/// <summary> /// <summary>
/// Thickness of all drawn line pieces. /// Thickness of all drawn line pieces.
/// </summary> /// </summary>
private const float border_thickness = 2.5f; private const float border_thickness = 2.5f;
public HitTarget() public TaikoHitTarget()
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
@ -41,7 +41,6 @@ namespace osu.Game.Rulesets.Taiko.UI
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit,
Scale = new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE), Scale = new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE),
Masking = true, Masking = true,
BorderColour = Color4.White, BorderColour = Color4.White,
@ -63,7 +62,6 @@ namespace osu.Game.Rulesets.Taiko.UI
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit,
Scale = new Vector2(TaikoHitObject.DEFAULT_SIZE), Scale = new Vector2(TaikoHitObject.DEFAULT_SIZE),
Masking = true, Masking = true,
BorderColour = Color4.White, BorderColour = Color4.White,

2
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Taiko.UI
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
Blending = BlendingParameters.Additive, Blending = BlendingParameters.Additive,
}, },
HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new HitTarget()) HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new TaikoHitTarget())
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.Centre, Origin = Anchor.Centre,