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

Move classes out of test case.

Browse Source
This commit is contained in:
smoogipooo
2017-05-03 12:37:47 +09:00
parent b4052a099f
commit 71acf1c57d
4 changed files with 282 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

259
osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
View File

@ -21,6 +21,7 @@ using OpenTK.Input;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Rulesets.Mania.UI;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
{ {
@ -72,262 +73,4 @@ namespace osu.Desktop.VisualTests.Tests
}); });
} }
} }
public class ManiaPlayfield : Container
{
public readonly FlowContainer<Column> Columns;
public ManiaPlayfield(int columnCount)
{
if (columnCount > 9)
throw new ArgumentException($@"{columnCount} columns is not supported.");
if (columnCount <= 0)
throw new ArgumentException($@"Can't have zero or fewer columns.");
RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X;
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black
},
Columns = new FillFlowContainer<Column>
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Direction = FillDirection.Horizontal,
Padding = new MarginPadding { Left = 1, Right = 1 },
Spacing = new Vector2(1, 0)
}
};
for (int i = 0; i < columnCount; i++)
Columns.Add(new Column());
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
var columnColours = new Color4[]
{
colours.RedDark,
colours.GreenDark,
colours.BlueDark // Special column
};
int columnCount = Columns.Children.Count();
int halfColumns = columnCount / 2;
var keys = new Key[] { Key.A, Key.S, Key.D, Key.F, Key.Space, Key.J, Key.K, Key.L, Key.Semicolon };
for (int i = 0; i < halfColumns; i++)
{
Column leftColumn = Columns.Children.ElementAt(i);
Column rightColumn = Columns.Children.ElementAt(columnCount - 1 - i);
Color4 accent = columnColours[i % 2];
leftColumn.AccentColour = rightColumn.AccentColour = accent;
leftColumn.Key = keys[keys.Length / 2 - halfColumns + i];
rightColumn.Key = keys[keys.Length / 2 + halfColumns - i];
}
bool hasSpecial = halfColumns * 2 < columnCount;
if (hasSpecial)
{
Column specialColumn = Columns.Children.ElementAt(halfColumns);
specialColumn.IsSpecialColumn = true;
specialColumn.AccentColour = columnColours[2];
specialColumn.Key = keys[keys.Length / 2];
}
}
}
public class Column : Container, IHasAccentColour
{
private const float key_size = 50;
private const float key_icon_size = 10;
private const float key_icon_corner_radius = 3;
private const float key_icon_border_radius = 2;
private const float hit_target_height = 10;
private const float hit_target_bar_height = 2;
private const float column_width = 45;
private const float special_column_width = 70;
private Color4 accentColour;
public Color4 AccentColour
{
get { return accentColour; }
set
{
if (accentColour == value)
return;
accentColour = value;
setAccentColour();
}
}
private bool isSpecialColumn;
public bool IsSpecialColumn
{
get { return isSpecialColumn; }
set
{
isSpecialColumn = value;
Width = isSpecialColumn ? special_column_width : column_width;
}
}
public Key Key;
private Box background;
private Container hitTargetBar;
private Container keyIcon;
public Column()
{
RelativeSizeAxes = Axes.Y;
Width = column_width;
Children = new Drawable[]
{
background = new Box
{
Name = "Foreground",
RelativeSizeAxes = Axes.Both,
Alpha = 0.2f
},
new FillFlowContainer
{
Name = "Key + hit target",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Children = new[]
{
new Container
{
Name = "Key",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = key_size,
Children = new Drawable[]
{
new Box
{
Name = "Key gradient",
RelativeSizeAxes = Axes.Both,
ColourInfo = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)),
Alpha = 0.5f
},
keyIcon = new Container
{
Name = "Key icon",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(key_icon_size),
Masking = true,
CornerRadius = key_icon_corner_radius,
BorderThickness = 2,
BorderColour = Color4.White, // Not true
Children = new[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true
}
}
}
}
},
new Container
{
Name = "Hit target",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = hit_target_height,
Children = new Drawable[]
{
new Box
{
Name = "Background",
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black
},
hitTargetBar = new Container
{
Name = "Bar",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = hit_target_bar_height,
Masking = true,
Children = new[]
{
new Box
{
RelativeSizeAxes = Axes.Both
}
}
}
}
}
}
}
};
}
private void setAccentColour()
{
background.Colour = AccentColour;
hitTargetBar.EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Glow,
Radius = 5,
Colour = AccentColour.Opacity(0.5f),
};
keyIcon.EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Glow,
Radius = 5,
Colour = AccentColour.Opacity(0.5f),
};
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (args.Key == Key && !args.Repeat)
{
background.FadeTo(background.Alpha + 0.2f, 50, EasingTypes.OutQuint);
keyIcon.ScaleTo(1.4f, 50, EasingTypes.OutQuint);
}
return false;
}
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
{
if (args.Key == Key)
{
background.FadeTo(0.2f, 800, EasingTypes.OutQuart);
keyIcon.ScaleTo(1f, 400, EasingTypes.OutQuart);
}
return false;
}
}
} }

204
osu.Game.Rulesets.Mania/UI/Column.cs Normal file
View File

@ -0,0 +1,204 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Colour;
using osu.Framework.Input;
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.UI
{
public class Column : Container, IHasAccentColour
{
private const float key_size = 50;
private const float key_icon_size = 10;
private const float key_icon_corner_radius = 3;
private const float key_icon_border_radius = 2;
private const float hit_target_height = 10;
private const float hit_target_bar_height = 2;
private const float column_width = 45;
private const float special_column_width = 70;
private Color4 accentColour;
public Color4 AccentColour
{
get { return accentColour; }
set
{
if (accentColour == value)
return;
accentColour = value;
setAccentColour();
}
}
private bool isSpecialColumn;
public bool IsSpecialColumn
{
get { return isSpecialColumn; }
set
{
isSpecialColumn = value;
Width = isSpecialColumn ? special_column_width : column_width;
}
}
public Key Key;
private Box background;
private Container hitTargetBar;
private Container keyIcon;
public Column()
{
RelativeSizeAxes = Axes.Y;
Width = column_width;
Children = new Drawable[]
{
background = new Box
{
Name = "Foreground",
RelativeSizeAxes = Axes.Both,
Alpha = 0.2f
},
new FillFlowContainer
{
Name = "Key + hit target",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Children = new[]
{
new Container
{
Name = "Key",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = key_size,
Children = new Drawable[]
{
new Box
{
Name = "Key gradient",
RelativeSizeAxes = Axes.Both,
ColourInfo = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)),
Alpha = 0.5f
},
keyIcon = new Container
{
Name = "Key icon",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(key_icon_size),
Masking = true,
CornerRadius = key_icon_corner_radius,
BorderThickness = 2,
BorderColour = Color4.White, // Not true
Children = new[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true
}
}
}
}
},
new Container
{
Name = "Hit target",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = hit_target_height,
Children = new Drawable[]
{
new Box
{
Name = "Background",
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black
},
hitTargetBar = new Container
{
Name = "Bar",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = hit_target_bar_height,
Masking = true,
Children = new[]
{
new Box
{
RelativeSizeAxes = Axes.Both
}
}
}
}
}
}
}
};
}
private void setAccentColour()
{
background.Colour = AccentColour;
hitTargetBar.EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Glow,
Radius = 5,
Colour = AccentColour.Opacity(0.5f),
};
keyIcon.EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Glow,
Radius = 5,
Colour = AccentColour.Opacity(0.5f),
};
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (args.Key == Key && !args.Repeat)
{
background.FadeTo(background.Alpha + 0.2f, 50, EasingTypes.OutQuint);
keyIcon.ScaleTo(1.4f, 50, EasingTypes.OutQuint);
}
return false;
}
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
{
if (args.Key == Key)
{
background.FadeTo(0.2f, 800, EasingTypes.OutQuart);
keyIcon.ScaleTo(1f, 400, EasingTypes.OutQuart);
}
return false;
}
}
}

89
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -8,29 +8,92 @@ using osu.Game.Rulesets.UI;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Game.Rulesets.Mania.Judgements; using osu.Game.Rulesets.Mania.Judgements;
using osu.Framework.Graphics.Containers;
using System;
using osu.Framework.Graphics.Primitives;
using osu.Game.Graphics;
using osu.Framework.Allocation;
using OpenTK.Input;
using System.Linq;
namespace osu.Game.Rulesets.Mania.UI namespace osu.Game.Rulesets.Mania.UI
{ {
public class ManiaPlayfield : Playfield<ManiaBaseHit, ManiaJudgement> public class ManiaPlayfield : Playfield<ManiaBaseHit, ManiaJudgement>
{ {
public readonly FlowContainer<Column> Columns;
public ManiaPlayfield(int columns) public ManiaPlayfield(int columns)
{ {
Size = new Vector2(0.8f, 1f); if (columns > 9)
Anchor = Anchor.BottomCentre; throw new ArgumentException($@"{columns} columns is not supported.");
Origin = Anchor.BottomCentre; if (columns <= 0)
throw new ArgumentException($@"Can't have zero or fewer columns.");
Add(new Box { RelativeSizeAxes = Axes.Both, Alpha = 0.5f }); Children = new Drawable[]
{
new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black
},
Columns = new FillFlowContainer<Column>
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Direction = FillDirection.Horizontal,
Padding = new MarginPadding { Left = 1, Right = 1 },
Spacing = new Vector2(1, 0)
}
}
}
};
for (int i = 0; i < columns; i++) for (int i = 0; i < columns; i++)
Add(new Box Columns.Add(new Column());
{ }
RelativeSizeAxes = Axes.Y,
Size = new Vector2(2, 1), [BackgroundDependencyLoader]
RelativePositionAxes = Axes.Both, private void load(OsuColour colours)
Position = new Vector2((float)i / columns, 0), {
Alpha = 0.5f, var columnColours = new Color4[]
Colour = Color4.Black {
}); colours.RedDark,
colours.GreenDark,
colours.BlueDark // Special column
};
int columnCount = Columns.Children.Count();
int halfColumns = columnCount / 2;
var keys = new Key[] { Key.A, Key.S, Key.D, Key.F, Key.Space, Key.J, Key.K, Key.L, Key.Semicolon };
for (int i = 0; i < halfColumns; i++)
{
Column leftColumn = Columns.Children.ElementAt(i);
Column rightColumn = Columns.Children.ElementAt(columnCount - 1 - i);
Color4 accent = columnColours[i % 2];
leftColumn.AccentColour = rightColumn.AccentColour = accent;
leftColumn.Key = keys[keys.Length / 2 - halfColumns + i];
rightColumn.Key = keys[keys.Length / 2 + halfColumns - i];
}
bool hasSpecial = halfColumns * 2 < columnCount;
if (hasSpecial)
{
Column specialColumn = Columns.Children.ElementAt(halfColumns);
specialColumn.IsSpecialColumn = true;
specialColumn.AccentColour = columnColours[2];
specialColumn.Key = keys[keys.Length / 2];
}
} }
} }
} }

1
osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
View File

@ -56,6 +56,7 @@
<Compile Include="Objects\ManiaBaseHit.cs" /> <Compile Include="Objects\ManiaBaseHit.cs" />
<Compile Include="Objects\Note.cs" /> <Compile Include="Objects\Note.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UI\Column.cs" />
<Compile Include="UI\ManiaHitRenderer.cs" /> <Compile Include="UI\ManiaHitRenderer.cs" />
<Compile Include="UI\ManiaPlayfield.cs" /> <Compile Include="UI\ManiaPlayfield.cs" />
<Compile Include="ManiaRuleset.cs" /> <Compile Include="ManiaRuleset.cs" />