h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 06:35:05 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10873 from smoogipoo/remove-parent-dho-pooling

Browse Source 
Remove ability to pool DHOs in parent playfields
This commit is contained in:
Dean Herbert 2020-11-17 01:55:13 +09:00 committed by GitHub
commit f177792915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,9 +218,6 @@ namespace osu.Game.Rulesets.UI
#region Pooling support #region Pooling support
[Resolved(CanBeNull = true)]
private IPooledHitObjectProvider parentPooledObjectProvider { get; set; }
private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>(); private readonly Dictionary<Type, IDrawablePool> pools = new Dictionary<Type, IDrawablePool>();
/// <summary> /// <summary>
@ -320,10 +317,7 @@ namespace osu.Game.Rulesets.UI
} }
} }
if (pool == null) return (DrawableHitObject)pool?.Get(d =>
return parentPooledObjectProvider?.GetPooledDrawableRepresentation(hitObject);
return (DrawableHitObject)pool.Get(d =>
{ {
var dho = (DrawableHitObject)d; var dho = (DrawableHitObject)d;