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

Initial sample + samplechannel rework

Browse Source
This commit is contained in:
smoogipoo
2021-01-19 17:11:40 +09:00
parent e74ecebfd6
commit de9d075f94
52 changed files with 131 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,8 +45,8 @@ namespace osu.Game.Screens.Menu
public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
private readonly Action clickAction;
private SampleChannel sampleClick;
private SampleChannel sampleHover;
private Sample sampleClick;
private Sample sampleHover;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);

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

@ -81,7 +81,7 @@ namespace osu.Game.Screens.Menu
private readonly List<Button> buttonsTopLevel = new List<Button>();
private readonly List<Button> buttonsPlay = new List<Button>();
private SampleChannel sampleBack;
private Sample sampleBack;
private readonly LogoTrackingContainer logoTrackingContainer;

2
osu.Game/Screens/Menu/IntroCircles.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Screens.Menu
private const double delay_step_one = 2300;
private const double delay_step_two = 600;
private SampleChannel welcome;
private Sample welcome;
[BackgroundDependencyLoader]
private void load(AudioManager audio)

2
osu.Game/Screens/Menu/IntroScreen.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Screens.Menu
private const int exit_delay = 3000;
private SampleChannel seeya;
private Sample seeya;
protected virtual string SeeyaSampleName => "Intro/seeya";

2
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Screens.Menu
private BackgroundScreenDefault background;
private SampleChannel welcome;
private Sample welcome;
[BackgroundDependencyLoader]
private void load()

11
osu.Game/Screens/Menu/IntroWelcome.cs
View File

@ -21,8 +21,8 @@ namespace osu.Game.Screens.Menu
protected override string BeatmapHash => "64e00d7022195959bfa3109d09c2e2276c8f12f486b91fcf6175583e973b48f2";
protected override string BeatmapFile => "welcome.osz";
private const double delay_step_two = 2142;
private SampleChannel welcome;
private SampleChannel pianoReverb;
private Sample welcome;
private Sample pianoReverb;
protected override string SeeyaSampleName => "Intro/Welcome/seeya";
protected override BackgroundScreen CreateBackground() => background = new BackgroundScreenDefault(false)
@ -56,12 +56,13 @@ namespace osu.Game.Screens.Menu
{
PrepareMenuLoad();
intro.LogoVisualisation.AddAmplitudeSource(pianoReverb);
AddInternal(intro);
welcome?.Play();
pianoReverb?.Play();
var reverbChannel = pianoReverb?.Play();
if (reverbChannel != null)
intro.LogoVisualisation.AddAmplitudeSource(reverbChannel);
Scheduler.AddDelayed(() =>
{

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

@ -43,8 +43,8 @@ namespace osu.Game.Screens.Menu
private readonly IntroSequence intro;
private SampleChannel sampleClick;
private SampleChannel sampleBeat;
private Sample sampleClick;
private Sample sampleBeat;
private readonly Container colourAndTriangles;
private readonly Triangles triangles;