Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a replay analysis overlay #27334

Merged
merged 46 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b5dbf24
early replay analysis settings version
Sheppsu Feb 1, 2024
d255976
Merge branch 'ppy:master' into replay-analysis-settings
Sheppsu Feb 6, 2024
288eed5
new features + improvements
Sheppsu Feb 10, 2024
1d552e7
move skin component logic
Sheppsu Feb 21, 2024
35b8996
revert mod visibility toggle
Sheppsu Feb 22, 2024
f9d9df3
add test for HitMarkerContainer
Sheppsu Feb 22, 2024
af13389
fix hit marker skinnables
Sheppsu Feb 22, 2024
45444b3
fix formatting issues
Sheppsu Feb 23, 2024
2a1fa8c
fix OsuAnalysisSettings text not updating
Sheppsu Feb 23, 2024
4d669c5
implement pooling
Sheppsu Feb 24, 2024
c95e853
remove old files
Sheppsu Feb 24, 2024
8cdd9c9
skinning changes
Sheppsu Feb 24, 2024
822ecb7
remove unnecessary changes
Sheppsu Feb 24, 2024
29e5f40
remove skinnable
Sheppsu Feb 28, 2024
cefc835
test scene for OsuAnalysisContainer
Sheppsu Feb 28, 2024
7687ab6
fix code formatting
Sheppsu Feb 28, 2024
1ed94e5
Merge branch 'master' into replay-analysis-settings
Sheppsu Sep 1, 2024
a2b15fc
rework code logic to make more sense
Sheppsu Sep 3, 2024
56db29d
make test go indefinitely
Sheppsu Sep 3, 2024
a549cdd
persist analysis settings
Sheppsu Sep 3, 2024
c89597b
fix config mistake
Sheppsu Sep 4, 2024
59ff8c4
fix analysis container creation
Sheppsu Sep 4, 2024
0e16508
Merge branch 'master' into replay-analysis-settings
peppy Sep 4, 2024
a417fec
Move analysis container implementation completely local to osu! ruleset
peppy Sep 4, 2024
992a0da
Rename classes slightly
peppy Sep 4, 2024
cc3d220
Allow settings to be added to replay HUD from ruleset
peppy Sep 4, 2024
9b81deb
Fix settings not working if `ReplayPlayer` is not available
peppy Sep 4, 2024
6c07b87
Isolate configuration container from analysis overlay
peppy Sep 4, 2024
6a30972
Make test more usable
peppy Sep 4, 2024
dcb463a
Split out classes and avoid weird configuration stuff
peppy Sep 4, 2024
7f9a98a
More renames
peppy Sep 4, 2024
a4a37c5
Simplify lifetime entries and stuff
peppy Sep 4, 2024
a6ed719
Visual design pass
peppy Sep 4, 2024
21146c3
Add back shadow cast
peppy Sep 4, 2024
08ebc83
Fix path getting misaligned with negative position values
peppy Sep 5, 2024
ee26ff2
Add out-of-bounds tests to test case
peppy Sep 5, 2024
2d198e5
Second visual design pass
peppy Sep 5, 2024
4f719b9
One more rename pass
peppy Sep 5, 2024
7390d89
Switch to using `CircularProgress` for more consistent sizing
peppy Sep 5, 2024
7983a76
Update test scene to show more button holds (including both buttons s…
peppy Sep 5, 2024
47a9b34
Rename config variables and setting strings
peppy Sep 5, 2024
0f01a85
Add note about cursor hiding being potentially flaky
peppy Sep 5, 2024
a1cf67b
Add setting to adjust replay analysis display length
peppy Sep 5, 2024
167e3a3
Make loading asynchronous
peppy Sep 5, 2024
7136483
Fix nullability inspections
bdach Sep 5, 2024
b9ddac4
Fix test failures
bdach Sep 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix code formatting
  • Loading branch information
Sheppsu committed Feb 28, 2024
commit 7687ab63edd2b49b4e1a5a2c30be2b9e2b8ca328
3 changes: 2 additions & 1 deletion osu.Game.Rulesets.Osu/UI/OsuAnalysisSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ public partial class OsuAnalysisSettings : AnalysisSettings

private readonly PlayerCheckbox hitMarkerToggle;
private readonly PlayerCheckbox aimMarkerToggle;
private readonly PlayerCheckbox hideCursorToggle;
private readonly PlayerCheckbox aimLinesToggle;

public OsuAnalysisSettings(DrawableRuleset drawableRuleset)
: base(drawableRuleset)
{
PlayerCheckbox hideCursorToggle;

Children = new Drawable[]
{
hitMarkerToggle = new PlayerCheckbox { LabelText = PlayerSettingsOverlayStrings.HitMarkers },
Expand Down
1 change: 0 additions & 1 deletion osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public partial class OsuPlayfield : Playfield
private readonly JudgementPooler<DrawableOsuJudgement> judgementPooler;

public SmokeContainer Smoke { get; }

public FollowPointRenderer FollowPoints { get; }

public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/PlayerSettings/AnalysisSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public abstract partial class AnalysisSettings : PlayerSettingsGroup
{
protected DrawableRuleset DrawableRuleset;

public AnalysisSettings(DrawableRuleset drawableRuleset)
protected AnalysisSettings(DrawableRuleset drawableRuleset)
: base("Analysis Settings")
{
DrawableRuleset = drawableRuleset;
Expand Down
1 change: 1 addition & 0 deletions osu.Game/Screens/Play/ReplayPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ private void load(OsuConfigManager config)
HUDOverlay.PlayerSettingsOverlay.AddAtStart(playbackSettings);

var analysisSettings = DrawableRuleset.Ruleset.CreateAnalysisSettings(DrawableRuleset);

if (analysisSettings != null)
{
HUDOverlay.PlayerSettingsOverlay.AddAtStart(analysisSettings);
Expand Down