mirror of
https://github.com/ppy/osu.git
synced 2025-01-12 11:42:54 +08:00
More renames
This commit is contained in:
parent
dcb463acaf
commit
7f9a98a7aa
@ -123,9 +123,9 @@ namespace osu.Game.Rulesets.Osu.Tests
|
||||
{
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -6,12 +6,12 @@ using osu.Game.Rulesets.Objects.Pooling;
|
||||
|
||||
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));
|
@ -6,11 +6,11 @@ using osu.Game.Rulesets.Objects.Pooling;
|
||||
|
||||
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));
|
||||
}
|
@ -9,12 +9,12 @@ using osuTK.Graphics;
|
||||
|
||||
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 @@ namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
|
||||
|
||||
public void Add(AimPointEntry entry) => lifetimeManager.AddEntry(entry);
|
||||
|
||||
public void Clear() => lifetimeManager.ClearEntries();
|
||||
|
||||
private void entryBecameAlive(LifetimeEntry entry)
|
||||
{
|
||||
aliveEntries.Add((AimPointEntry)entry);
|
@ -18,9 +18,9 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
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 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
|
||||
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 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
{
|
||||
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 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
{
|
||||
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 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
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 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user