RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More renames

This commit is contained in:
Dean Herbert 2024-09-04 20:17:22 +09:00
parent dcb463acaf
commit 7f9a98a7aa
No known key found for this signature in database
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
View File

@ -123,9 +123,9 @@ public TestReplayAnalysisOverlay(Replay replay)
{
}
public bool HitMarkersVisible => HitMarkers.Alpha > 0 && HitMarkers.Entries.Any();
public bool AimMarkersVisible => AimMarkers.Alpha > 0 && AimMarkers.Entries.Any();
public bool AimLinesVisible => AimLines.Alpha > 0 && AimLines.Vertices.Count > 1;
public bool HitMarkersVisible => ClickMarkers.Alpha > 0 && ClickMarkers.Entries.Any();
public bool AimMarkersVisible => MovementMarkers.Alpha > 0 && MovementMarkers.Entries.Any();
public bool AimLinesVisible => MovementPath.Alpha > 0 && MovementPath.Vertices.Count > 1;
}
}
}

4
osu.Game.Rulesets.Osu/UI/ReplayAnalysis/HitMarkersContainer.cs → osu.Game.Rulesets.Osu/UI/ReplayAnalysis/ClickMarkerContainer.cs
View File

@ -6,12 +6,12 @@
namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
{
public partial class HitMarkersContainer : PooledDrawableWithLifetimeContainer<HitMarkerEntry, HitMarker>
public partial class ClickMarkerContainer : PooledDrawableWithLifetimeContainer<HitMarkerEntry, HitMarker>
{
private readonly DrawablePool<HitMarkerLeftClick> leftPool;
private readonly DrawablePool<HitMarkerRightClick> rightPool;
public HitMarkersContainer()
public ClickMarkerContainer()
{
AddInternal(leftPool = new DrawablePool<HitMarkerLeftClick>(15));
AddInternal(rightPool = new DrawablePool<HitMarkerRightClick>(15));

4
osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimMarkersContainer.cs → osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementMarkerContainer.cs
View File

@ -6,11 +6,11 @@
namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
{
public partial class AimMarkersContainer : PooledDrawableWithLifetimeContainer<AimPointEntry, HitMarker>
public partial class MovementMarkerContainer : PooledDrawableWithLifetimeContainer<AimPointEntry, HitMarker>
{
private readonly DrawablePool<HitMarkerMovement> pool;
public AimMarkersContainer()
public MovementMarkerContainer()
{
AddInternal(pool = new DrawablePool<HitMarkerMovement>(80));
}

6
osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimLinesContainer.cs → osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementPathContainer.cs
View File

@ -9,12 +9,12 @@
namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
{
public partial class AimLinesContainer : Path
public partial class MovementPathContainer : Path
{
private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
private readonly SortedSet<AimPointEntry> aliveEntries = new SortedSet<AimPointEntry>(new AimLinePointComparator());
public AimLinesContainer()
public MovementPathContainer()
{
lifetimeManager.EntryBecameAlive += entryBecameAlive;
lifetimeManager.EntryBecameDead += entryBecameDead;
@ -32,8 +32,6 @@ protected override void Update()
public void Add(AimPointEntry entry) => lifetimeManager.AddEntry(entry);
public void Clear() => lifetimeManager.ClearEntries();
private void entryBecameAlive(LifetimeEntry entry)
{
aliveEntries.Add((AimPointEntry)entry);

26
osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
View File

@ -18,9 +18,9 @@ public partial class ReplayAnalysisOverlay : CompositeDrawable
private BindableBool aimMarkersEnabled { get; } = new BindableBool();
private BindableBool aimLinesEnabled { get; } = new BindableBool();
protected readonly HitMarkersContainer HitMarkers;
protected readonly AimMarkersContainer AimMarkers;
protected readonly AimLinesContainer AimLines;
protected readonly ClickMarkerContainer ClickMarkers;
protected readonly MovementMarkerContainer MovementMarkers;
protected readonly MovementPathContainer MovementPath;
private readonly Replay replay;
@ -32,9 +32,9 @@ public ReplayAnalysisOverlay(Replay replay)
InternalChildren = new Drawable[]
{
HitMarkers = new HitMarkersContainer(),
AimLines = new AimLinesContainer(),
AimMarkers = new AimMarkersContainer(),
ClickMarkers = new ClickMarkerContainer(),
MovementPath = new MovementPathContainer(),
MovementMarkers = new MovementMarkerContainer(),
};
}
@ -52,9 +52,9 @@ protected override void LoadComplete()
{
base.LoadComplete();
hitMarkersEnabled.BindValueChanged(enabled => HitMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
aimMarkersEnabled.BindValueChanged(enabled => AimMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
aimLinesEnabled.BindValueChanged(enabled => AimLines.FadeTo(enabled.NewValue ? 1 : 0), true);
hitMarkersEnabled.BindValueChanged(enabled => ClickMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
aimMarkersEnabled.BindValueChanged(enabled => MovementMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
aimLinesEnabled.BindValueChanged(enabled => MovementPath.FadeTo(enabled.NewValue ? 1 : 0), true);
}
private void loadReplay()
@ -66,8 +66,8 @@ private void loadReplay()
{
var osuFrame = (OsuReplayFrame)frame;
AimMarkers.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
AimLines.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
MovementMarkers.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
MovementPath.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
bool leftButton = osuFrame.Actions.Contains(OsuAction.LeftButton);
bool rightButton = osuFrame.Actions.Contains(OsuAction.RightButton);
@ -76,7 +76,7 @@ private void loadReplay()
leftHeld = false;
else if (!leftHeld && leftButton)
{
HitMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, true));
ClickMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, true));
leftHeld = true;
}
@ -84,7 +84,7 @@ private void loadReplay()
rightHeld = false;
else if (!rightHeld && rightButton)
{
HitMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, false));
ClickMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, false));
rightHeld = true;
}
}