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 'taiko_drumroll_drawing' into taiko-drawable-generation

Browse Source 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
This commit is contained in:
smoogipooo
2017-03-29 11:15:10 +09:00
parent 24c6ee620f 762cbfc997
commit 3c21e6538b
10 changed files with 202 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,30 +75,38 @@ namespace osu.Desktop.VisualTests.Tests
Position = new Vector2(350, 500)
});
Add(new DrumRollCircle(new CirclePiece
Add(new DrumRollCirclePiece(new CirclePiece
{
KiaiMode = kiai
})
{
Width = 250,
Width = 0.25f,
Position = new Vector2(575, 100)
});
Add(new DrumRollCircle(new StrongCirclePiece
Add(new DrumRollCirclePiece(new StrongCirclePiece
{
KiaiMode = kiai
})
{
Width = 250,
Width = 0.25f,
Position = new Vector2(575, 300)
});
}
private class DrumRollCircle : BaseCircle
private class SwellCircle : BaseCircle
{
public DrumRollCircle(CirclePiece piece)
public SwellCircle(CirclePiece piece)
: base(piece)
{
Piece.Add(new TextAwesome
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = SYMBOL_INNER_SIZE,
Icon = FontAwesome.fa_asterisk,
Shadow = false
});
}
[BackgroundDependencyLoader]

14
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
View File

@ -26,6 +26,8 @@ namespace osu.Desktop.VisualTests.Tests
AddButton("Hit!", addHitJudgement);
AddButton("Miss :(", addMissJudgement);
AddButton("DrumRoll", () => addDrumRoll(false));
AddButton("Strong DrumRoll", () => addDrumRoll(true));
AddButton("Swell", addSwell);
AddButton("Centre", () => addCentreHit(false));
AddButton("Strong Centre", () => addCentreHit(true));
@ -85,6 +87,18 @@ namespace osu.Desktop.VisualTests.Tests
}));
}
private void addDrumRoll(bool strong)
{
var d = new DrumRoll
{
StartTime = Time.Current + 1000,
Distance = 2000,
PreEmpt = 1000,
};
playfield.Add(strong ? new DrawableStrongDrumRoll(d) : new DrawableDrumRoll(d));
}
private void addCentreHit(bool strong)
{
Hit h = new Hit