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

Revert async changes

Browse Source
This commit is contained in:
Dean Herbert
2018-08-31 07:04:40 +09:00
parent 247e1ee714
commit 03084aa04b
46 changed files with 120 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultCirclePiece.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -13,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public class DefaultCirclePiece : Container
{
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
RelativeSizeAxes = Axes.Both;
Children = new Drawable[]
@ -22,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Texture = await textures.GetAsync(@"Play/osu/disc"),
Texture = textures.Get(@"Play/osu/disc"),
},
new TrianglesPiece
{

5
osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
View File

@ -4,7 +4,6 @@
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.OpenGL.Buffers;
@ -80,10 +79,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
[BackgroundDependencyLoader]
private async Task load(ShaderManager shaders, TextureStore textures)
private void load(ShaderManager shaders, TextureStore textures)
{
shader = shaders?.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE);
texture = await textures.GetAsync(@"Cursor/cursortrail");
texture = textures.Get(@"Cursor/cursortrail");
Scale = new Vector2(1 / texture.ScaleAdjust);
}