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

Better track off-screen drawables (and return to pool less often)

Browse Source
This commit is contained in:
Dean Herbert 2020-10-13 14:14:39 +09:00
parent 29983afcef
commit 075bf23714
1 changed files with 18 additions and 6 deletions

24
osu.Game/Screens/Select/BeatmapCarousel.cs

@ -560,6 +560,16 @@ namespace osu.Game.Screens.Select
private (int first, int last) displayedRange; private (int first, int last) displayedRange;
/// <summary>
/// Extend the range to retain already loaded pooled drawables.
/// </summary>
private const float distance_offscreen_before_unload = 1024;
/// <summary>
/// Extend the range to update positions / retrieve pooled drawables outside of visible range.
/// </summary>
private const float distance_offscreen_to_preload = 256;
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
@ -585,7 +595,7 @@ namespace osu.Game.Screens.Select
var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first); var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
foreach (var panel in scrollableContent.Children) foreach (var panel in scrollableContent.Children.ToArray())
{ {
if (toDisplay.Remove(panel.Item)) if (toDisplay.Remove(panel.Item))
{ {
@ -593,8 +603,10 @@ namespace osu.Game.Screens.Select
continue; continue;
} }
// panel displayed but not required // panel loaded as drawable but not required by visible range.
scrollableContent.Remove(panel); // remove but only if too far off-screen
if (panel.Y < visibleUpperBound - distance_offscreen_before_unload || panel.Y > visibleBottomBound + distance_offscreen_before_unload)
scrollableContent.Remove(panel);
} }
// Add those items within the previously found index range that should be displayed. // Add those items within the previously found index range that should be displayed.
@ -603,7 +615,7 @@ namespace osu.Game.Screens.Select
Logger.Log($"getting panel for {item} from pool"); Logger.Log($"getting panel for {item} from pool");
var panel = setPool.Get(p => p.Item = item); var panel = setPool.Get(p => p.Item = item);
panel.Depth = item.CarouselYPosition; // todo: i think this is correct panel.Depth = item.CarouselYPosition;
panel.Y = item.CarouselYPosition; panel.Y = item.CarouselYPosition;
scrollableContent.Add(panel); scrollableContent.Add(panel);
@ -632,9 +644,9 @@ namespace osu.Game.Screens.Select
{ {
// Find index range of all items that should be on-screen // Find index range of all items that should be on-screen
// TODO: reduce allocs of CarouselBoundsItem. // TODO: reduce allocs of CarouselBoundsItem.
int firstIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleUpperBound)); int firstIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleUpperBound - distance_offscreen_to_preload));
if (firstIndex < 0) firstIndex = ~firstIndex; if (firstIndex < 0) firstIndex = ~firstIndex;
int lastIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleBottomBound)); int lastIndex = visibleItems.BinarySearch(new CarouselBoundsItem(visibleBottomBound + distance_offscreen_to_preload));
if (lastIndex < 0) lastIndex = ~lastIndex; if (lastIndex < 0) lastIndex = ~lastIndex;
// as we can't be 100% sure on the size of individual carousel drawables, // as we can't be 100% sure on the size of individual carousel drawables,