h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-07 04:13:38 +08:00
Code Issues Releases Wiki Activity

Simplify logic of IsInRange()

Browse Source
This commit is contained in:
Valerus9
2025-08-08 13:41:59 +02:00
committed by Dean Herbert
Unverified
parent 3a78cfc627
commit cc970ffd80
1 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Select/FilterCriteria.cs
+10 -29
View File
@@ -154,44 +154,25 @@ namespace osu.Game.Screens.Select
public bool IsInRange(T value)
{
bool lowerRangeSatisfied = true;
bool upperRangeSatisfied = true;
if (Min != null)
{
int comparison = Comparer<T>.Default.Compare(value, Min.Value);
if (comparison < 0 && !InvertRange)
return false;
if (comparison == 0 && !IsLowerInclusive && !InvertRange)
return false;
lowerRangeSatisfied = comparison > 0 || (comparison == 0 && IsLowerInclusive);
}
if (Max != null)
{
int comparison = Comparer<T>.Default.Compare(value, Max.Value);
if (comparison > 0 && !InvertRange)
return false;
if (comparison == 0 && !IsUpperInclusive && !InvertRange)
return false;
upperRangeSatisfied = comparison < 0 || (comparison == 0 && IsUpperInclusive);
}
if (Min != null && Max != null)
{
int minComparison = Comparer<T>.Default.Compare(value, Min.Value);
int maxComparison = Comparer<T>.Default.Compare(value, Max.Value);
if (minComparison > 0 && maxComparison < 0 && InvertRange)
return false;
if (minComparison == 0 && IsLowerInclusive && InvertRange)
return false;
if (maxComparison == 0 && IsUpperInclusive && InvertRange)
return false;
}
return true;
bool result = lowerRangeSatisfied && upperRangeSatisfied;
if (InvertRange)
result = !result;
return result;
}
public T? Min;
@@ -199,7 +180,7 @@ namespace osu.Game.Screens.Select
public bool IsLowerInclusive;
public bool IsUpperInclusive;
/// <summary>
/// If true, only outside of MaxValue and MinValue will return true;
/// If true, only outside of MaxValue and MinValue will return true
/// </summary>
public bool InvertRange;