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

Implement angle assessment

Browse Source
This commit is contained in:
smoogipoo
2018-12-08 15:01:26 +09:00
parent e7da5b0400
commit f4eabacd15
4 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
View File

@ -40,15 +40,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
/// </summary>
public double StrainTime { get; private set; }
public double? Angle { get; private set; }
private readonly OsuHitObject lastObject;
private readonly OsuHitObject nextObject;
private readonly double timeRate;
/// <summary>
/// Initializes the object calculating extra data required for difficulty calculation.
/// </summary>
public OsuDifficultyHitObject(OsuHitObject currentObject, OsuHitObject lastObject, double timeRate)
public OsuDifficultyHitObject(OsuHitObject lastObject, OsuHitObject currentObject, OsuHitObject nextObject, double timeRate)
{
this.lastObject = lastObject;
this.nextObject = nextObject;
this.timeRate = timeRate;
BaseObject = currentObject;
@ -82,6 +86,26 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
// Don't need to jump to reach spinners
if (!(BaseObject is Spinner))
JumpDistance = (BaseObject.StackedPosition * scalingFactor - lastCursorPosition * scalingFactor).Length;
if (nextObject != null)
{
var endCursorPosition = BaseObject.StackedPosition;
var currentSlider = BaseObject as Slider;
if (currentSlider != null)
{
computeSliderCursorPosition(currentSlider);
endCursorPosition = currentSlider.LazyEndPosition ?? endCursorPosition;
}
Vector2 v1 = lastCursorPosition - BaseObject.StackedPosition;
Vector2 v2 = nextObject.StackedPosition - endCursorPosition;
float dot = Vector2.Dot(v1, v2);
float det = v1.X * v2.Y - v1.Y * v2.X;
Angle = Math.Atan2(det, dot);
}
}
private void setTimingValues()