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

No longer subscribing to OnUpdate

Browse Source
This commit is contained in:
MaxOhn 2019-08-20 16:33:56 +02:00
parent 3434458e0a
commit 28f78f67b2
1 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
osu.Game.Rulesets.Osu/Mods/OsuModAimAssist.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Mods
{ {
internal class OsuModAimAssist : Mod, IApplicableToDrawableHitObjects, IUpdatableByPlayfield internal class OsuModAimAssist : Mod, IApplicableToDrawableHitObjects, IUpdatableByPlayfield
{ {
public override string Name => "AimAssist"; public override string Name => "Aim Assist";
public override string Acronym => "AA"; public override string Acronym => "AA";
public override IconUsage Icon => FontAwesome.Solid.MousePointer; public override IconUsage Icon => FontAwesome.Solid.MousePointer;
public override ModType Type => ModType.Fun; public override ModType Type => ModType.Fun;
@ -24,55 +24,45 @@ namespace osu.Game.Rulesets.Osu.Mods
public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModAutoplay), typeof(OsuModWiggle), typeof(OsuModTransform) }; public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModAutoplay), typeof(OsuModWiggle), typeof(OsuModTransform) };
private readonly HashSet<DrawableOsuHitObject> movingObjects = new HashSet<DrawableOsuHitObject>(); private readonly HashSet<DrawableOsuHitObject> movingObjects = new HashSet<DrawableOsuHitObject>();
private int updateCounter;
public void Update(Playfield playfield) public void Update(Playfield playfield)
{ {
var drawableCursor = playfield.Cursor.ActiveCursor;
// Avoid crowded judgment displays // Avoid crowded judgment displays
playfield.DisplayJudgements.Value = false; playfield.DisplayJudgements.Value = false;
// Object destination updated when cursor updates // First move objects to new destination, then remove them from movingObjects set if they're too old
playfield.Cursor.ActiveCursor.OnUpdate += drawableCursor => movingObjects.RemoveWhere(d =>
{ {
// ... every 500th cursor update iteration var currentTime = playfield.Clock.CurrentTime;
// (lower -> potential lags ; higher -> easier to miss if cursor too fast) var h = d.HitObject;
if (updateCounter++ < 500)
return;
updateCounter = 0; switch (d)
// First move objects to new destination, then remove them from movingObjects set if they're too old
movingObjects.RemoveWhere(d =>
{ {
var currentTime = playfield.Clock.CurrentTime; case DrawableHitCircle circle:
var h = d.HitObject; circle.MoveTo(drawableCursor.DrawPosition, Math.Max(0, h.StartTime - currentTime - 10));
d.ClearTransforms(); return currentTime > h.StartTime;
switch (d) case DrawableSlider slider:
{
case DrawableHitCircle circle:
circle.MoveTo(drawableCursor.DrawPosition, Math.Max(0, h.StartTime - currentTime));
return currentTime > h.StartTime;
case DrawableSlider slider: // Move slider to cursor
if (currentTime < h.StartTime)
d.MoveTo(drawableCursor.DrawPosition, Math.Max(0, h.StartTime - currentTime - 10));
// Move slider to cursor // Move slider so that sliderball stays on the cursor
if (currentTime < h.StartTime) else
d.MoveTo(drawableCursor.DrawPosition, Math.Max(0, h.StartTime - currentTime)); d.MoveTo(drawableCursor.DrawPosition - slider.Ball.DrawPosition);
return currentTime > (h as IHasEndTime)?.EndTime;
// Move slider so that sliderball stays on the cursor case DrawableSpinner _:
else // TODO
d.MoveTo(drawableCursor.DrawPosition - slider.Ball.DrawPosition, Math.Max(0, h.StartTime - currentTime)); return true;
return currentTime > (h as IHasEndTime)?.EndTime - 50;
case DrawableSpinner _: default:
// TODO return true;
return true; }
} });
return true; // never happens(?)
});
};
} }
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables) public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
@ -83,11 +73,7 @@ namespace osu.Game.Rulesets.Osu.Mods
private void drawableOnApplyCustomUpdateState(DrawableHitObject drawable, ArmedState state) private void drawableOnApplyCustomUpdateState(DrawableHitObject drawable, ArmedState state)
{ {
if (!(drawable is DrawableOsuHitObject d)) if (drawable is DrawableOsuHitObject d)
return;
var h = d.HitObject;
using (d.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
movingObjects.Add(d); movingObjects.Add(d);
} }
} }
@ -96,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Mods
* TODOs * TODOs
* - remove object timing glitches / artifacts * - remove object timing glitches / artifacts
* - remove FollowPoints * - remove FollowPoints
* - automate sliders * - automate spinners
* - combine with OsuModRelax (?) * - combine with OsuModRelax (?)
* - must be some way to make this more effictient * - must be some way to make this more effictient
* *