Merge pull request #3371 from peppy/update-framework-with-everyrthing

Update framework with everyrthing

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject>
     {
-        public override bool IsPresent => base.IsPresent || State.Value == ArmedState.Idle && Time.Current >= HitObject.StartTime - HitObject.TimePreempt;
+        public override bool IsPresent => base.IsPresent || State.Value == ArmedState.Idle && Clock?.CurrentTime >= HitObject.StartTime - HitObject.TimePreempt;
 
         private readonly ShakeContainer shakeContainer;
 

osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs

@@ -216,7 +216,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                         Texture.DrawQuad(
                             new Quad(pos.X - Size.X / 2, pos.Y - Size.Y / 2, Size.X, Size.Y),
-                            DrawInfo.Colour,
+                            DrawColourInfo.Colour,
                             null,
                             v => Shared.VertexBuffer.Vertices[end++] = new TexturedTrailVertex
                             {

osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs

@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Graphics.Textures;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 
@@ -45,6 +44,10 @@ namespace osu.Game.Beatmaps
 
             private string getPathForFile(string filename) => BeatmapSetInfo.Files.First(f => string.Equals(f.Filename, filename, StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
 
+            private LargeTextureStore textureStore;
+
+            protected override bool BackgroundStillValid(Texture b) => false; // bypass lazy logic. we want to return a new background each time for refcounting purposes.
+
             protected override Texture GetBackground()
             {
                 if (Metadata?.BackgroundFile == null)
@@ -52,7 +55,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return new LargeTextureStore(new RawTextureLoaderStore(store)).Get(getPathForFile(Metadata.BackgroundFile));
+                    return (textureStore ?? (textureStore = new LargeTextureStore(new RawTextureLoaderStore(store)))).Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch
                 {
@@ -73,6 +76,14 @@ namespace osu.Game.Beatmaps
                 }
             }
 
+            public override void TransferTo(WorkingBeatmap other)
+            {
+                base.TransferTo(other);
+
+                if (other is BeatmapManagerWorkingBeatmap owb && textureStore != null && BeatmapInfo.BackgroundEquals(other.BeatmapInfo))
+                    owb.textureStore = textureStore;
+            }
+
             protected override Waveform GetWaveform()
             {
                 try

osu.Game/Graphics/Backgrounds/Background.cs

@@ -5,8 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using OpenTK.Graphics;
-using osu.Game.Graphics.Textures;
 
 namespace osu.Game.Graphics.Backgrounds
 {

osu.Game/Graphics/Backgrounds/Triangles.cs

@@ -116,7 +116,7 @@ namespace osu.Game.Graphics.Backgrounds
 
             float adjustedAlpha = HideAlphaDiscrepancies ?
                 // Cubically scale alpha to make it drop off more sharply.
-                (float)Math.Pow(DrawInfo.Colour.AverageColour.Linear.A, 3) :
+                (float)Math.Pow(DrawColourInfo.Colour.AverageColour.Linear.A, 3) :
                 1;
 
             float elapsedSeconds = (float)Time.Elapsed / 1000;
@@ -235,7 +235,7 @@ namespace osu.Game.Graphics.Backgrounds
                         Vector2Extensions.Transform(particle.Position * Size + new Vector2(-offset.X, offset.Y), DrawInfo.Matrix)
                     );
 
-                    ColourInfo colourInfo = DrawInfo.Colour;
+                    ColourInfo colourInfo = DrawColourInfo.Colour;
                     colourInfo.ApplyChild(particle.Colour);
 
                     Texture.DrawTriangle(

osu.Game/Graphics/DrawableDate.cs

@@ -4,7 +4,6 @@
 using System;
 using Humanizer;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics.Sprites;
 
@@ -16,7 +15,6 @@ namespace osu.Game.Graphics
 
         public DrawableDate(DateTimeOffset date)
         {
-            AutoSizeAxes = Axes.Both;
             Font = "Exo2.0-RegularItalic";
 
             Date = date.ToLocalTime();

osu.Game/Graphics/SpriteIcon.cs

@@ -95,7 +95,7 @@ namespace osu.Game.Graphics
             {
                 //adjust shadow alpha based on highest component intensity to avoid muddy display of darker text.
                 //squared result for quadratic fall-off seems to give the best result.
-                var avgColour = (Color4)DrawInfo.Colour.AverageColour;
+                var avgColour = (Color4)DrawColourInfo.Colour.AverageColour;
 
                 spriteShadow.Alpha = (float)Math.Pow(Math.Max(Math.Max(avgColour.R, avgColour.G), avgColour.B), 2);
 

osu.Game/Graphics/Sprites/OsuSpriteText.cs

@@ -3,9 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.MathUtils;
-using OpenTK;
-using OpenTK.Graphics;
 using osu.Framework.Graphics.Transforms;
 
 namespace osu.Game.Graphics.Sprites
@@ -19,27 +16,6 @@ namespace osu.Game.Graphics.Sprites
             Shadow = true;
             TextSize = FONT_SIZE;
         }
-
-        protected override Drawable CreateFallbackCharacterDrawable()
-        {
-            var tex = GetTextureForCharacter('?');
-
-            if (tex != null)
-            {
-                float adjust = (RNG.NextSingle() - 0.5f) * 2;
-                return new Sprite
-                {
-                    Texture = tex,
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Scale = new Vector2(1 + adjust * 0.2f),
-                    Rotation = adjust * 15,
-                    Colour = Color4.White,
-                };
-            }
-
-            return base.CreateFallbackCharacterDrawable();
-        }
     }
 
     public static class OsuSpriteTextTransformExtensions

osu.Game/Graphics/Textures/LargeTextureStore.cs

@@ -1,18 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
-
-namespace osu.Game.Graphics.Textures
-{
-    /// <summary>
-    /// A texture store that bypasses atlasing.
-    /// </summary>
-    public class LargeTextureStore : TextureStore
-    {
-        public LargeTextureStore(IResourceStore<RawTexture> store = null) : base(store, false)
-        {
-        }
-    }
-}

osu.Game/OsuGameBase.cs

@@ -24,7 +24,6 @@ using osu.Framework.Input;
 using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Database;
-using osu.Game.Graphics.Textures;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
@@ -115,9 +114,8 @@ namespace osu.Game
             dependencies.Cache(LocalConfig);
 
             //this completely overrides the framework default. will need to change once we make a proper FontStore.
-            dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 });
+            dependencies.Cache(Fonts = new FontStore(new GlyphStore(Resources, @"Fonts/FontAwesome")));
 
-            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Medium"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic"));

osu.Game/Overlays/Settings/SettingsSection.cs

@@ -73,7 +73,7 @@ namespace osu.Game.Overlays.Settings
                     },
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         new OsuSpriteText
                         {

osu.Game/Screens/Menu/LogoVisualisation.cs

@@ -176,7 +176,7 @@ namespace osu.Game.Screens.Menu
 
                 Vector2 inflation = DrawInfo.MatrixInverse.ExtractScale().Xy;
 
-                ColourInfo colourInfo = DrawInfo.Colour;
+                ColourInfo colourInfo = DrawColourInfo.Colour;
                 colourInfo.ApplyChild(Colour);
 
                 if (AudioData != null)

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -486,6 +486,15 @@ namespace osu.Game.Screens.Select
                 updateItem(p, halfHeight);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            // aggressively dispose "off-screen" items to reduce GC pressure.
+            foreach (var i in Items)
+                i.Dispose();
+        }
+
         private CarouselBeatmapSet createCarouselSet(BeatmapSetInfo beatmapSet)
         {
             if (beatmapSet.Beatmaps.All(b => b.Hidden))

osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs

@@ -50,12 +50,12 @@ namespace osu.Game.Screens.Select.Carousel
 
             Children = new Drawable[]
             {
-                new DelayedLoadWrapper(
+                new DelayedLoadUnloadWrapper(() =>
                     new PanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                     {
                         RelativeSizeAxes = Axes.Both,
                         OnLoadComplete = d => d.FadeInFromZero(1000, Easing.OutQuint),
-                    }, 300
+                    }, 300, 5000
                 ),
                 new FillFlowContainer
                 {

osu.Game/Storyboards/Drawables/DrawableStoryboard.cs

@@ -22,6 +22,7 @@ namespace osu.Game.Storyboards.Drawables
         public override bool HandleMouseInput => false;
 
         private bool passing = true;
+
         public bool Passing
         {
             get { return passing; }
@@ -36,6 +37,7 @@ namespace osu.Game.Storyboards.Drawables
         public override bool RemoveCompletedTransforms => false;
 
         private DependencyContainer dependencies;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
@@ -57,7 +59,7 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader]
         private void load(FileStore fileStore)
         {
-            dependencies.Cache(new TextureStore(new RawTextureLoaderStore(fileStore.Store), false) { ScaleAdjust = 1, });
+            dependencies.Cache(new TextureStore(new RawTextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
 
             foreach (var layer in Storyboard.Layers)
                 Add(layer.CreateDrawable());

osu.Game/osu.Game.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.901.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2018.906.1" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />