Replay loading via drag-drop huzzah! #436

peppy · 2017-03-04T10:25:27Z

This is not ready to merge. Do not merge this.

# Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs

AppVeyorBot · 2017-03-04T10:25:54Z

❌ Build osu master-214-dveikrts failed (commit 0f8b9e3a10 by @peppy)

AppVeyorBot · 2017-03-04T12:36:42Z

❌ Build osu master-214-xcykalgx failed (commit a6114de01e by @peppy)

# Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

Doesn't work on complex sliders yet.

AppVeyorBot · 2017-03-05T08:49:23Z

❌ Build osu master-221-mmnafqhx failed (commit 6cf87e3884 by @peppy)

osu.Desktop.VisualTests/Tests/TestCaseReplay.cs

+using SharpCompress.Compressors.LZMA;
+using SharpCompress.Readers;
+using KeyboardState = osu.Framework.Input.KeyboardState;
+using MouseState = osu.Framework.Input.MouseState;


osu.Desktop/OsuGameDesktop.cs

-            ImportBeatmapsAsync(filePaths);
+
+            if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
+                Task.Run(() => BeatmapDatabase.Import(filePaths));


osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs

-        double hit50 = 150;
-        double hit100 = 80;
-        double hit300 = 30;
+        //todo: these aren't constants.


osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs

@@ -21,7 +21,7 @@ public class CirclePiece : Container

        public CirclePiece()
        {
-            Size = new Vector2(128);
+            Size = new Vector2((float)DrawableHitCircle.CIRCLE_RADIUS * 2);


osu.Game.Modes.Osu/OsuAutoReplay.cs

+
+namespace osu.Game.Modes.Osu
+{
+    public class OsuAutoReplay : LegacyReplay


osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -17,6 +18,14 @@ public abstract class WorkingBeatmap : IDisposable

        public readonly BeatmapSetInfo BeatmapSetInfo;

+        /// <summary>
+        /// A play mode that is preferred for this beatmap. This allows for conversion between game modes where feasible,


osu.Game/Database/BeatmapDatabase.cs

                foreach (var name in mapNames)
-                    using (var stream = new StreamReader(reader.GetStream(name)))
+                    using (var raw = archive.GetStream(name))
+                    using (var ms = new MemoryStream()) //we need a memory stream so we can seek and shit


osu.Game/Input/Handlers/ReplayInputHandler.cs

+        /// This is to ensure accurate playback of replay data.
+        /// </summary>
+        /// <param name="time">The time which we should use for finding the current frame.</param>
+        /// <returns>The usable time value. If null, we shouldn't be running components reliant on this data.</returns>


osu.Game/Modes/LegacyReplay.cs

+
+            private bool nextFrame()
+            {
+                int newFrame = MathHelper.Clamp(currentFrameIndex + (currentDirection > 0 ? 1 : -1), 0, replayContent.Count - 1);


osu.Game/Modes/LegacyReplay.cs

+            int currentFrameIndex;
+
+            public LegacyReplayFrame CurrentFrame => !hasFrames ? null : replayContent[currentFrameIndex];
+            public LegacyReplayFrame NextFrame => !hasFrames ? null : replayContent[MathHelper.Clamp(currentDirection > 0 ? currentFrameIndex + 1 : currentFrameIndex - 1, 0, replayContent.Count - 1)];


osu.Game/Modes/LegacyReplay.cs

+                    if (!hasFrames)
+                        return null;
+
+                    if (AtLastFrame)


osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -26,6 +27,8 @@ public abstract class WorkingBeatmap : IDisposable

        public PlayMode PlayMode => beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;

+        public readonly Bindable<Mod[]> Mods = new Bindable<Mod[]>();


osu.Game.Modes.Osu/Objects/OsuHitObject.cs

+        public const double HITTABLE_RANGE = 300;
+        public const double HIT_WINDOW_50 = 150;
+        public const double HIT_WINDOW_100 = 80;
+        public const double HIT_WINDOW_300 = 30;


osu.Game/Modes/LegacyReplay.cs

+
+            public Vector2 Size => new Vector2(512, 384);
+
+            private const double sixty_frame_time = 1000 / 60;


AppVeyorBot · 2017-03-07T03:30:14Z

❌ Build osu master-223-mviacpex failed (commit 7e98bcc6e6 by @peppy)

# Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs

# Conflicts: # osu.Game/Modes/Mod.cs

peppy added 10 commits March 1, 2017 22:04

Basic partial replay support.

58ae9e8

wankoz

b6e7e05

Fix CursorTrail corruption by resetting on load.

8040d6a

Fix audio disposal issues and share more code between visualtests.

4bd85fe

Merge remote-tracking branch 'upstream/master' into replay

9e1383f

# Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs

Create class hierarchy for Score/Replay storage.

adb6f01

Remove misleading beatmap import method.

b294386

Change IPC to make sense.

aa9d856

Fix WaveOverlayContainer always being visible.

a8deb4f

Replay loading via drag-drop huzzah!

95e2e2b

peppy added the wip label Mar 4, 2017

peppy added 2 commits March 4, 2017 21:35

Cancel previous load attempts before starting a new score load.

a5d0440

Don't show pause menu when watching replays.

7a6a614

peppy added 3 commits March 5, 2017 17:45

Merge branch 'master' into replay

4e4408c

# Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

Move PreferredPlayMode to WorkingBeatmap.

7afcac3

Add osu! autoplay generation.

1c5b918

Doesn't work on complex sliders yet.