h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 07:42:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #27199 from EVAST9919/link-compiler-alloc

Browse Source 
Fix `DrawableLinkCompiler` allocations
This commit is contained in:
Dean Herbert 2024-02-18 04:04:34 +08:00 committed by GitHub
commit 71afb8881a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game/Online/Chat/DrawableLinkCompiler.cs
View File

@ -4,9 +4,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.ListExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Lists;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -23,12 +25,21 @@ namespace osu.Game.Online.Chat
/// <summary> /// <summary>
/// Each word part of a chat link (split for word-wrap support). /// Each word part of a chat link (split for word-wrap support).
/// </summary> /// </summary>
public readonly List<Drawable> Parts; public readonly SlimReadOnlyListWrapper<Drawable> Parts;
[Resolved] [Resolved]
private OverlayColourProvider? overlayColourProvider { get; set; } private OverlayColourProvider? overlayColourProvider { get; set; }
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos)); public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
{
foreach (var part in Parts)
{
if (part.ReceivePositionalInputAt(screenSpacePos))
return true;
}
return false;
}
protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new LinkHoverSounds(sampleSet, Parts); protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new LinkHoverSounds(sampleSet, Parts);
@ -39,7 +50,7 @@ namespace osu.Game.Online.Chat
public DrawableLinkCompiler(IEnumerable<Drawable> parts) public DrawableLinkCompiler(IEnumerable<Drawable> parts)
{ {
Parts = parts.ToList(); Parts = parts.ToList().AsSlimReadOnly();
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -52,15 +63,24 @@ namespace osu.Game.Online.Chat
private partial class LinkHoverSounds : HoverClickSounds private partial class LinkHoverSounds : HoverClickSounds
{ {
private readonly List<Drawable> parts; private readonly SlimReadOnlyListWrapper<Drawable> parts;
public LinkHoverSounds(HoverSampleSet sampleSet, List<Drawable> parts) public LinkHoverSounds(HoverSampleSet sampleSet, SlimReadOnlyListWrapper<Drawable> parts)
: base(sampleSet) : base(sampleSet)
{ {
this.parts = parts; this.parts = parts;
} }
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos)); public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
{
foreach (var part in parts)
{
if (part.ReceivePositionalInputAt(screenSpacePos))
return true;
}
return false;
}
} }
} }
} }