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

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
This commit is contained in:
Thomas Müller
2017-03-01 18:05:58 +01:00
parent 03889e6ca6 b3a411d8c3
commit d46e68b36b
54 changed files with 321 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Graphics/Backgrounds/Triangles.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.MathUtils;
using OpenTK;
using OpenTK.Graphics;
using System;
using osu.Framework.Graphics.Colour;
namespace osu.Game.Graphics.Backgrounds
{
@ -37,6 +38,13 @@ namespace osu.Game.Graphics.Backgrounds
private float triangleScale = 1;
/// <summary>
/// Whether we should drop-off alpha values of triangles more quickly to improve
/// the visual appearance of fading. This defaults to on as it is generally more
/// aesthetically pleasing, but should be turned off in <see cref="BufferedContainer{T}"/>s.
/// </summary>
public bool HideAlphaDiscrepancies = true;
public float TriangleScale
{
get { return triangleScale; }
@ -63,8 +71,14 @@ namespace osu.Game.Graphics.Backgrounds
{
base.Update();
float adjustedAlpha = HideAlphaDiscrepancies ?
// Cubically scale alpha to make it drop off more sharply.
(float)Math.Pow(DrawInfo.Colour.AverageColour.Linear.A, 3) :
1;
foreach (var t in Children)
{
t.Alpha = adjustedAlpha;
t.Position -= new Vector2(0, (float)(t.Scale.X * (50 / DrawHeight) * (Time.Elapsed / 950)) / triangleScale);
if (ExpireOffScreenTriangles && t.DrawPosition.Y + t.DrawSize.Y * t.Scale.Y < 0)
t.Expire();

6
osu.Game/Graphics/Cursor/OsuCursorContainer.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Graphics.Cursor
class OsuCursor : Container
{
private Container cursorContainer;
private BindableDouble cursorScale;
private Bindable<double> cursorScale;
public OsuCursor()
{
@ -52,9 +52,9 @@ namespace osu.Game.Graphics.Cursor
}
[BackgroundDependencyLoader]
private void load(TextureStore textures, OsuConfigManager config)
private void load(OsuConfigManager config)
{
cursorScale = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize);
cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
Children = new Drawable[]
{

2
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -14,8 +14,6 @@ namespace osu.Game.Graphics.UserInterface
{
private readonly Container<Star> stars;
private double transformStartTime;
/// <summary>
/// Maximum amount of stars displayed.
/// </summary>

6
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -82,9 +82,9 @@ namespace osu.Game.Graphics.UserInterface.Volume
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
volumeMeterMaster.Bindable.Weld(audio.Volume);
volumeMeterEffect.Bindable.Weld(audio.VolumeSample);
volumeMeterMusic.Bindable.Weld(audio.VolumeTrack);
volumeMeterMaster.Bindable.BindTo(audio.Volume);
volumeMeterEffect.Bindable.BindTo(audio.VolumeSample);
volumeMeterMusic.Bindable.BindTo(audio.VolumeTrack);
}
ScheduledDelegate popOutDelegate;