-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21256 from peppy/argon-taiko-swell
Add basic osu!taiko "argon" swell visual
- Loading branch information
Showing
3 changed files
with
76 additions
and
0 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableSwell.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence. | ||
// See the LICENCE file in the repository root for full licence text. | ||
|
||
using NUnit.Framework; | ||
using osu.Framework.Graphics; | ||
using osu.Game.Beatmaps; | ||
using osu.Game.Beatmaps.ControlPoints; | ||
using osu.Game.Rulesets.Taiko.Objects; | ||
using osu.Game.Rulesets.Taiko.Objects.Drawables; | ||
|
||
namespace osu.Game.Rulesets.Taiko.Tests.Skinning | ||
{ | ||
[TestFixture] | ||
public class TestSceneDrawableSwell : TaikoSkinnableTestScene | ||
{ | ||
[Test] | ||
public void TestHits() | ||
{ | ||
AddStep("Centre hit", () => SetContents(_ => new DrawableSwell(createHitAtCurrentTime()) | ||
{ | ||
Anchor = Anchor.Centre, | ||
Origin = Anchor.Centre, | ||
})); | ||
} | ||
|
||
private Swell createHitAtCurrentTime() | ||
{ | ||
var hit = new Swell | ||
{ | ||
StartTime = Time.Current + 3000, | ||
EndTime = Time.Current + 6000, | ||
}; | ||
|
||
hit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty()); | ||
|
||
return hit; | ||
} | ||
} | ||
} |
34 changes: 34 additions & 0 deletions
34
osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonSwellCirclePiece.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence. | ||
// See the LICENCE file in the repository root for full licence text. | ||
|
||
using osu.Framework.Allocation; | ||
using osu.Framework.Graphics; | ||
using osu.Framework.Graphics.Colour; | ||
using osu.Framework.Graphics.Sprites; | ||
using osuTK; | ||
using osuTK.Graphics; | ||
|
||
namespace osu.Game.Rulesets.Taiko.Skinning.Argon | ||
{ | ||
public class ArgonSwellCirclePiece : ArgonCirclePiece | ||
{ | ||
[BackgroundDependencyLoader] | ||
private void load() | ||
{ | ||
AccentColour = ColourInfo.GradientVertical( | ||
new Color4(240, 201, 0, 255), | ||
new Color4(167, 139, 0, 255) | ||
); | ||
|
||
AddInternal(new SpriteIcon | ||
{ | ||
Anchor = Anchor.Centre, | ||
Origin = Anchor.Centre, | ||
RelativeSizeAxes = Axes.Both, | ||
Icon = FontAwesome.Solid.Asterisk, | ||
Size = new Vector2(ICON_SIZE), | ||
Scale = new Vector2(0.8f, 1) | ||
}); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters