668 Commits

• Replace BeatDivisorFinder with GetClosestBeatDivisor
  Justus Franklin Tumacder · 2021-05-01 11:57:47 +08:00
  fdf8c12947
• Merge branch 'master' of https://github.com/ppy/osu into justusft/mania-color-snap
  Justus Franklin Tumacder · 2021-05-01 11:20:28 +08:00
  ecb053b0de
• Merge branch 'master' into basic-compose-checks
  Dan Balasescu · 2021-04-30 23:41:46 +09:00
  e6eea73b8b
• Merge pull request #12592 from ekrctb/fix-entry-lifetime

  Fix Setting DHO's lifetime doesn't update its entry lifetime

  Dan Balasescu · 2021-04-28 01:38:19 +09:00
  5fc731967b
• Simplify HitObjectLifetimeEntry logic a bit
  ekrctb · 2021-04-27 19:37:01 +09:00
  b87446a577
• Update osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Derrick Timmermans · 2021-04-27 11:29:16 +02:00
  3ea55314f2
• Adopt framework change of LifetimeEntry

  Override SetLifetimeStart/SetLifetimeEnd separately to track individual assignment. It is necessary to ensure real lifetime is not lost when lifetime is partially updated.

  ekrctb · 2021-04-27 17:54:18 +09:00
  3899e500d3
• Use now-public Entry.SetLifetime method
  ekrctb · 2021-04-27 15:25:05 +09:00
  c9e6ca5378
• Use overriding instead of hiding in HitObjectLifetimeEntry

  Hidden properties are used when the type is the base class. It caused issues when `DrawableHitObject` logic is factored out to `PoolableDrawableWithLifetime` because it is using the base `LifetimeEntry`, not `HitObjectLifetimeEntry`.

  ekrctb · 2021-04-27 15:23:33 +09:00
  a2c0951d94
• Add concurrent objects check

  Here we use `IHasColumn` to support rulesets with columns, and so I moved that interface out into `osu.Game` from `osu.Game.Rulesets.Mania`.
  
  We also use the same threshold as the unsnap check to ensure that no problems slip through. Specifically where an object is simultaneously not concurrent and not unsnapped but still on the same tick.

  Naxess · 2021-04-26 20:17:18 +02:00
  a3570e18dd
• Add method to safely refresh DrawableHitObject transforms
  Derrick Timmermans · 2021-04-26 20:08:40 +02:00
  08a232f7fa
• Rename DrawableObject -> PoolableDrawableWithLifetime
  ekrctb · 2021-04-26 12:06:21 +09:00
  6561a7c7d6
• freeIfInUse -> free, and add comments
  ekrctb · 2021-04-26 12:04:59 +09:00
  20e3cadd30
• Remove redundant statement (lifetime is set in base)
  ekrctb · 2021-04-26 11:47:38 +09:00
  e6474e6ff7
• Add tests for BeatDivisorFinder
  Justus Franklin Tumacder · 2021-04-26 07:07:32 +08:00
  8bb1fcd39b
• Use existing snap list from BindableBeatDivisor
  Bartłomiej Dach · 2021-04-25 17:52:11 +02:00
  33a5c156a1
• Rename {Snap -> BeatDivisor}Finder
  Bartłomiej Dach · 2021-04-25 17:44:26 +02:00
  e14255f395
• Fix cake errors
  Justus Franklin Tumacder · 2021-04-25 09:21:25 +08:00
  211bff6a8f
• Add xmldoc to SnapFinder
  Justus Franklin Tumacder · 2021-04-25 08:53:45 +08:00
  1f48378ce7
• Move SnapFinder from mania ruleset to osu.Game
  Justus Franklin Tumacder · 2021-04-25 07:35:53 +08:00
  e0ca44c908
• Factor out pooling and lifetime management logic of DHO to a base class
  ekrctb · 2021-04-21 17:37:42 +09:00
  b877a29737
• Remove SkinReloadableDrawable inheritance from DHO
  ekrctb · 2021-04-21 17:34:57 +09:00
  bbf2ec369b
• Deprecate old overload of Apply
  ekrctb · 2021-04-21 14:32:37 +09:00
  3fbeadf318
• Fix wrong InitialLifetimeOffset is used for a non-pooled DHO.

  HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.

  ekrctb · 2021-04-21 11:32:01 +09:00
  73d3da1687
• Revert "Fix wrong InitialLifetimeOffset is used for a non-pooled DHO."

  This reverts commit 67fcfd9d

  ekrctb · 2021-04-21 10:02:50 +09:00
  44ff08cce4
• Fix wrong InitialLifetimeOffset is used for a non-pooled DHO.

  HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.

  ekrctb · 2021-04-21 09:48:16 +09:00
  67fcfd9dbc
• Rename UnmanagedHitObjectEntry -> SyntheticHitObjectEntry

  "Unmanaged" was confusing because its lifetime is still managed by the HitObjectContainer.

  ekrctb · 2021-04-21 09:23:23 +09:00
  e80c3c317a
• Ensure a non-null hitobject entry has a non-null Result
  ekrctb · 2021-04-20 15:18:36 +09:00
  c6ee4e900e
• Make single-argument overloead of DHO.Apply public
  ekrctb · 2021-04-20 10:11:36 +09:00
  8a8b9084ef
• Now, DHO.lifetimeEntry can be non-null even it is not fully applied
  ekrctb · 2021-04-20 09:22:16 +09:00
  1bc63a4c61
• Add doc comment
  ekrctb · 2021-04-20 08:38:02 +09:00
  c1b4aaaa03
• Create synthetic LifetimeEntry for a DHO when not supplied

  Now, a DHO is always associated with a HitObjectLifetimeEntry while used.
  Result is always stored in the entry, and not in the DHO.

  ekrctb · 2021-04-19 21:54:19 +09:00
  2c487ddb70
• Make DHO application logic clearer with Entry/HitObject separation
  ekrctb · 2021-04-19 19:56:17 +09:00
  5afdc3ff66
• Centralise length validation function
  Dean Herbert · 2021-04-16 15:45:24 +09:00
  d38e294d96
• Remove usage of Lazy<List<...>> for NestedHitObjects
  ekrctb · 2021-04-15 18:26:01 +09:00
  50fad47ebc
• Remove empty <returns> xmldoc
  Dean Herbert · 2021-04-12 17:46:14 +09:00
  b5954a55ad
• Remove unused using
  smoogipoo · 2021-04-09 13:58:24 +09:00
  76981f2547
• Remove obsolete code
  smoogipoo · 2021-04-09 13:56:58 +09:00
  8293b06c0a
• Merge branch 'master' into circular-arc-freeze
  Dean Herbert · 2021-04-08 14:33:03 +09:00
  a8839792fd
• Fix last control point starting new segment
  smoogipoo · 2021-04-05 17:49:36 +09:00
  4b29d0ebe2
• Undo public -> internal for PathControlPoint.Changed

  No longer used.

  Naxess · 2021-03-31 20:32:49 +02:00
  7b684339ed
• Move path type correction

  This is better because `PathControlPointVisualizer` is local to the editor, meaning there is no chance that this could affect gameplay.

  Naxess · 2021-03-24 03:02:19 +01:00
  4ae3eaaac6
• Fix inverted return statement

  Forgot to run tests, all passing now.

  Naxess · 2021-03-22 19:48:21 +01:00
  e922e67c98
• Add method documentation
  Naxess · 2021-03-22 19:42:27 +01:00
  3fa5852e00
• Separate condition logic from math logic
  Naxess · 2021-03-22 19:41:48 +01:00
  b11fd7972a
• Improve fallback conditions

  It's possible to create a `PerfectCurve` type path with more than 3 points currently, so this accounts for that.

  Naxess · 2021-03-22 19:10:56 +01:00
  92f713a30e
• Invert if statement
  Naxess · 2021-03-22 19:09:28 +01:00
  80e7c3aba7
• Fix missing newline
  Naxess · 2021-03-22 19:03:55 +01:00
  6911a1b415
• Fix null checks
  Naxess · 2021-03-22 17:32:55 +01:00
  a7076c329c
• Fix newlines/spaces
  Naxess · 2021-03-22 17:32:40 +01:00
  323b875cea