48 Commits

• Improve song select audio transitions (#37022)

  Based on feedback I've heard more than once ([most
  recently](https://github.com/ppy/osu/discussions/36933)), there's too
  much overlap compared to stable. And it can sound a bit "jumbled" as a
  result, especially when transitioning between two songs with loud and
  "complex" audio.
  
  This also fixes noticeable audio glitching that some users may have been
  experiencing when switching tracks.
  
  ---
  
  Unless there's any very loud objections, I'd ask that review is on the
  code not the audible change. This is the kind of change that I tweak to
  my personal spec and then push out to hear the general reaction.
  
  ### b8d0dfe2ed Better default preview time
  based on global fade
  
  This is an oversight. The preview point wasn't being offset to account
  for the fade in. This is something we do when generating web-side
  previews, which allows for the actual preview point to be audible,
  rather than mid-fade.
  
  ### 8de323b68c Adjust fade in and fade out
  during track transitions to reduce overlap
  
  Yes, I'm aware that the delay is not accounted for in the constant. This
  is intentional because it sounds better. I want this to be an internal
  adjustment which is not to be considered by any external usages of those
  constants. Just sounds better.
  
  ### aab01b0fe5 Remove weird/dated schedule
  usage
  
  This causes audible artifacts in playback. The track is not set to zero
  volume early enough. Original change was made in [this ancient
  PR](https://github.com/ppy/osu/pull/9792) (see
  [commit](https://github.com/ppy/osu/commit/688e4479506645bdacee7cdc7ae9ee9deaa5f1b4)).
  The original failure does not occur. Tests still pass. I'd argue that if
  we encounter this again, it's an issue at the call site, not this code.
  
  This is a drive-by fix, as I noticed this glitching while working on the
  main issue here. Arguably should be it's own PR 🤷 .

  Dean Herbert · 2026-03-18 10:58:05 +01:00
  978e380087
• Revert internal access modifier application

  Unfortunately breaks a few classes (which is fixable), and also breaks
  Moq/Castle dynamic proxies (which is unfortunate).
  
  Relevant error:
  
      System.TypeLoadException : Method 'GetPanelBackground' in type 'Castle.Proxies.IWorkingBeatmapProxy' from assembly 'DynamicProxyGenAssembly2, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null' does not have an implementation.
      Stack Trace:
          at System.Reflection.Emit.TypeBuilder.CreateTypeNoLock()
          at System.Reflection.Emit.TypeBuilder.CreateTypeInfo()
          at Castle.DynamicProxy.Generators.Emitters.AbstractTypeEmitter.BuildType()
          at Castle.DynamicProxy.Generators.BaseInterfaceProxyGenerator.GenerateType(String typeName, INamingScope namingScope)
          at Castle.DynamicProxy.Generators.BaseProxyGenerator.<>c__DisplayClass13_0.<GetProxyType>b__0(CacheKey cacheKey)
          at Castle.Core.Internal.SynchronizedDictionary`2.GetOrAdd(TKey key, Func`2 valueFactory)
          at Castle.DynamicProxy.Generators.BaseProxyGenerator.GetProxyType()
          at Castle.DynamicProxy.DefaultProxyBuilder.CreateInterfaceProxyTypeWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options)
          at Castle.DynamicProxy.ProxyGenerator.CreateInterfaceProxyTypeWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options)
          at Castle.DynamicProxy.ProxyGenerator.CreateInterfaceProxyWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options, IInterceptor[] interceptors)
          at Moq.CastleProxyFactory.CreateProxy(Type mockType, IInterceptor interceptor, Type[] interfaces, Object[] arguments) in C:\projects\moq4\src\Moq\Interception\CastleProxyFactory.cs:line 50
  
  In theory it would be possible to fix this via application of
  
      [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
  
  onto the `osu.Game` assembly, but I think this would be bad precedent.

  Bartłomiej Dach · 2023-06-08 15:23:09 +02:00
  05bd912a21
• Mark relevant components as internal
  Dean Herbert · 2023-06-08 21:01:05 +09:00
  ff4d376c84
• Crop and disable mipmaps on beatmap panel backgrounds

  This is an effort to improve general performance at song select. At
  least on the metal renderer, I can notice very high draw frame overheads
  related to texture uploads.
  
  By reducing the size of the texture uploads to roughly match what is
  actually being displayed on screen (using a relatively inexpensive crop
  operation), we can bastly reduce stuttering both during initial load and
  carousel scroll.
  
  You might ask if it's safe to disable mipmapping, but I've tested with
  lower resolutions and bilinear filtering seems to handle just fine.
  Bilinear without mipmaps only falls apart when you scale below 50% and
  we're not going too far past that at minimum game scale, if at all.

  Dean Herbert · 2023-06-08 16:51:07 +09:00
  3978d4babb
• Refactor IWorkingBeatmap.Background to GetBackground()
  Dean Herbert · 2023-06-08 16:19:32 +09:00
  a842f79ad4
• Rename parameter to read better
  Dean Herbert · 2022-10-12 14:46:35 +09:00
  721bfb5369
• Update IWorkingBeatmap.cs
  NotGumballer91 · 2022-10-10 21:02:23 +08:00
  e3b405cc23
• Allow preparing preview point without looping
  Dean Herbert · 2022-08-17 13:20:24 +09:00
  37799e3b31
• Add more comprehensive xmldoc for beatmap model classes
  Dean Herbert · 2022-07-28 15:41:28 +09:00
  452d82f292
• Automated #nullable processing
  Dan Balasescu · 2022-06-17 16:37:17 +09:00
  f8830c6850
• Remove all NRT changes

  This reverts commit bb9877adab.

  Dean Herbert · 2021-12-22 21:02:06 +09:00
  f179ff33c9
• Reapply IWorkingBeatmap nullability fixed
  Dean Herbert · 2021-12-22 20:48:48 +09:00
  bb9877adab
• Revert "Apply NRT to WorkingBeatmap"

  This reverts commit 9e17d7d4e3.

  Dean Herbert · 2021-12-22 19:14:18 +09:00
  bc47801cbb
• Apply NRT to WorkingBeatmap
  Dean Herbert · 2021-12-22 18:41:45 +09:00
  9e17d7d4e3
• Remove unused load checks
  Dean Herbert · 2021-12-22 18:17:00 +09:00
  f3f491374b
• Enable NRT on IWorkingBeatmap
  Dean Herbert · 2021-12-22 18:17:00 +09:00
  e38e4c0adc
• Remove BeatmapSetInfo and Metadata from interface

  There were very few accesses to this, and after realm they should all be
  done via the `BeatmapInfo`, so let's remove this.

  Dean Herbert · 2021-12-22 18:17:00 +09:00
  967419c9ac
• Use consistent type for mod collection in all overloads
  Bartłomiej Dach · 2021-11-21 11:30:45 +01:00
  bb8e8bc4f0
• Clean up cancellation handling in WorkingBeatmap

  After the recent changes introducing cancellation support to
  `WorkingBeatmap`, it turned out that if the cancellation support was
  used, `GetPlayableBeatmap()` would raise timeout exceptions rather than
  the expected `OperationCanceledException`.
  
  To that end, split off a separate overload for the typical usage, that
  catches `OperationCanceledException` and converts them to beatmap load
  timeout exceptions, and use normal `OperationCanceledException`s in the
  overload that requires a cancellation token to work.

  Bartłomiej Dach · 2021-11-20 17:23:55 +01:00
  6100bf66a6
• Merge branch 'master' into beatmap-cancellation-token
  Dean Herbert · 2021-11-17 11:16:10 +09:00
  0715d40ea0
• Add back default timeout to GetPlayableBeatmap
  Dean Herbert · 2021-11-17 11:06:31 +09:00
  13f3e2eea9
• Merge branch 'master' into i-working-beatmap/difficulty-calculator
  Dean Herbert · 2021-11-16 16:19:22 +09:00
  f5c52755c9
• Standardise naming of CancellationToken parameters
  Dean Herbert · 2021-11-16 14:45:51 +09:00
  6cca657a2d
• Merge branch 'master' into beatmap-cancellation-token
  Dean Herbert · 2021-11-16 14:43:13 +09:00
  53c0682a08
• Implement remaining properties via implicit implementation rather than interface methods
  Dean Herbert · 2021-11-15 19:30:46 +09:00
  a90cfb4a2f
• Update DifficultyCalculator to take an IRulesetInfo
  Dean Herbert · 2021-11-15 19:16:48 +09:00
  369b4ba789
• Expose more of WorkingBeatmap via interface
  Dean Herbert · 2021-11-15 18:25:48 +09:00
  a0e25d18cd
• Remove unnecessary TimeSpan timeout parameter (CancellationToken can now be used)
  Dean Herbert · 2021-11-08 14:33:32 +09:00
  97345ac9e6
• Rename CancellationToken variable
  Tollii · 2021-11-07 13:41:54 +01:00
  d5f5d74a89
• Fix PR comments.

  Nitpick, more cancellation token checks.

  Tollii · 2021-11-06 16:03:53 +01:00
  cf0b757b16
• Add support for a provided cancellation token for GetPlayableBeatmap()
  Tollii · 2021-11-05 23:53:48 +01:00
  f0caa10066
• Improve xmldoc consistency
  Naxess · 2021-04-20 02:30:27 +02:00
  1478bcfa8e
• Add xmldoc to GetStream
  Naxess · 2021-04-20 02:28:38 +02:00
  67e4fe4284
• Add Track as a property to IWorkingBeatmap

  This is implemented by `WorkingBeatmap` already, and is much better to use than loading the track every time we need it.

  Naxess · 2021-04-20 01:35:41 +02:00
  f168247254
• Add GetStream to IWorkingBeatmap
  Naxess · 2021-04-18 01:13:57 +02:00
  bf8789528a
• Centralise and clarify LoadTrack documentation
  Dean Herbert · 2020-08-22 19:42:34 +09:00
  b72f06fef6
• Add explicit LoadTrack method
  Dean Herbert · 2020-08-17 15:38:16 +09:00
  d9debef156
• Rename method
  smoogipoo · 2020-08-07 22:31:41 +09:00
  e87f50f74f
• Move track to MusicController, compiles
  smoogipoo · 2020-08-06 16:24:14 +09:00
  6e42b8219c
• Merge branch 'master' into video-offset
  Dean Herbert · 2020-03-21 20:03:46 +09:00
  729e006c3a
• Apply comment suggestions

  Co-Authored-By: Dean Herbert <pe@ppy.sh>
  Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dan Balasescu · 2020-03-16 11:29:28 +09:00
  f390c1995d
• Add beatmap loading timeout
  smoogipoo · 2020-03-13 13:52:40 +09:00
  f7c036726a
• Render video as a part of the storyboard
  voidedWarranties · 2020-03-07 21:32:03 -08:00
  76c832518f
• Make DrawableRuleset take a converted beatmap
  smoogipoo · 2019-12-12 15:58:11 +09:00
  5861eca80d
• Apply naming suggestions
  Andrei Zavatski · 2019-08-31 16:20:33 +03:00
  94512fea8e
• implement video parsing
  Andrei Zavatski · 2019-08-30 23:19:34 +03:00
  6e5cb8a318
• Remove duplicate getAnimation function and improve namespacing
  Dean Herbert · 2019-08-30 12:59:58 +09:00
  84e4748268
• Add an interface for working beatmaps
  smoogipoo · 2019-08-29 19:38:44 +09:00
  6ab2b20c70