mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 05:32:54 +08:00
Add basic VolumeControl and saving of volume to config.
This commit is contained in:
parent
e25e7319e9
commit
bdb72d7b82
@ -20,6 +20,10 @@ namespace osu.Game.Configuration
|
|||||||
Set(OsuConfig.Token, string.Empty);
|
Set(OsuConfig.Token, string.Empty);
|
||||||
|
|
||||||
Set(OsuConfig.PlayMode, PlayMode.Osu);
|
Set(OsuConfig.PlayMode, PlayMode.Osu);
|
||||||
|
|
||||||
|
Set(OsuConfig.VolumeGlobal, 0.8, 0, 1);
|
||||||
|
Set(OsuConfig.VolumeMusic, 1.0, 0, 1);
|
||||||
|
Set(OsuConfig.VolumeEffect, 1.0, 0, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,6 +35,9 @@ namespace osu.Game.Configuration
|
|||||||
Username,
|
Username,
|
||||||
Password,
|
Password,
|
||||||
Token,
|
Token,
|
||||||
PlayMode
|
PlayMode,
|
||||||
|
VolumeGlobal,
|
||||||
|
VolumeEffect,
|
||||||
|
VolumeMusic
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -37,6 +37,11 @@ namespace osu.Game
|
|||||||
{
|
{
|
||||||
base.Load();
|
base.Load();
|
||||||
|
|
||||||
|
//attach out bindables to the audio subsystem.
|
||||||
|
Audio.Volume.Weld(Config.GetBindable<double>(OsuConfig.VolumeGlobal));
|
||||||
|
Audio.VolumeSample.Weld(Config.GetBindable<double>(OsuConfig.VolumeEffect));
|
||||||
|
Audio.VolumeTrack.Weld(Config.GetBindable<double>(OsuConfig.VolumeMusic));
|
||||||
|
|
||||||
Add(new Drawable[] {
|
Add(new Drawable[] {
|
||||||
intro = new Intro(),
|
intro = new Intro(),
|
||||||
Toolbar = new Toolbar
|
Toolbar = new Toolbar
|
||||||
@ -46,6 +51,12 @@ namespace osu.Game
|
|||||||
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
|
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
|
||||||
Alpha = 0.001f //fixes invalidation fuckup
|
Alpha = 0.001f //fixes invalidation fuckup
|
||||||
},
|
},
|
||||||
|
new VolumeControl
|
||||||
|
{
|
||||||
|
VolumeGlobal = Audio.Volume,
|
||||||
|
VolumeSample = Audio.VolumeSample,
|
||||||
|
VolumeTrack = Audio.VolumeTrack
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
intro.ModePushed += modeAdded;
|
intro.ModePushed += modeAdded;
|
||||||
|
99
osu.Game/VolumeControl.cs
Normal file
99
osu.Game/VolumeControl.cs
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
using System;
|
||||||
|
using OpenTK;
|
||||||
|
using OpenTK.Graphics;
|
||||||
|
using osu.Framework.Configuration;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Drawables;
|
||||||
|
using osu.Framework.Input;
|
||||||
|
using osu.Framework.Graphics.Transformations;
|
||||||
|
|
||||||
|
namespace osu.Game
|
||||||
|
{
|
||||||
|
internal class VolumeControl : Container
|
||||||
|
{
|
||||||
|
private Box meterFill;
|
||||||
|
private Container meterContainer;
|
||||||
|
|
||||||
|
public BindableDouble VolumeGlobal { get; set; }
|
||||||
|
public BindableDouble VolumeSample { get; set; }
|
||||||
|
public BindableDouble VolumeTrack { get; set; }
|
||||||
|
|
||||||
|
public VolumeControl()
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Load()
|
||||||
|
{
|
||||||
|
base.Load();
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
meterContainer = new Container {
|
||||||
|
Anchor = Anchor.BottomRight,
|
||||||
|
Origin = Anchor.BottomRight,
|
||||||
|
Position = new Vector2(10, 10),
|
||||||
|
Size = new Vector2(40, 180),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Box
|
||||||
|
{
|
||||||
|
Colour = Color4.Black,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
},
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Size = new Vector2(0.5f, 0.9f),
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Box
|
||||||
|
{
|
||||||
|
Colour = Color4.DarkGray,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
},
|
||||||
|
meterFill = new Box
|
||||||
|
{
|
||||||
|
Colour = Color4.White,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Origin = Anchor.BottomCentre,
|
||||||
|
Anchor = Anchor.BottomCentre
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnWheelDown(InputState state)
|
||||||
|
{
|
||||||
|
appear();
|
||||||
|
|
||||||
|
VolumeGlobal.Value -= 0.05f;
|
||||||
|
meterFill.ScaleTo(new Vector2(1, (float)VolumeGlobal.Value), 300, EasingTypes.OutQuint);
|
||||||
|
|
||||||
|
return base.OnWheelDown(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnWheelUp(InputState state)
|
||||||
|
{
|
||||||
|
appear();
|
||||||
|
|
||||||
|
VolumeGlobal.Value += 0.05f;
|
||||||
|
meterFill.ScaleTo(new Vector2(1, (float)VolumeGlobal.Value), 300, EasingTypes.OutQuint);
|
||||||
|
|
||||||
|
return base.OnWheelUp(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void appear()
|
||||||
|
{
|
||||||
|
meterContainer.ClearTransformations();
|
||||||
|
meterContainer.FadeIn(100);
|
||||||
|
meterContainer.Delay(1000);
|
||||||
|
meterContainer.FadeOut(100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -131,6 +131,7 @@
|
|||||||
<Compile Include="Overlays\ToolbarModeSelector.cs" />
|
<Compile Include="Overlays\ToolbarModeSelector.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="Users\User.cs" />
|
<Compile Include="Users\User.cs" />
|
||||||
|
<Compile Include="VolumeControl.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
|
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
|
||||||
|
Loading…
Reference in New Issue
Block a user