Make Beatmap non-nullable #1027

peppy · 2017-07-19T06:25:17Z

Also removes property from OsuScreen, instead using the bindable backing directly.

Depends on Implement NonNullableBindable osu-framework#912
Depends on Add helper method to set a bindable to its default value osu-framework#911

…t be loaded

Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.

osu.Game/Beatmaps/ControlPoints/ControlPoint.cs

+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return Time.Equals(other.Time);


osu.Game/Beatmaps/DummyWorkingBeatmap.cs

+
+                public override ScoreProcessor CreateScoreProcessor()
+                {
+                    throw new System.NotImplementedException();


osu.Game/Database/BeatmapDifficulty.cs

@@ -10,7 +10,7 @@ public class BeatmapDifficulty
        /// <summary>
        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
        /// </summary>
-        public const float DEFAULT_DIFFICULTY = 5;
+        public const float DEFAULT_DIFFICULTY = 0;


osu.Game/Database/BeatmapDatabase.cs

+        /// <summary>
+        /// A default representation of a WorkingBeatmap to use when no beatmap is available.
+        /// </summary>
+        public WorkingBeatmap DefaultBeatmap { get; set; }


smoogipoo

Looks okay for now 👍

peppy added 15 commits July 19, 2017 15:16

Add a dummy beatmap provider for use in BeatmapInfoWedge

e47faf4

Don't show theme song in playlist

5941658

Stop playing previous beatmap even if new beatmap has no track

df60fc0

Use a better default for difficulty values

6016310

Move DummyWorkingBeatmap to a more global level (OsuScreen)

21984ba

Fix incorrect equality check when TimingPointAt returns a default T

007b343

Give the dummy beatmap a background

3289d93

Move dummy to BeatmapDatabase

f168ee6

Dummy beatmap has dummy ruleset

632d2e8

Simplify state changes

0846414

Make Beatmap (bindable) non-nullable.

d0dea33

Give song select a better default background whecn the beatmap's can'…

8e8767c

…t be loaded

Fix some test regressions

21d0742

Remove many now unnecessary null-checks

64ebc01

Remove incorrect looping reset behaviour

c8593a3

Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.

smoogipoo requested changes Jul 19, 2017

View reviewed changes

peppy added 6 commits July 19, 2017 18:09

Make DefaultBeatmap private get.

35157ca

Simplify comparator

a01209c

Reference system

0b53f1a

Update framework

8764d88

Set zero-difficulty values local to the dummy beatmap

d7dddec

Merge branch 'master' into non-null-beatmap

da92fcc

peppy force-pushed the non-null-beatmap branch from 71d5ddf to 0587422 Compare July 19, 2017 09:42

Fix broken test case

8ce71ef

peppy force-pushed the non-null-beatmap branch from 0587422 to 8ce71ef Compare July 19, 2017 09:48

Fix remaining test case issues

38431f8

smoogipoo approved these changes Jul 19, 2017

View reviewed changes

smoogipoo merged commit a7d4a3d into ppy:master Jul 19, 2017

benpigchu mentioned this pull request Jul 24, 2017

you can select the theme song in the playlist overlay #863

Closed

peppy deleted the non-null-beatmap branch July 31, 2017 08:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make Beatmap non-nullable #1027

Make Beatmap non-nullable #1027

peppy commented Jul 19, 2017 •

edited

Loading

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

smoogipoo left a comment

Make Beatmap non-nullable #1027

Make Beatmap non-nullable #1027

Conversation

peppy commented Jul 19, 2017 • edited Loading

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

smoogipoo left a comment

Choose a reason for hiding this comment

peppy commented Jul 19, 2017 •

edited

Loading