h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 11:02:54 +08:00
Code Issues Releases Wiki Activity

Add per-result type pooling

Browse Source
This commit is contained in:
Dean Herbert 2020-07-06 12:54:39 +09:00
parent ffec4298a7
commit 51050ec4ef
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -1,18 +1,23 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Linq;
using osuTK; using osuTK;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Pooling; using osu.Framework.Graphics.Pooling;
using osu.Framework.Logging;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables; using osu.Game.Rulesets.Osu.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects.Drawables.Connections; using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Scoring;
using osu.Game.Rulesets.Osu.UI.Cursor; using osu.Game.Rulesets.Osu.UI.Cursor;
using osu.Game.Rulesets.Scoring;
using osu.Game.Skinning; using osu.Game.Skinning;
namespace osu.Game.Rulesets.Osu.UI namespace osu.Game.Rulesets.Osu.UI
@ -28,13 +33,12 @@ namespace osu.Game.Rulesets.Osu.UI
protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer(); protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
private readonly DrawablePool<DrawableOsuJudgement> judgementPool; private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
public OsuPlayfield() public OsuPlayfield()
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
judgementPool = new DrawablePool<DrawableOsuJudgement>(20),
followPoints = new FollowPointRenderer followPoints = new FollowPointRenderer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -59,6 +63,13 @@ namespace osu.Game.Rulesets.Osu.UI
}; };
hitPolicy = new OrderedHitPolicy(HitObjectContainer); hitPolicy = new OrderedHitPolicy(HitObjectContainer);
var hitWindows = new OsuHitWindows();
foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
poolDictionary.Add(result, new DrawableJudgementPool(result));
AddRangeInternal(poolDictionary.Values);
} }
public override void Add(DrawableHitObject h) public override void Add(DrawableHitObject h)
@ -96,16 +107,15 @@ namespace osu.Game.Rulesets.Osu.UI
if (!judgedObject.DisplayResult || !DisplayJudgements.Value) if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
return; return;
DrawableOsuJudgement explosion = judgementPool.Get(doj => var osuObject = (OsuHitObject)judgedObject.HitObject;
DrawableOsuJudgement explosion = poolDictionary[result.Type].Get(doj =>
{ {
if (doj.Result != null)
Logger.Log("reused!");
doj.Result = result;
doj.JudgedObject = judgedObject; doj.JudgedObject = judgedObject;
doj.Origin = Anchor.Centre; // todo: move to JudgedObject property?
doj.Position = ((OsuHitObject)judgedObject.HitObject).StackedEndPosition; doj.Position = osuObject.StackedEndPosition;
doj.Scale = new Vector2(((OsuHitObject)judgedObject.HitObject).Scale); doj.Scale = new Vector2(osuObject.Scale);
}); });
judgementLayer.Add(explosion); judgementLayer.Add(explosion);
@ -117,5 +127,26 @@ namespace osu.Game.Rulesets.Osu.UI
{ {
public void Add(Drawable approachCircleProxy) => AddInternal(approachCircleProxy); public void Add(Drawable approachCircleProxy) => AddInternal(approachCircleProxy);
} }
private class DrawableJudgementPool : DrawablePool<DrawableOsuJudgement>
{
private readonly HitResult result;
public DrawableJudgementPool(HitResult result)
: base(10)
{
this.result = result;
}
protected override DrawableOsuJudgement CreateNewDrawable()
{
var judgement = base.CreateNewDrawable();
// just a placeholder to initialise the correct drawable hierarchy for this pool.
judgement.Result = new JudgementResult(new HitObject(), new Judgement()) { Type = result };
return judgement;
}
}
} }
} }

1
osu.Game/Rulesets/Judgements/DrawableJudgement.cs
View File

@ -75,6 +75,7 @@ namespace osu.Game.Rulesets.Judgements
public DrawableJudgement() public DrawableJudgement()
{ {
Size = new Vector2(judgement_size); Size = new Vector2(judgement_size);
Origin = Anchor.Centre;
} }
protected virtual void ApplyHitAnimations() protected virtual void ApplyHitAnimations()