1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 17:13:07 +08:00
Commit Graph

444 Commits

Author SHA1 Message Date
Dean Herbert
e31d69c749 Add commit status to EndPlacement; call BeginPlacement on initial movement 2020-02-07 18:02:48 +09:00
Dan Balasescu
7b70481a10
Merge branch 'master' into fix-editor-test-scene 2020-02-07 17:20:43 +09:00
Dean Herbert
9997ae17bc Fix editor test scene exiting after loading 2020-02-07 16:42:56 +09:00
Bartłomiej Dach
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
Dean Herbert
09273d1da9 Fix test scene not correctly building a playable beatmap 2020-02-05 18:35:31 +09:00
Bartłomiej Dach
434c0d92e4 Use Bindable{Float,Double}s everywhere
To avoid further floating-point comparison bugs, remove all usages of
Bindable<{float,double}>, replacing them with their
Bindable<Float,Double> counterparts.
2020-02-01 22:50:29 +01:00
Dean Herbert
c4331f34d5 Consume TearDownSteps 2020-01-31 22:09:39 +09:00
Dean Herbert
5f48affcba Centralise screen exit logic to ScreenTestScene 2020-01-31 14:19:29 +09:00
Dean Herbert
0e0c730095 Add a method to recycle test storage between runs 2020-01-28 19:44:32 +09:00
Dean Herbert
1f0aaabf7b Add tests 2020-01-27 12:21:17 +09:00
Dean Herbert
bd96cf94a6 Begin refactoring SelectionBlueprint to handle non-drawable HitObjects 2020-01-21 12:47:14 +09:00
smoogipoo
878e9f182e Add storyboard sample test scene 2020-01-02 15:23:41 +09:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
952bc96bbf Use GameBase data sources for Beatmap/Mods/Ruleset
Sourced in via OsuScreenDependencies for management
2019-12-13 20:05:38 +09:00
Dean Herbert
6c8f325063 Add failing test 2019-12-11 15:46:07 +09:00
Dean Herbert
f7f4a57c5f Update bindable types in line with framework 2019-12-10 16:48:24 +09:00
Dean Herbert
cdde5d1d69 Fix song select filters not reapplied if in a child screen
Closes https://github.com/ppy/osu/issues/6980.
2019-12-10 02:30:23 +09:00
Huo Yaoyuan
5375af7820 Remove other Equals(object) calls. 2019-12-03 20:23:27 +08:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
8d1b11d4bd Add storyboard lead-in tests 2019-11-21 18:50:54 +09:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
64fc5007fc Use language primitive types. 2019-11-12 19:56:45 +08:00
Dean Herbert
0113ab5e56
Add local preserving container to OsuTestScene to ensure correc… (#6805)
Add local preserving container to OsuTestScene to ensure correct test dimensions
2019-11-12 16:40:40 +09:00
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
13fd95d513 Remove misplaced usings 2019-11-11 14:03:29 +09:00
Dean Herbert
dc88bd3d61 Add local preserving container to OsuTestScene to ensure correct test dimensions 2019-11-11 13:52:04 +09:00
smoogipoo
cfdf710676 Add test 2019-10-31 16:51:58 +09:00
Dean Herbert
179cde917b
Merge branch 'master' into rework-selection-updates 2019-10-06 15:00:56 +08:00
Dean Herbert
6fce646369
Merge branch 'master' into placement-blueprint-movement 2019-10-04 19:05:56 +08:00
smoogipoo
2d0c522398 Remove unused method 2019-10-03 18:43:46 +09:00
smoogipoo
f2ba87a1d2 Fix placement blueprint test scenes not working 2019-10-03 16:28:56 +09:00
Dean Herbert
6268bbcfc8
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-03 15:12:21 +08:00
smoogipoo
a310c4b65f Make selection blueprints a bit more testable 2019-10-01 19:32:47 +09:00
smoogipoo
cc533e8fe4 Remove BindableBeatmap 2019-10-01 17:24:47 +09:00
smoogipoo
04ac414249 Fix memory leaks due to audio track recycle order 2019-10-01 13:49:09 +09:00
Dean Herbert
a06cb54732
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-09-20 15:28:08 +09:00
Dean Herbert
2046f64b22 Revert clamping logic 2019-09-18 16:07:02 +09:00
Dean Herbert
057c4aa795 Remove unused using statement 2019-09-17 22:42:20 +09:00
Dean Herbert
77947e8309 Fix rewind tests failing 2019-09-17 22:33:27 +09:00
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Bartłomiej Dach
11eda44d34 Migrate decoding to line-buffered reader
Migrate all usages of StreamReader in the context of decoding beatmaps,
storyboards or skins to the new LineBufferedReader.
2019-09-15 01:28:07 +02:00
Dean Herbert
2cd3657b5e
Merge branch 'master' into beatmap-video 2019-09-13 23:08:57 +09:00
Dean Herbert
2379b665e3 Use InvalidOperationException 2019-09-13 22:15:11 +09:00
Dean Herbert
d385c35955
Apply suggestions from code review
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-13 21:55:45 +09:00
Andrei Zavatski
437e121056 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:39:58 +03:00
Dean Herbert
7cb79dd760 Fix incorrect DI usage of IAPIProvider in many tests 2019-09-13 17:15:33 +09:00
Dean Herbert
4df6bd5477
Merge branch 'master' into use-dummy-api-for-overall-tests 2019-09-05 14:27:01 +09:00
Dean Herbert
c59a2bf9bb Fix tests crashing if a ruleset doesn't provide a NoFail mod 2019-09-04 20:29:10 +09:00
smoogipoo
fc668d8a74 Move autoplay mod to a less overridable location 2019-09-02 13:24:39 +09:00
smoogipoo
cad68bb82f Add autoplay helper property 2019-09-02 12:54:59 +09:00
Andrei Zavatski
6e5cb8a318 implement video parsing 2019-08-30 23:19:34 +03:00
Dean Herbert
01aede3e29 Add comprehensive skin fallback integration testing 2019-08-28 19:57:17 +09:00
smoogipoo
ed4dda1936 Support beatmap conversion tests with mods 2019-08-01 12:49:01 +09:00
smoogipoo
0108700793 Make beatmap conversion test use WorkingBeatmap 2019-08-01 12:44:10 +09:00
iiSaLMaN
958e3fb68b Add a property for acquiring online API access 2019-07-31 22:42:23 +03:00
Dean Herbert
c514cbe2b7 Add basic skinning test 2019-07-29 17:27:00 +09:00
Dean Herbert
c14c3ba8ec Move database isolation logic to OsuTestScene for easier reuse 2019-07-29 16:57:02 +09:00
Dean Herbert
1072431fbb Fix test StackOverflows 2019-06-27 14:08:58 +09:00
Dean Herbert
8b0aaccfe6 Add finaliser to WorkingBeatmap 2019-06-27 13:56:36 +09:00
Dean Herbert
1374da7c41 Remove all calls to return user input 2019-06-07 12:54:57 +09:00
Dean Herbert
0fc2c596b6 Add toggle for input priority in manual input tests 2019-06-07 12:53:51 +09:00
Dean Herbert
b8fc535124 Fix blueprint tests crashing due to out-of-order operations 2019-06-04 12:08:23 +09:00
Dean Herbert
b52276c489 Pass individual components to DummyWorkingBeatmap, not game 2019-05-31 14:51:12 +09:00
Dean Herbert
f33a5bc54c Centralise and update WorkingBeatmap creation in test cases 2019-05-31 14:40:53 +09:00
Dean Herbert
a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
Dean Herbert
1ccef61f7b Fix some missed instances of TestCase 2019-05-15 18:32:29 +09:00
Roman Kapustin
459a285cd8 Rename test cases to test scenes inline with the framework change 2019-05-14 22:37:25 +03:00
Dean Herbert
4c221e43a9 Apply minimal changes to make framework compile 2019-05-14 18:39:56 +09:00
smoogipoo
bde2d552b6 Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
# Conflicts:
#	osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
2019-05-10 22:16:59 +09:00
Dean Herbert
97796a8578 Attempt to fix failing tests by delaying starting of the gameplay clock 2019-05-10 18:10:07 +09:00
smoogipoo
7c105fd99f Fix testcase players pausing on window unfocus 2019-05-10 15:39:25 +09:00
smoogipoo
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
smoogipoo
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
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues 2019-04-27 21:01:21 +09:00
smoogipoo
32e71a6314 Fix incorrect seeking behaviour of TrackVirtualManual 2019-04-26 16:15:42 +09:00
David Zhao
9da13cb463
Merge branch 'master' into flashlight-dim 2019-04-25 23:15:15 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Dan Balasescu
9fa8f62077
Merge branch 'master' into update-framework 2019-04-25 12:25:17 +09:00
Dean Herbert
4f31eee5ad
Merge branch 'master' into flashlight-dim 2019-04-24 17:01:11 +09:00
smoogipoo
6add395288 Fix gameplay cursor being hidden in tests/replays 2019-04-23 13:32:44 +09:00
Dean Herbert
52336e9062 Fix pause tests 2019-04-23 11:54:41 +09:00
Dean Herbert
8ffb2f4224 Remove black box blocking some visual tests from being visible 2019-04-22 10:55:01 +09:00
Dean Herbert
879f6152b0 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-04-17 22:17:10 +08:00
David Zhao
69748abedc Rename to TestCaseOsuFlashlight 2019-04-12 15:09:43 +09:00
David Zhao
dba4ccdf74 Add back flashlight testcase 2019-04-12 14:53:23 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo
1c952e58cc Fix testcase failures 2019-04-09 13:15:48 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
5495a0a70f Add content to ScreenTestCase as protection against overwriting 2019-03-29 14:34:58 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags 2019-03-29 13:45:45 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dan Balasescu
4c038e7f67
Merge branch 'master' into testability-improvements 2019-03-29 10:23:12 +09:00
Dean Herbert
253b18b92f Merge remote-tracking branch 'upstream/master' into better-player-flags 2019-03-28 11:18:54 +09:00
Dean Herbert
dfb7d78903 Fix remaining game host regressions 2019-03-28 01:29:06 +09:00