h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 14:32:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #206 from Tom94/fix-depth

Browse Source 
Fix depth values.
This commit is contained in:
Dean Herbert 2016-11-30 12:28:10 +09:00 committed by GitHub
commit 19897013a0
15 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit e125c03d8c39fd86e02e872a8d46654d2ea2759f
Subproject commit 4fd477755a640a497c04fc8e540e8641278aa056

4
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
View File

@ -32,7 +32,7 @@ namespace osu.Desktop.VisualTests.Tests
Clock.ProcessFrame();
Container approachContainer = new Container { Depth = float.MaxValue, };
Container approachContainer = new Container { Depth = float.MinValue, };
Add(approachContainer);
@ -50,7 +50,7 @@ namespace osu.Desktop.VisualTests.Tests
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Depth = -i,
Depth = i,
State = ArmedState.Hit,
};

2
osu.Game.Mode.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Colour = s.Colour,
})
{
Depth = 1 //override time-based depth.
Depth = -1 //override time-based depth.
},
};
}

2
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -119,7 +119,7 @@ namespace osu.Game.Beatmaps.Drawables
{
new FlowContainer
{
Depth = 1,
Depth = -1,
Direction = FlowDirection.HorizontalOnly,
RelativeSizeAxes = Axes.Both,
// This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle

2
osu.Game/Graphics/Backgrounds/Background.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Graphics.Backgrounds
{
this.textureName = textureName;
RelativeSizeAxes = Axes.Both;
Depth = float.MinValue;
Depth = float.MaxValue;
Add(Sprite = new Sprite
{

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

@ -19,7 +19,7 @@ namespace osu.Game.Graphics.Cursor
public OsuCursorContainer()
{
Add(new CursorTrail { Depth = -1 });
Add(new CursorTrail { Depth = 1 });
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)

2
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Modes.Objects.Drawables
public DrawableHitObject(HitObject hitObject)
{
HitObject = hitObject;
Depth = -(float)hitObject.StartTime;
Depth = (float)hitObject.StartTime;
}
private ArmedState state;

6
osu.Game/OsuGame.cs
View File

@ -116,11 +116,11 @@ namespace osu.Game
//overlay elements
(chat = new ChatConsole(API) { Depth = 0 }).Preload(this, overlayContent.Add);
(Options = new OptionsOverlay { Depth = 1 }).Preload(this, overlayContent.Add);
(musicController = new MusicController() { Depth = 3 }).Preload(this, overlayContent.Add);
(Options = new OptionsOverlay { Depth = -1 }).Preload(this, overlayContent.Add);
(musicController = new MusicController() { Depth = -3 }).Preload(this, overlayContent.Add);
(Toolbar = new Toolbar
{
Depth = 2,
Depth = -2,
OnHome = delegate { mainMenu?.MakeCurrent(); },
OnSettings = Options.ToggleVisibility,
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },

2
osu.Game/OsuGameBase.cs
View File

@ -83,7 +83,7 @@ namespace osu.Game
{
Children = new[]
{
Cursor = new OsuCursorContainer { Depth = float.MaxValue }
Cursor = new OsuCursorContainer { Depth = float.MinValue }
}
});
}

2
osu.Game/Overlays/ChatConsole.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Overlays
{
new Box
{
Depth = float.MinValue,
Depth = float.MaxValue,
RelativeSizeAxes = Axes.Both,
Colour = new Color4(0.1f, 0.1f, 0.1f, 0.4f),
},

2
osu.Game/Overlays/MusicController.cs
View File

@ -386,7 +386,7 @@ namespace osu.Game.Overlays
this.beatmap = beatmap;
CacheDrawnFrameBuffer = true;
RelativeSizeAxes = Axes.Both;
Depth = float.MinValue;
Depth = float.MaxValue;
Children = new Drawable[]
{

2
osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Screens.Backgrounds
float newDepth = 0;
if (background != null)
{
newDepth = background.Depth - 1;
newDepth = background.Depth + 1;
background.Flush();
background.FadeOut(250);
background.Expire();

2
osu.Game/Screens/OsuGameMode.cs
View File

@ -111,7 +111,7 @@ namespace osu.Game.Screens
{
AddInternal(new ParallaxContainer
{
Depth = float.MinValue,
Depth = float.MaxValue,
Children = new[]
{
Background = bg

2
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Select
var lastContainer = beatmapInfoContainer;
float newDepth = lastContainer?.Depth - 1 ?? 0;
float newDepth = lastContainer?.Depth + 1 ?? 0;
BeatmapSetInfo beatmapSetInfo = beatmap.BeatmapSetInfo;
BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;

4
osu.Game/Screens/Select/CarouselContainer.cs
View File

@ -81,12 +81,12 @@ namespace osu.Game.Screens.Select
group.State = BeatmapGroupState.Collapsed;
groups.Add(group);
group.Header.Depth = scrollableContent.Children.Count();
group.Header.Depth = -scrollableContent.Children.Count();
scrollableContent.Add(group.Header);
foreach (BeatmapPanel panel in group.BeatmapPanels)
{
panel.Depth = scrollableContent.Children.Count();
panel.Depth = -scrollableContent.Children.Count();
scrollableContent.Add(panel);
}