h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 19:22:56 +08:00
Code Issues Releases Wiki Activity

Remove recursive hierarchy traversal for mania sample balance

Browse Source
This commit is contained in:
Dean Herbert 2020-04-13 13:01:27 +09:00
parent 65b96079a0
commit cdff6060d3
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
View File

@ -5,10 +5,10 @@ using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
using osu.Game.Rulesets.Mania.UI; using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.UI;
namespace osu.Game.Rulesets.Mania.Objects.Drawables namespace osu.Game.Rulesets.Mania.Objects.Drawables
{ {
@ -26,17 +26,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>(); protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
[Resolved(canBeNull: true)]
private Playfield playfield { get; set; }
protected override float SamplePlaybackPosition protected override float SamplePlaybackPosition
{ {
get get
{ {
CompositeDrawable stage = this; var columns = (playfield as ManiaPlayfield)?.TotalColumns;
while (!(stage is Stage))
stage = stage.Parent;
var columnCount = ((Stage)stage).Columns.Count; if (columns == null)
var columnIndex = HitObject.Column; return base.SamplePlaybackPosition;
return 0.8f * columnIndex / (columnCount - 1) - 0.4f;
return (float)HitObject.Column / columns.Value;
} }
} }

1
osu.Game/Rulesets/UI/Playfield.cs
View File

@ -15,6 +15,7 @@ using osuTK;
namespace osu.Game.Rulesets.UI namespace osu.Game.Rulesets.UI
{ {
[Cached]
public abstract class Playfield : CompositeDrawable public abstract class Playfield : CompositeDrawable
{ {
/// <summary> /// <summary>