Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct scale of taiko-glow element to match stable #28311

Merged
merged 2 commits into from
May 27, 2024

Conversation

Joppe27
Copy link
Contributor

@Joppe27 Joppe27 commented May 25, 2024

Closes #27700.

This was incorrect from from the start (see #21459). I used the values from stable in the original PR, but it turns out they don't match 1:1 (this was even brought up at the time). I did a more thorough visual check this time around to get it right.

master this PR stable
glow_lazer_master glow_lazer_PR glow_stable
hit_lazer_master hit_lazer_PR hit_stable

@smoogipoo
Copy link
Contributor

I'm not sure where 0.8 is coming from, stable uses 0.7 as mentioned in the original PR #21459 (comment) and as I've just confirmed...

s_KiaiGlow = new pSprite(TextureManager.Load(@"taiko-glow", SkinSource.Skin | SkinSource.Osu), Fields.GamefieldWide, Origins.Centre, Clocks.Game, HitObjectManagerTaiko.HIT_LOCATION, 0.02f, true, new Color(255, 228, 0, 0));
s_KiaiGlow.Scale = 0.7f;
internal override void OnKiaiToggle(bool active)
{
    if (active)
    {
        s_KiaiGlow.Transformations.Clear();
        s_KiaiGlow.FadeIn(100);
        s_KiaiGlow.Transformations.Add(new Transformation(TransformationType.Scale, 0.1f, 0.7f, GameBase.Time, GameBase.Time + 120, EasingTypes.Out));
        s_BarRight_Kiai.FadeIn(150);
    }
    else
    {
        s_KiaiGlow.Transformations.Clear();
        s_KiaiGlow.FadeOut(600);
    }
if (Player.KiaiActive)
{
    s_KiaiGlow.Transformations.RemoveAll(t => t.Type == TransformationType.Scale);
    s_KiaiGlow.Transformations.Add(new Transformation(TransformationType.Scale, 0.85f, 0.7f, GameBase.Time, GameBase.Time + 80, EasingTypes.Out));
}

@Joppe27
Copy link
Contributor Author

Joppe27 commented May 26, 2024

I'm well aware stable used 0.7, as I said I used that value in my original implementation. It clearly doesn't match visually though, which is why #27700 exists in the first place. The 0.8 value is based on the scale of the inner circle of the hit target in lazer, which I assume is what taiko-glow is supposed to surround:

new Sprite
{
Texture = skin.GetTexture("taikobigcircle"),
Scale = new Vector2(0.8f),
Alpha = 0.22f, // eyeballed to match stable
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},

I then double-checked this by making a visual comparison, and as you can see in the pictures this seems to check out.

@peppy peppy self-requested a review May 27, 2024 03:25
@peppy
Copy link
Member

peppy commented May 27, 2024

I'm not sure where 0.8 is coming from, stable uses 0.7 as mentioned in the original PR #21459 (comment) and as I've just confirmed...

I spent half an hour and couldn't figure this out. But the change in this PR does match visually, and also matches the scale applied to the hit target:

https://github.com/peppy/osu-stable-reference/blob/7519cafd1823f1879c0d9c991ba0e5c7fd3bfa02/osu!/GameModes/Play/Rulesets/Taiko/RulesetTaiko.cs#L592

Let's just go with it for now.

peppy
peppy previously approved these changes May 27, 2024
@peppy peppy disabled auto-merge May 27, 2024 06:19
@peppy peppy merged commit 5aa537f into ppy:master May 27, 2024
13 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

osu!taiko kiai glow does not match stable
4 participants