h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 17:43:05 +08:00
Code Issues Releases Wiki Activity

apply suggestions

Browse Source
This commit is contained in:
jorolf 2020-06-25 00:59:12 +02:00
parent 6f0ec36407
commit 1409ace282
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/Sprites/HueAnimation.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Sprites
private class HueAnimationDrawNode : SpriteDrawNode
{
protected new HueAnimation Source => (HueAnimation)base.Source;
private HueAnimation source => (HueAnimation)base.Source;
private float progress;
@ -53,7 +53,7 @@ namespace osu.Game.Graphics.Sprites
{
base.ApplyState();
progress = Source.animationProgress;
progress = source.animationProgress;
}
protected override void Blit(Action<TexturedVertex2D> vertexAction)

26
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -218,11 +218,11 @@ namespace osu.Game.Screens.Menu
// matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
lazerLogo.TransformTo(nameof(LazerLogo.Highlight), 0.6f, logo_scale_duration * 0.4f, Easing.OutCirc).Then()
.TransformTo(nameof(LazerLogo.Highlight), 1f, logo_scale_duration * 0.4f);
lazerLogo.TransformTo(nameof(LazerLogo.OutlineHighlight), 0.6f, logo_scale_duration * 0.4f, Easing.OutCirc).Then()
.TransformTo(nameof(LazerLogo.OutlineHighlight), 1f, logo_scale_duration * 0.4f);
lazerLogo.TransformTo(nameof(LazerLogo.Animation), 0.4f, logo_scale_duration * 0.5f, Easing.OutQuart).Then()
.TransformTo(nameof(LazerLogo.Animation), 1f, logo_scale_duration * 0.4f);
lazerLogo.TransformTo(nameof(LazerLogo.Outline), 0.4f, logo_scale_duration * 0.5f, Easing.OutQuart).Then()
.TransformTo(nameof(LazerLogo.Outline), 1f, logo_scale_duration * 0.4f);
logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
}
@ -265,18 +265,18 @@ namespace osu.Game.Screens.Menu
private class LazerLogo : CompositeDrawable
{
private HueAnimation highlight, animation;
private HueAnimation outlineHighlight, outline;
public float Highlight
public float OutlineHighlight
{
get => highlight.AnimationProgress;
set => highlight.AnimationProgress = value;
get => outlineHighlight.AnimationProgress;
set => outlineHighlight.AnimationProgress = value;
}
public float Animation
public float Outline
{
get => animation.AnimationProgress;
set => animation.AnimationProgress = value;
get => outline.AnimationProgress;
set => outline.AnimationProgress = value;
}
public LazerLogo()
@ -291,13 +291,13 @@ namespace osu.Game.Screens.Menu
InternalChildren = new Drawable[]
{
highlight = new HueAnimation
outlineHighlight = new HueAnimation
{
RelativeSizeAxes = Axes.Both,
Texture = textures.Get(lazer_logo_texture),
Colour = OsuColour.Gray(0.6f).Opacity(0.8f),
},
animation = new HueAnimation
outline = new HueAnimation
{
RelativeSizeAxes = Axes.Both,
Texture = textures.Get(lazer_logo_texture),