h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 02:22:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #9652 from jorolf/grey-logo-animation

Browse Source
This commit is contained in:
Dean Herbert 2020-07-27 14:52:41 +09:00 committed by GitHub
commit e3b782dca6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -51,7 +51,7 @@
<Reference Include="Java.Interop" /> <Reference Include="Java.Interop" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2020.723.0" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2020.723.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
osu.Game.Tests/Visual/UserInterface/TestSceneHueAnimation.cs → osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs
View File

@ -11,14 +11,14 @@ using osu.Game.Graphics.Sprites;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
[TestFixture] [TestFixture]
public class TestSceneHueAnimation : OsuTestScene public class TestSceneLogoAnimation : OsuTestScene
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(LargeTextureStore textures) private void load(LargeTextureStore textures)
{ {
HueAnimation anim2; LogoAnimation anim2;
Add(anim2 = new HueAnimation Add(anim2 = new LogoAnimation
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
@ -26,9 +26,9 @@ namespace osu.Game.Tests.Visual.UserInterface
Colour = Colour4.White, Colour = Colour4.White,
}); });
HueAnimation anim; LogoAnimation anim;
Add(anim = new HueAnimation Add(anim = new LogoAnimation
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit, FillMode = FillMode.Fit,

14
osu.Game/Graphics/Sprites/HueAnimation.cs → osu.Game/Graphics/Sprites/LogoAnimation.cs
View File

@ -11,13 +11,13 @@ using osu.Framework.Graphics.Textures;
namespace osu.Game.Graphics.Sprites namespace osu.Game.Graphics.Sprites
{ {
public class HueAnimation : Sprite public class LogoAnimation : Sprite
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ShaderManager shaders, TextureStore textures) private void load(ShaderManager shaders, TextureStore textures)
{ {
TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"HueAnimation"); TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"LogoAnimation");
RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"HueAnimation"); // Masking isn't supported for now RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, @"LogoAnimation"); // Masking isn't supported for now
} }
private float animationProgress; private float animationProgress;
@ -36,15 +36,15 @@ namespace osu.Game.Graphics.Sprites
public override bool IsPresent => true; public override bool IsPresent => true;
protected override DrawNode CreateDrawNode() => new HueAnimationDrawNode(this); protected override DrawNode CreateDrawNode() => new LogoAnimationDrawNode(this);
private class HueAnimationDrawNode : SpriteDrawNode private class LogoAnimationDrawNode : SpriteDrawNode
{ {
private HueAnimation source => (HueAnimation)Source; private LogoAnimation source => (LogoAnimation)Source;
private float progress; private float progress;
public HueAnimationDrawNode(HueAnimation source) public LogoAnimationDrawNode(LogoAnimation source)
: base(source) : base(source)
{ {
} }

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

@ -260,7 +260,7 @@ namespace osu.Game.Screens.Menu
private class LazerLogo : CompositeDrawable private class LazerLogo : CompositeDrawable
{ {
private HueAnimation highlight, background; private LogoAnimation highlight, background;
public float Progress public float Progress
{ {
@ -282,13 +282,13 @@ namespace osu.Game.Screens.Menu
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
highlight = new HueAnimation highlight = new LogoAnimation
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Texture = textures.Get(@"Intro/Triangles/logo-highlight"), Texture = textures.Get(@"Intro/Triangles/logo-highlight"),
Colour = Color4.White, Colour = Color4.White,
}, },
background = new HueAnimation background = new LogoAnimation
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Texture = textures.Get(@"Intro/Triangles/logo-background"), Texture = textures.Get(@"Intro/Triangles/logo-background"),

2
osu.Game/osu.Game.csproj
View File

@ -25,7 +25,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="ppy.osu.Framework" Version="2020.723.0" /> <PackageReference Include="ppy.osu.Framework" Version="2020.723.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
<PackageReference Include="Sentry" Version="2.1.4" /> <PackageReference Include="Sentry" Version="2.1.4" />
<PackageReference Include="SharpCompress" Version="0.25.1" /> <PackageReference Include="SharpCompress" Version="0.25.1" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />

2
osu.iOS.props
View File

@ -71,7 +71,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Label="Package References"> <ItemGroup Label="Package References">
<PackageReference Include="ppy.osu.Framework.iOS" Version="2020.723.0" /> <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.723.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2020.715.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2020.727.1" />
</ItemGroup> </ItemGroup>
<!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. --> <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
<ItemGroup Label="Transitive Dependencies"> <ItemGroup Label="Transitive Dependencies">