sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Do not use statics

Browse Source
This commit is contained in:
smoogipoo
2020-05-11 14:57:47 +09:00
parent 779af48802
commit b0ed39f32b
5 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObject.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
public readonly int n;
private int counter = 0;
public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate)
public TaikoDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, TaikoDifficultyHitObjectRhythm rhythm)
: base(hitObject, lastObject, clockRate)
{
var lastHit = lastObject as Hit;
@ -31,11 +31,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
NoteLength = DeltaTime;
double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
Rhythm = TaikoDifficultyHitObjectRhythm.GetClosest(NoteLength / prevLength);
Rhythm = rhythm.GetClosest(NoteLength / prevLength);
RhythmID = Rhythm.ID;
HasTypeChange = lastHit?.Type != currentHit?.Type;
IsKat = lastHit?.Type == HitType.Rim;
HasTimingChange = !TaikoDifficultyHitObjectRhythm.IsRepeat(RhythmID);
HasTimingChange = !rhythm.IsRepeat(RhythmID);
n = counter;
counter++;

67
osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
View File

@ -7,18 +7,36 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
{
public class TaikoDifficultyHitObjectRhythm
{
private static TaikoDifficultyHitObjectRhythm[] commonRhythms;
private static TaikoDifficultyHitObjectRhythm constRhythm;
private static int constRhythmID;
private readonly TaikoDifficultyHitObjectRhythm[] commonRhythms;
private readonly TaikoDifficultyHitObjectRhythm constRhythm;
private int constRhythmID;
public int ID = 0;
public readonly double Difficulty;
private readonly double ratio;
private static void initialiseCommonRhythms()
public bool IsRepeat()
{
return ID == constRhythmID;
}
public bool IsRepeat(int id)
{
return id == constRhythmID;
}
public bool IsSpeedup()
{
return ratio < 1.0;
}
public bool IsLargeSpeedup()
{
return ratio < 0.49;
}
public TaikoDifficultyHitObjectRhythm()
{
/*
ALCHYRS CODE
@ -40,8 +58,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
*/
commonRhythms = new TaikoDifficultyHitObjectRhythm[]
commonRhythms = new[]
{
new TaikoDifficultyHitObjectRhythm(1, 1, 0.1),
new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
@ -61,33 +78,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
constRhythmID = 0;
constRhythm = commonRhythms[constRhythmID];
}
public bool IsRepeat()
{
return ID == constRhythmID;
}
public static bool IsRepeat(int id)
{
return id == constRhythmID;
}
public bool IsSpeedup()
{
return ratio < 1.0;
}
public bool IsLargeSpeedup()
{
return ratio < 0.49;
}
private TaikoDifficultyHitObjectRhythm(double ratio, double difficulty)
{
this.ratio = ratio;
this.Difficulty = difficulty;
}
private TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty)
@ -97,13 +87,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
}
// Code is inefficient - we are searching exhaustively through the sorted list commonRhythms
public static TaikoDifficultyHitObjectRhythm GetClosest(double ratio)
public TaikoDifficultyHitObjectRhythm GetClosest(double ratio)
{
if (commonRhythms == null)
{
initialiseCommonRhythms();
}
TaikoDifficultyHitObjectRhythm closestRhythm = commonRhythms[0];
double closestDistance = Double.MaxValue;
@ -117,8 +102,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
}
return closestRhythm;
}
}
}