RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add a small bias towards longer distances to prevent jittery behaviour on path self-intersections

This commit is contained in:
OliBomby 2024-07-03 20:33:00 +02:00
parent 3926af1053
commit 5697c82bb8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
View File

@ -3,6 +3,7 @@
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
@ -273,6 +274,7 @@ private double findClosestPathDistance(MouseEvent e)
{
const double step1 = 10;
const double step2 = 0.1;
const double longer_distance_bias = 0.01;
var desiredPosition = ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position - lengthAdjustMouseOffset;
@ -286,7 +288,7 @@ private double findClosestPathDistance(MouseEvent e)
for (double d = 0; d <= fullPathCache.Value.CalculatedDistance; d += step1)
{
double t = d / fullPathCache.Value.CalculatedDistance;
float dist = Vector2.Distance(fullPathCache.Value.PositionAt(t), desiredPosition);
double dist = Vector2.Distance(fullPathCache.Value.PositionAt(t), desiredPosition) - d * longer_distance_bias;
if (dist >= minDistance) continue;
@ -295,10 +297,12 @@ private double findClosestPathDistance(MouseEvent e)
}
// Do another linear search to fine-tune the result.
for (double d = bestValue - step1; d <= bestValue + step1; d += step2)
double maxValue = Math.Min(bestValue + step1, fullPathCache.Value.CalculatedDistance);
for (double d = bestValue - step1; d <= maxValue; d += step2)
{
double t = d / fullPathCache.Value.CalculatedDistance;
float dist = Vector2.Distance(fullPathCache.Value.PositionAt(t), desiredPosition);
double dist = Vector2.Distance(fullPathCache.Value.PositionAt(t), desiredPosition) - d * longer_distance_bias;
if (dist >= minDistance) continue;