sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-09 05:19:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix some weird private field names (#7149)

Browse Source 
Fix some weird private field names
This commit is contained in:
Dean Herbert 2019-12-11 15:02:24 +09:00 committed by GitHub
commit ae0121c30f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 96 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Rulesets.Catch/MathUtils/FastRandom.cs
View File

@ -12,14 +12,14 @@ namespace osu.Game.Rulesets.Catch.MathUtils
{ {
private const double int_to_real = 1.0 / (int.MaxValue + 1.0); private const double int_to_real = 1.0 / (int.MaxValue + 1.0);
private const uint int_mask = 0x7FFFFFFF; private const uint int_mask = 0x7FFFFFFF;
private const uint y = 842502087; private const uint y_initial = 842502087;
private const uint z = 3579807591; private const uint z_initial = 3579807591;
private const uint w = 273326509; private const uint w_initial = 273326509;
private uint _x, _y = y, _z = z, _w = w; private uint x, y = y_initial, z = z_initial, w = w_initial;
public FastRandom(int seed) public FastRandom(int seed)
{ {
_x = (uint)seed; x = (uint)seed;
} }
public FastRandom() public FastRandom()
@ -33,11 +33,11 @@ namespace osu.Game.Rulesets.Catch.MathUtils
/// <returns>The random value.</returns> /// <returns>The random value.</returns>
public uint NextUInt() public uint NextUInt()
{ {
uint t = _x ^ (_x << 11); uint t = x ^ (x << 11);
_x = _y; x = y;
_y = _z; y = z;
_z = _w; z = w;
return _w = _w ^ (_w >> 19) ^ t ^ (t >> 8); return w = w ^ (w >> 19) ^ t ^ (t >> 8);
} }
/// <summary> /// <summary>

121
osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
View File

@ -83,88 +83,81 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
}; };
} }
private ScrollState _scrollState; private ScrollState scrollState;
private ScrollState scrollState private void setScrollState(ScrollState newstate)
{ {
get => _scrollState; if (scrollState == newstate)
return;
set delayedStateChangeDelegate?.Cancel();
switch (scrollState = newstate)
{ {
if (_scrollState == value) case ScrollState.Scrolling:
return; resetSelected();
_scrollState = value; OnScrollStarted?.Invoke();
delayedStateChangeDelegate?.Cancel(); speedTo(1000f, 200);
tracker.FadeOut(100);
break;
switch (value) case ScrollState.Stopping:
{ speedTo(0f, 2000);
case ScrollState.Scrolling: tracker.FadeIn(200);
resetSelected();
OnScrollStarted?.Invoke(); delayedStateChangeDelegate = Scheduler.AddDelayed(() => setScrollState(ScrollState.Stopped), 2300);
break;
speedTo(1000f, 200); case ScrollState.Stopped:
tracker.FadeOut(100); // Find closest to center
if (!Children.Any())
break; break;
case ScrollState.Stopping: ScrollingTeam closest = null;
speedTo(0f, 2000);
tracker.FadeIn(200);
delayedStateChangeDelegate = Scheduler.AddDelayed(() => scrollState = ScrollState.Stopped, 2300); foreach (var c in Children)
break; {
if (!(c is ScrollingTeam stc))
continue;
case ScrollState.Stopped: if (closest == null)
// Find closest to center
if (!Children.Any())
break;
ScrollingTeam closest = null;
foreach (var c in Children)
{ {
if (!(c is ScrollingTeam stc)) closest = stc;
continue; continue;
if (closest == null)
{
closest = stc;
continue;
}
float o = Math.Abs(c.Position.X + c.DrawWidth / 2f - DrawWidth / 2f);
float lastOffset = Math.Abs(closest.Position.X + closest.DrawWidth / 2f - DrawWidth / 2f);
if (o < lastOffset)
closest = stc;
} }
Trace.Assert(closest != null, "closest != null"); float o = Math.Abs(c.Position.X + c.DrawWidth / 2f - DrawWidth / 2f);
float lastOffset = Math.Abs(closest.Position.X + closest.DrawWidth / 2f - DrawWidth / 2f);
// ReSharper disable once PossibleNullReferenceException if (o < lastOffset)
offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f); closest = stc;
}
ScrollingTeam st = closest; Trace.Assert(closest != null, "closest != null");
availableTeams.RemoveAll(at => at == st.Team); // ReSharper disable once PossibleNullReferenceException
offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f);
st.Selected = true; ScrollingTeam st = closest;
OnSelected?.Invoke(st.Team);
delayedStateChangeDelegate = Scheduler.AddDelayed(() => scrollState = ScrollState.Idle, 10000); availableTeams.RemoveAll(at => at == st.Team);
break;
case ScrollState.Idle: st.Selected = true;
resetSelected(); OnSelected?.Invoke(st.Team);
OnScrollStarted?.Invoke(); delayedStateChangeDelegate = Scheduler.AddDelayed(() => setScrollState(ScrollState.Idle), 10000);
break;
speedTo(40f, 200); case ScrollState.Idle:
tracker.FadeOut(100); resetSelected();
break;
} OnScrollStarted?.Invoke();
speedTo(40f, 200);
tracker.FadeOut(100);
break;
} }
} }
@ -176,7 +169,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
availableTeams.Add(team); availableTeams.Add(team);
RemoveAll(c => c is ScrollingTeam); RemoveAll(c => c is ScrollingTeam);
scrollState = ScrollState.Idle; setScrollState(ScrollState.Idle);
} }
public void AddTeams(IEnumerable<TournamentTeam> teams) public void AddTeams(IEnumerable<TournamentTeam> teams)
@ -192,7 +185,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
{ {
availableTeams.Clear(); availableTeams.Clear();
RemoveAll(c => c is ScrollingTeam); RemoveAll(c => c is ScrollingTeam);
scrollState = ScrollState.Idle; setScrollState(ScrollState.Idle);
} }
public void RemoveTeam(TournamentTeam team) public void RemoveTeam(TournamentTeam team)
@ -217,7 +210,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
if (availableTeams.Count == 0) if (availableTeams.Count == 0)
return; return;
scrollState = ScrollState.Scrolling; setScrollState(ScrollState.Scrolling);
} }
public void StopScrolling() public void StopScrolling()
@ -232,13 +225,13 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
return; return;
} }
scrollState = ScrollState.Stopping; setScrollState(ScrollState.Stopping);
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
scrollState = ScrollState.Idle; setScrollState(ScrollState.Idle);
} }
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()
@ -305,7 +298,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
private void speedTo(float value, double duration = 0, Easing easing = Easing.None) => private void speedTo(float value, double duration = 0, Easing easing = Easing.None) =>
this.TransformTo(nameof(speed), value, duration, easing); this.TransformTo(nameof(speed), value, duration, easing);
private enum ScrollState protected enum ScrollState
{ {
None, None,
Idle, Idle,

22
osu.Game/Online/Multiplayer/PlaylistItem.cs
View File

@ -45,23 +45,25 @@ namespace osu.Game.Online.Multiplayer
[JsonProperty("beatmap")] [JsonProperty("beatmap")]
private APIBeatmap apiBeatmap { get; set; } private APIBeatmap apiBeatmap { get; set; }
private APIMod[] allowedModsBacking;
[JsonProperty("allowed_mods")] [JsonProperty("allowed_mods")]
private APIMod[] allowedMods private APIMod[] allowedMods
{ {
get => AllowedMods.Select(m => new APIMod { Acronym = m.Acronym }).ToArray(); get => AllowedMods.Select(m => new APIMod { Acronym = m.Acronym }).ToArray();
set => _allowedMods = value; set => allowedModsBacking = value;
} }
private APIMod[] requiredModsBacking;
[JsonProperty("required_mods")] [JsonProperty("required_mods")]
private APIMod[] requiredMods private APIMod[] requiredMods
{ {
get => RequiredMods.Select(m => new APIMod { Acronym = m.Acronym }).ToArray(); get => RequiredMods.Select(m => new APIMod { Acronym = m.Acronym }).ToArray();
set => _requiredMods = value; set => requiredModsBacking = value;
} }
private BeatmapInfo beatmap; private BeatmapInfo beatmap;
private APIMod[] _allowedMods;
private APIMod[] _requiredMods;
public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets) public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
{ {
@ -70,20 +72,20 @@ namespace osu.Game.Online.Multiplayer
Beatmap = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets); Beatmap = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
Ruleset = rulesets.GetRuleset(RulesetID); Ruleset = rulesets.GetRuleset(RulesetID);
if (_allowedMods != null) if (allowedModsBacking != null)
{ {
AllowedMods.Clear(); AllowedMods.Clear();
AllowedMods.AddRange(Ruleset.CreateInstance().GetAllMods().Where(mod => _allowedMods.Any(m => m.Acronym == mod.Acronym))); AllowedMods.AddRange(Ruleset.CreateInstance().GetAllMods().Where(mod => allowedModsBacking.Any(m => m.Acronym == mod.Acronym)));
_allowedMods = null; allowedModsBacking = null;
} }
if (_requiredMods != null) if (requiredModsBacking != null)
{ {
RequiredMods.Clear(); RequiredMods.Clear();
RequiredMods.AddRange(Ruleset.CreateInstance().GetAllMods().Where(mod => _requiredMods.Any(m => m.Acronym == mod.Acronym))); RequiredMods.AddRange(Ruleset.CreateInstance().GetAllMods().Where(mod => requiredModsBacking.Any(m => m.Acronym == mod.Acronym)));
_requiredMods = null; requiredModsBacking = null;
} }
} }

38
osu.Game/Screens/Play/GameplayMenuOverlay.cs
View File

@ -188,26 +188,22 @@ namespace osu.Game.Screens.Play
InternalButtons.Add(button); InternalButtons.Add(button);
} }
private int _selectionIndex = -1; private int selectionIndex = -1;
private int selectionIndex private void setSelected(int value)
{ {
get => _selectionIndex; if (selectionIndex == value)
set return;
{
if (_selectionIndex == value)
return;
// Deselect the previously-selected button // Deselect the previously-selected button
if (_selectionIndex != -1) if (selectionIndex != -1)
InternalButtons[_selectionIndex].Selected.Value = false; InternalButtons[selectionIndex].Selected.Value = false;
_selectionIndex = value; selectionIndex = value;
// Select the newly-selected button // Select the newly-selected button
if (_selectionIndex != -1) if (selectionIndex != -1)
InternalButtons[_selectionIndex].Selected.Value = true; InternalButtons[selectionIndex].Selected.Value = true;
}
} }
protected override bool OnKeyDown(KeyDownEvent e) protected override bool OnKeyDown(KeyDownEvent e)
@ -218,16 +214,16 @@ namespace osu.Game.Screens.Play
{ {
case Key.Up: case Key.Up:
if (selectionIndex == -1 || selectionIndex == 0) if (selectionIndex == -1 || selectionIndex == 0)
selectionIndex = InternalButtons.Count - 1; setSelected(InternalButtons.Count - 1);
else else
selectionIndex--; setSelected(selectionIndex - 1);
return true; return true;
case Key.Down: case Key.Down:
if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1) if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1)
selectionIndex = 0; setSelected(0);
else else
selectionIndex++; setSelected(selectionIndex + 1);
return true; return true;
} }
} }
@ -266,9 +262,9 @@ namespace osu.Game.Screens.Play
private void buttonSelectionChanged(DialogButton button, bool isSelected) private void buttonSelectionChanged(DialogButton button, bool isSelected)
{ {
if (!isSelected) if (!isSelected)
selectionIndex = -1; setSelected(-1);
else else
selectionIndex = InternalButtons.IndexOf(button); setSelected(InternalButtons.IndexOf(button));
} }
private void updateRetryCount() private void updateRetryCount()