Commit Graph

136 Commits

Author SHA1 Message Date
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
417e31d77f Rename function for consistency 2020-05-26 10:17:56 +09:00
d69111c665 Fix spelling of breadth 2020-05-26 10:17:34 +09:00
8fc60d12c9 Add back comments 2020-05-25 22:09:09 +09:00
2c16619ecd Move time to position conversion to ScrollingHitObjectContainer 2020-05-25 19:32:39 +09:00
f395ef24a4 Merge branch 'master' into editor-position-snap 2020-05-22 16:42:09 +09:00
6f388b731e Fix display start time in sequential scroll algorithm 2020-05-21 21:56:59 +02:00
5ad7842b91 Move ScreenSpacePositionAtTime to inside Column implementation 2020-05-21 13:33:02 +09:00
2f12c4126a Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-10 13:49:08 +09:00
be3b77cf25 Fix potentially skipping hitobject updates 2020-05-08 20:09:59 +09:00
22dda3fe02 Make ScrollingHitObjectContainer respond to defaults applied events 2020-05-08 18:49:58 +09:00
86ef73aa27 Implement HitObjectContainer.Clear() 2020-04-23 11:16:59 +09:00
7b2144a1a7 Fix merge mishap 2020-04-03 23:31:46 +09:00
3289fa7c66 Merge branch 'master' into better-mania-scrollspeed 2020-04-03 23:25:14 +09:00
d90db5649d Improve comment slightly 2020-04-03 18:32:07 +09:00
1ff2cc31d1 Implement more familiar scroll speed options in mania 2020-04-03 18:25:01 +09:00
b42d1104b7 Fix mania converts scrolling at incorrect speeds 2020-04-03 13:16:01 +09:00
6c28fd21c7 osu-side changes 2020-02-24 20:52:15 +09:00
5fde4f2c0c Fix lifetime calculation in overlapping algorithm
Changes to lifetime calculation in scrolling rulesets introduced in
#7367, which aimed to account for the distance between hit objects'
origin and its edge entering the scrolling area, fixed some issues with
hitobjects appearing abruptly, but also regressed some other scenarios.

Upon investigation, the regression was localised to the overlapping
scroll algorithm. The reason for this was two-fold:

* The previous code used TimeAt() to calculate the time of travel from
  the hit object's edge to its origin. For other algorithms, that time
  can be accurately reconstructed, because they don't have periods of
  time where there are multiple hit objects scrolling at different
  velocities.

  That invariant does not hold for the overlapping algorithm, therefore
  it is possible for different values to be technically correct for
  TimeAt(). However, the only value that matters for the adjustment
  is the one that's indicated by the control point that applies to the
  hit object origin, which can be uniquely identified.

* Additionally, the offset returned (even if correct) was applied
  externally to the hit object's start time and passed to
  GetDisplayStartTime(). In the overlapping algorithm, the choice of
  control point used in GetDisplayStartTime() is important, since
  the value of the speed multiplier is read within.

  Externally rewinding the hit object's start time meant that in some
  cases the speed multiplier of the *previous* control point is applied,
  which led to hit objects appearing too late if the scrolling rate
  decreased.

Because of the above, modify GetDisplayStartTime() to take the offset
into account in all algorithms, and apply the adjustment correctly
inside of them. The constant and sequential algorithms needed no
adjustment from the previous logic, since:

* the constant algorithm disregarded control points, and
* the sequential algorithm would effectively rewind to time = 0,
  calculate the absolute distance from time = 0 to the hit object start,
  apply the origin offset *to the absolute distance*, and then convert
  back to time, applying all control points in sequence. Due to this
  it was impossible for control points to get mixed up while
  calculating.

As for the overlapping algorithm, the high-level logic is as follows:

* The distance that the origin has to travel is the length of the scroll
  plus the distance from the origin to the object edge.
* The above distance divided by the scroll length gives the relative
  scroll lengths that the object has to travel.
* As one relative scroll length takes one time range, the relative
  travel length multiplied by the time range gives the absolute travel
  time of the object origin.
* Finally, the control point multiplier applicable at origin time is
  applied to the whole travel time.

Correctness of the above is demonstrated by visual tests added before
and headless unit tests of the algorithms themselves. The sequential
scroll algorithm was not covered by unit tests, and remains uncovered
due to floating-point inaccuracies that should be addressed separately.
2020-02-06 23:13:28 +01:00
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
193e41f878 Add origin adjustment for hitobject lifetime
Visual inspection of taiko gameplay has shown that hitobjects appeared
on screen only when the origin of the hitobject came into the bounds
of the screen, instead of appearing when any visible part of the
hitobject came into the screen bounds.

This behaviour was due to lifetime calculation being based on the origin
of the hitobject and not taking into account the actual object
dimensions. Adjust the lifetime start of the hitobject by subtracting
the time needed to show the part of the hitobject that should already
be visible on screen when the origin comes into frame.
2019-12-26 20:37:29 +01:00
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
b1b234c6fb Use paramref. 2019-11-17 20:49:36 +08:00
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
0171b2ae7c Fix scrolling hitobjects expiring too soon 2019-11-01 12:10:03 +09:00
244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
4abe0473b9 Fix relative beat length not considering slider multiplier 2019-09-24 16:49:42 +09:00
af0c15a93c Fix initial hitobject states not being recomputed correctly 2019-09-24 16:48:39 +09:00
d74e1b9b64 Remove from dictionary on Remove() 2019-09-02 15:06:43 +09:00
8f8d35bd15 Delay initial hitobject state computation 2019-09-02 15:06:34 +09:00
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
f6ad95018a Centralise default beat length specification 2019-08-28 20:22:16 +09:00
6aab7168d4 Merge branch 'master' into relative-beat-lengths 2019-08-27 10:59:52 +09:00
0422c19c2f Group lifetime setters together 2019-08-26 19:06:23 +09:00
fb1cd9e5e7 Add a sane default lifetime end for scrolling hitobjects 2019-08-26 16:47:23 +09:00
1cfe2b7de8 Fix timing points beyond the end time potentially becoming dominant 2019-08-26 16:31:34 +09:00
d99c60adc7 Provide a way to scale beat lengths relative to each other 2019-08-26 12:51:13 +09:00
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
936c3e1ed9 Add safety type check to DrawableScrollingRuleset 2019-03-20 11:34:06 +09:00
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00