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

Shuffle sound samples around and make more conformant

Browse Source
This commit is contained in:
Dean Herbert
2017-06-28 10:19:04 -07:00
parent 28f0da606a
commit ee96d39b93
14 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Screens/Menu/Button.cs
View File

@ -30,16 +30,17 @@ namespace osu.Game.Screens.Menu
private readonly Container box;
private readonly Box boxHoverLayer;
private readonly TextAwesome icon;
private readonly string internalName;
private readonly string sampleName;
private readonly Action clickAction;
private readonly Key triggerKey;
private SampleChannel sampleClick;
private SampleChannel sampleHover;
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public Button(string text, string internalName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
public Button(string text, string sampleName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
{
this.internalName = internalName;
this.sampleName = sampleName;
this.clickAction = clickAction;
this.triggerKey = triggerKey;
@ -120,8 +121,7 @@ namespace osu.Game.Screens.Menu
{
if (State != ButtonState.Expanded) return true;
//if (OsuGame.Instance.IsActive)
// Game.Audio.PlaySamplePositional($@"menu-{internalName}-hover", @"menuclick");
sampleHover?.Play();
box.ScaleTo(new Vector2(1.5f, 1), 500, EasingTypes.OutElastic);
@ -222,7 +222,9 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleClick = audio.Sample.Get($@"Menu/menu-{internalName}-click") ?? audio.Sample.Get(internalName.Contains(@"back") ? @"Menu/menuback" : @"Menu/menuhit");
sampleHover = audio.Sample.Get(@"Menu/hover");
if (!string.IsNullOrEmpty(sampleName))
sampleClick = audio.Sample.Get($@"Menu/{sampleName}");
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -259,7 +261,7 @@ namespace osu.Game.Screens.Menu
private void trigger()
{
sampleClick.Play();
sampleClick?.Play();
clickAction?.Invoke();

28
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -15,6 +15,8 @@ using osu.Game.Overlays.Toolbar;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio;
namespace osu.Game.Screens.Menu
{
@ -51,6 +53,8 @@ namespace osu.Game.Screens.Menu
private readonly List<Button> buttonsTopLevel = new List<Button>();
private readonly List<Button> buttonsPlay = new List<Button>();
private SampleChannel sampleBack;
public ButtonSystem()
{
RelativeSizeAxes = Axes.Both;
@ -82,8 +86,8 @@ namespace osu.Game.Screens.Menu
AutoSizeAxes = Axes.Both,
Children = new[]
{
settingsButton = new Button(@"settings", @"settings", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
settingsButton = new Button(@"settings", string.Empty, FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
backButton = new Button(@"back", string.Empty, FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
iconFacade = new Container //need a container to make the osu! icon flow properly.
{
Size = new Vector2(0, BUTTON_AREA_HEIGHT)
@ -101,23 +105,24 @@ namespace osu.Game.Screens.Menu
}
};
buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
buttonsPlay.Add(new Button(@"multi", @"multiplayer", FontAwesome.fa_users, new Color4(94, 63, 186, 255), () => OnMulti?.Invoke(), 0, Key.M));
buttonsPlay.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
buttonsPlay.Add(new Button(@"solo", @"select-6", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
buttonsPlay.Add(new Button(@"multi", @"select-5", FontAwesome.fa_users, new Color4(94, 63, 186, 255), () => OnMulti?.Invoke(), 0, Key.M));
buttonsPlay.Add(new Button(@"chart", @"select-5", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, WEDGE_WIDTH, Key.P));
buttonsTopLevel.Add(new Button(@"osu!editor", @"edit", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
buttonsTopLevel.Add(new Button(@"osu!direct", @"direct", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
buttonsTopLevel.Add(new Button(@"exit", @"exit", FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
buttonsTopLevel.Add(new Button(@"play", @"select-1", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, WEDGE_WIDTH, Key.P));
buttonsTopLevel.Add(new Button(@"osu!editor", @"select-5", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
buttonsTopLevel.Add(new Button(@"osu!direct", string.Empty, FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
buttonsTopLevel.Add(new Button(@"exit", string.Empty, FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
buttonFlow.Add(buttonsPlay);
buttonFlow.Add(buttonsTopLevel);
}
[BackgroundDependencyLoader(true)]
private void load(OsuGame game = null)
private void load(AudioManager audio, OsuGame game = null)
{
toolbar = game?.Toolbar;
sampleBack = audio.Sample.Get(@"Menu/select-4");
}
protected override void LoadComplete()
@ -167,6 +172,7 @@ namespace osu.Game.Screens.Menu
private void onBack()
{
sampleBack?.Play();
State = MenuState.TopLevel;
}
@ -231,6 +237,8 @@ namespace osu.Game.Screens.Menu
osuLogo.RotateTo(20, EXIT_DELAY * 1.5f);
osuLogo.FadeOut(EXIT_DELAY);
}
else if (lastState == MenuState.TopLevel)
sampleBack?.Play();
break;
case MenuState.TopLevel:
buttonArea.Flush(true);

24
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -72,11 +72,11 @@ namespace osu.Game.Screens.Menu
private const float default_size = 480;
private const double beat_in_time = 60;
private const double early_activation = 60;
public OsuLogo()
{
EarlyActivationMilliseconds = beat_in_time;
EarlyActivationMilliseconds = early_activation;
Size = new Vector2(default_size);
@ -215,8 +215,9 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(TextureStore textures, AudioManager audio)
{
sampleClick = audio.Sample.Get(@"Menu/menuhit");
sampleClick = audio.Sample.Get(@"Menu/select-2");
sampleBeat = audio.Sample.Get(@"Menu/heartbeat");
logo.Texture = textures.Get(@"Menu/logo");
ripple.Texture = textures.Get(@"Menu/logo");
}
@ -236,10 +237,13 @@ namespace osu.Game.Screens.Menu
if (beatIndex < 0) return;
if (Hovering)
sampleBeat.Play();
{
using (BeginDelayedSequence(early_activation))
Schedule(() => sampleBeat.Play());
}
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(beat_in_time))
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(early_activation))
logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
ripple.ClearTransforms();
@ -255,11 +259,11 @@ namespace osu.Game.Screens.Menu
flashLayer.ClearTransforms();
visualizer.ClearTransforms();
flashLayer.FadeTo(0.2f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
visualizer.FadeTo(0.9f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (flashLayer.BeginDelayedSequence(beat_in_time))
flashLayer.FadeTo(0.2f * amplitudeAdjust, early_activation, EasingTypes.Out);
visualizer.FadeTo(0.9f * amplitudeAdjust, early_activation, EasingTypes.Out);
using (flashLayer.BeginDelayedSequence(early_activation))
flashLayer.FadeOut(beatLength);
using (visualizer.BeginDelayedSequence(beat_in_time))
using (visualizer.BeginDelayedSequence(early_activation))
visualizer.FadeTo(0.5f, beatLength);
}
}