h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 15:57:24 +08:00
Code Issues Releases Wiki Activity

Attempt to position DrawableOsuJudgement based on its DrawableOsuHitObject instead of DrawableOsuHitObject.HitObject

Browse Source
This commit is contained in:
DavidBeh 2024-04-23 19:19:11 +02:00
parent beee76d64a
commit 331f1f31b0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
View File

@ -82,9 +82,9 @@ namespace osu.Game.Rulesets.Osu.Mods
float y = (float)Interpolation.DampContinuously(hitObject.Y, destination.Y, dampLength, clock.ElapsedFrameTime); float y = (float)Interpolation.DampContinuously(hitObject.Y, destination.Y, dampLength, clock.ElapsedFrameTime);
// I added these two lines // I added these two lines
if (hitObject is DrawableOsuHitObject h) /*if (hitObject is DrawableOsuHitObject h)
h.HitObject.Position = new Vector2(x, y); h.HitObject.Position = new Vector2(x, y);
*/
hitObject.Position = new Vector2(x, y); hitObject.Position = new Vector2(x, y);
} }
} }

9
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
View File

@ -39,10 +39,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Lighting.ResetAnimation(); Lighting.ResetAnimation();
Lighting.SetColourFrom(JudgedObject, Result); Lighting.SetColourFrom(JudgedObject, Result);
if (JudgedObject?.HitObject is OsuHitObject osuObject) if (JudgedObject is DrawableOsuHitObject osuObject)
{ {
Position = osuObject.StackedEndPosition; Position = osuObject.ToSpaceOfOtherDrawable(Vector2.Zero, Parent);
Scale = new Vector2(osuObject.Scale); // Works only for normal hit circles, also with magnetised:
// Position = osuObject.Position;
Scale = new Vector2(osuObject.HitObject.Scale);
} }
} }

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public const float DEFAULT_TICK_SIZE = 16; public const float DEFAULT_TICK_SIZE = 16;
protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject; public DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
private SkinnableDrawable scaleContainer; private SkinnableDrawable scaleContainer;