sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/ppy/osu into details

Browse Source
This commit is contained in:
Jorolf
2017-03-28 17:14:35 +02:00
parent 909fdb647c 4bdf9e09ca
commit 305bc9cff6
29 changed files with 456 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
View File

@ -38,7 +38,7 @@ namespace osu.Desktop.VisualTests.Tests
Position = new Vector2(100, 100)
});
Add(new CentreHitCircle(new AccentedCirclePiece()
Add(new CentreHitCircle(new StrongCirclePiece()
{
KiaiMode = kiai
})
@ -54,7 +54,7 @@ namespace osu.Desktop.VisualTests.Tests
Position = new Vector2(100, 300)
});
Add(new RimHitCircle(new AccentedCirclePiece()
Add(new RimHitCircle(new StrongCirclePiece()
{
KiaiMode = kiai
})
@ -70,7 +70,7 @@ namespace osu.Desktop.VisualTests.Tests
Position = new Vector2(100, 500)
});
Add(new SwellCircle(new AccentedCirclePiece()
Add(new SwellCircle(new StrongCirclePiece()
{
KiaiMode = kiai
})
@ -87,7 +87,7 @@ namespace osu.Desktop.VisualTests.Tests
Position = new Vector2(575, 100)
});
Add(new DrumRollCircle(new AccentedCirclePiece()
Add(new DrumRollCircle(new StrongCirclePiece()
{
KiaiMode = kiai
})
@ -99,8 +99,6 @@ namespace osu.Desktop.VisualTests.Tests
private class SwellCircle : BaseCircle
{
private const float symbol_size = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.35f;
public SwellCircle(CirclePiece piece)
: base(piece)
{
@ -108,7 +106,8 @@ namespace osu.Desktop.VisualTests.Tests
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = symbol_size,
TextSize = SYMBOL_INNER_SIZE,
Icon = FontAwesome.fa_asterisk,
Shadow = false
});
}
@ -136,8 +135,6 @@ namespace osu.Desktop.VisualTests.Tests
private class CentreHitCircle : BaseCircle
{
private const float symbol_size = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.35f;
public CentreHitCircle(CirclePiece piece)
: base(piece)
{
@ -145,7 +142,7 @@ namespace osu.Desktop.VisualTests.Tests
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(symbol_size),
Size = new Vector2(SYMBOL_INNER_SIZE),
Masking = true,
Children = new[]
{
@ -166,8 +163,6 @@ namespace osu.Desktop.VisualTests.Tests
private class RimHitCircle : BaseCircle
{
private const float symbol_size = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
public RimHitCircle(CirclePiece piece)
: base(piece)
{
@ -175,8 +170,8 @@ namespace osu.Desktop.VisualTests.Tests
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(symbol_size),
BorderThickness = 8,
Size = new Vector2(SYMBOL_SIZE),
BorderThickness = SYMBOL_BORDER,
BorderColour = Color4.White,
Masking = true,
Children = new[]
@ -200,6 +195,10 @@ namespace osu.Desktop.VisualTests.Tests
private abstract class BaseCircle : Container
{
protected const float SYMBOL_SIZE = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
protected const float SYMBOL_BORDER = 8;
protected const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
protected readonly CirclePiece Piece;
protected BaseCircle(CirclePiece piece)