RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-25 16:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable NRT in explosion-related classes and streamline null handling

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-08-12 21:09:08 +02:00
parent 98ce69d1d3
commit 68f454b51a
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Rulesets.Catch/Skinning/Default/DefaultHitExplosion.cs
View File

@ -72,9 +72,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
public void Animate(HitExplosionEntry entry)
{
if (entry == null)
return;
X = entry.Position;
Scale = new Vector2(entry.HitObject.Scale);
setColour(entry.ObjectColour);

3
osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyHitExplosion.cs
View File

@ -62,9 +62,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
public void Animate(HitExplosionEntry entry)
{
if (entry == null)
return;
Colour = entry.ObjectColour;
using (BeginAbsoluteSequence(entry.LifetimeStart))

14
osu.Game.Rulesets.Catch/UI/HitExplosion.cs
View File

@ -1,28 +1,25 @@
// 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 osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Catch.Skinning.Default;
using osu.Game.Rulesets.Objects.Pooling;
using osu.Game.Skinning;
#nullable enable
namespace osu.Game.Rulesets.Catch.UI
{
public class HitExplosion : PoolableDrawableWithLifetime<HitExplosionEntry>
{
private SkinnableDrawable skinnableExplosion;
private readonly SkinnableDrawable skinnableExplosion;
public HitExplosion()
{
RelativeSizeAxes = Axes.Both;
Anchor = Anchor.BottomCentre;
Origin = Anchor.BottomCentre;
}
[BackgroundDependencyLoader]
private void load()
{
InternalChild = skinnableExplosion = new SkinnableDrawable(new CatchSkinComponent(CatchSkinComponents.HitExplosion), _ => new DefaultHitExplosion())
{
CentreComponent = false,
@ -44,8 +41,11 @@ namespace osu.Game.Rulesets.Catch.UI
apply(Entry);
}
private void apply(HitExplosionEntry entry)
private void apply(HitExplosionEntry? entry)
{
if (entry == null)
return;
ApplyTransformsAt(double.MinValue, true);
ClearTransforms(true);

2
osu.Game.Rulesets.Catch/UI/HitExplosionEntry.cs
View File

@ -6,6 +6,8 @@ using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Judgements;
using osuTK.Graphics;
#nullable enable
namespace osu.Game.Rulesets.Catch.UI
{
public class HitExplosionEntry : LifetimeEntry

2
osu.Game.Rulesets.Catch/UI/IHitExplosion.cs
View File

@ -1,6 +1,8 @@
// 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.
#nullable enable
namespace osu.Game.Rulesets.Catch.UI
{
/// <summary>