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

Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawable

Browse Source
This commit is contained in:
smoogipooo 2017-03-25 20:20:16 +09:00
commit 4762e043a0
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,8 +99,6 @@ namespace osu.Desktop.VisualTests.Tests
private class SwellCircle : BaseCircle private class SwellCircle : BaseCircle
{ {
private const float symbol_size = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.35f;
public SwellCircle(CirclePiece piece) public SwellCircle(CirclePiece piece)
: base(piece) : base(piece)
{ {
@ -108,7 +106,8 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
TextSize = symbol_size, TextSize = SYMBOL_INNER_SIZE,
Icon = FontAwesome.fa_asterisk,
Shadow = false Shadow = false
}); });
} }
@ -136,8 +135,6 @@ namespace osu.Desktop.VisualTests.Tests
private class CentreHitCircle : BaseCircle private class CentreHitCircle : BaseCircle
{ {
private const float symbol_size = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.35f;
public CentreHitCircle(CirclePiece piece) public CentreHitCircle(CirclePiece piece)
: base(piece) : base(piece)
{ {
@ -145,7 +142,7 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(symbol_size), Size = new Vector2(SYMBOL_INNER_SIZE),
Masking = true, Masking = true,
Children = new[] Children = new[]
{ {
@ -166,8 +163,6 @@ namespace osu.Desktop.VisualTests.Tests
private class RimHitCircle : BaseCircle private class RimHitCircle : BaseCircle
{ {
private const float symbol_size = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
public RimHitCircle(CirclePiece piece) public RimHitCircle(CirclePiece piece)
: base(piece) : base(piece)
{ {
@ -175,8 +170,8 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(symbol_size), Size = new Vector2(SYMBOL_SIZE),
BorderThickness = 8, BorderThickness = SYMBOL_BORDER,
BorderColour = Color4.White, BorderColour = Color4.White,
Masking = true, Masking = true,
Children = new[] Children = new[]
@ -200,6 +195,10 @@ namespace osu.Desktop.VisualTests.Tests
private abstract class BaseCircle : Container 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 readonly CirclePiece Piece;
protected BaseCircle(CirclePiece piece) protected BaseCircle(CirclePiece piece)

4
osu.Game/osu.Game.csproj
View File

@ -160,7 +160,7 @@
<Compile Include="Overlays\Notifications\ProgressCompletionNotification.cs" /> <Compile Include="Overlays\Notifications\ProgressCompletionNotification.cs" />
<Compile Include="Overlays\Notifications\ProgressNotification.cs" /> <Compile Include="Overlays\Notifications\ProgressNotification.cs" />
<Compile Include="Overlays\Notifications\SimpleNotification.cs" /> <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
<Compile Include="Overlays\Options\OptionDropDown.cs" /> <Compile Include="Overlays\Options\OptionDropdown.cs" />
<Compile Include="Overlays\Options\OptionLabel.cs" /> <Compile Include="Overlays\Options\OptionLabel.cs" />
<Compile Include="Graphics\UserInterface\OsuDropdown.cs" /> <Compile Include="Graphics\UserInterface\OsuDropdown.cs" />
<Compile Include="Overlays\Options\OptionsFooter.cs" /> <Compile Include="Overlays\Options\OptionsFooter.cs" />
@ -320,7 +320,7 @@
<Compile Include="Overlays\Options\OptionTextBox.cs" /> <Compile Include="Overlays\Options\OptionTextBox.cs" />
<Compile Include="Overlays\Options\OptionSlider.cs" /> <Compile Include="Overlays\Options\OptionSlider.cs" />
<Compile Include="Configuration\ProgressBarType.cs" /> <Compile Include="Configuration\ProgressBarType.cs" />
<Compile Include="Overlays\Options\OptionEnumDropDown.cs" /> <Compile Include="Overlays\Options\OptionEnumDropdown.cs" />
<Compile Include="Configuration\RankingType.cs" /> <Compile Include="Configuration\RankingType.cs" />
<Compile Include="Configuration\ScoreMeterType.cs" /> <Compile Include="Configuration\ScoreMeterType.cs" />
<Compile Include="Configuration\ReleaseStream.cs" /> <Compile Include="Configuration\ReleaseStream.cs" />