File tree Expand file tree Collapse file tree 6 files changed +20
-17
lines changed
osu.Game.Rulesets.Sandbox
osu.Game.Rulesets.Sandbox.Tests Expand file tree Collapse file tree 6 files changed +20
-17
lines changed Original file line number Diff line number Diff line change 1
1
using osu . Framework . Allocation ;
2
2
using osu . Framework . Graphics ;
3
+ using osu . Framework . Graphics . Shapes ;
3
4
using osu . Framework . Platform ;
4
5
using osu . Game . Tests . Visual ;
6
+ using osuTK . Graphics ;
5
7
6
8
namespace osu . Game . Rulesets . Sandbox . Tests . Game
7
9
{
@@ -10,13 +12,16 @@ public class TestSceneOsuGame : OsuTestScene
10
12
[ BackgroundDependencyLoader ]
11
13
private void load ( GameHost host )
12
14
{
13
- OsuGame game = new OsuGame ( ) ;
14
- game . SetHost ( host ) ;
15
-
16
15
Children = new Drawable [ ]
17
16
{
18
- game
17
+ new Box
18
+ {
19
+ RelativeSizeAxes = Axes . Both ,
20
+ Colour = Color4 . Black ,
21
+ } ,
19
22
} ;
23
+
24
+ AddGame ( new OsuGame ( ) ) ;
20
25
}
21
26
}
22
27
}
Original file line number Diff line number Diff line change 11
11
</PropertyGroup >
12
12
<ItemGroup Label =" Package References" >
13
13
<PackageReference Include =" Appveyor.TestLogger" Version =" 2.0.0" />
14
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 16.2 .0" />
14
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 16.11 .0" />
15
15
<PackageReference Include =" NUnit" Version =" 3.13.2" />
16
- <PackageReference Include =" NUnit3TestAdapter" Version =" 3.15.1 " />
16
+ <PackageReference Include =" NUnit3TestAdapter" Version =" 4.0.0 " />
17
17
<PackageReference Update =" Microsoft.EntityFrameworkCore.Sqlite" Version =" 2.1.4" />
18
18
</ItemGroup >
19
19
<ItemGroup >
Original file line number Diff line number Diff line change 1
- using System ;
2
- using osu . Framework . Allocation ;
1
+ using osu . Framework . Allocation ;
3
2
using osu . Framework . Audio . Sample ;
4
3
using osu . Framework . Graphics ;
5
4
using osu . Framework . Graphics . Animations ;
6
- using osu . Framework . Graphics . Audio ;
7
5
using osu . Framework . Graphics . Containers ;
8
6
using osu . Framework . Graphics . Primitives ;
9
7
using osu . Framework . Graphics . Textures ;
Original file line number Diff line number Diff line change 3
3
using osu . Framework . Graphics ;
4
4
using osu . Framework . Graphics . Containers ;
5
5
using osu . Framework . Input . Bindings ;
6
+ using osu . Framework . Input . Events ;
6
7
using osu . Framework . Screens ;
7
8
using osu . Game . Input . Bindings ;
8
9
using osu . Game . Rulesets . Sandbox . Configuration ;
@@ -58,9 +59,9 @@ protected override void LoadComplete()
58
59
new VisualizerSection ( )
59
60
} ;
60
61
61
- public bool OnPressed ( GlobalAction action )
62
+ public bool OnPressed ( KeyBindingPressEvent < GlobalAction > e )
62
63
{
63
- switch ( action )
64
+ switch ( e . Action )
64
65
{
65
66
case GlobalAction . Back :
66
67
this . Exit ( ) ;
@@ -70,7 +71,7 @@ public bool OnPressed(GlobalAction action)
70
71
return false ;
71
72
}
72
73
73
- public void OnReleased ( GlobalAction action )
74
+ public void OnReleased ( KeyBindingReleaseEvent < GlobalAction > e )
74
75
{
75
76
}
76
77
}
Original file line number Diff line number Diff line change @@ -52,12 +52,12 @@ protected override void LoadComplete()
52
52
FinishTransforms ( true ) ;
53
53
}
54
54
55
- public bool OnPressed ( GlobalAction action )
55
+ public bool OnPressed ( KeyBindingPressEvent < GlobalAction > e )
56
56
{
57
57
if ( ! IsVisible . Value )
58
58
return false ;
59
59
60
- switch ( action )
60
+ switch ( e . Action )
61
61
{
62
62
case GlobalAction . Back :
63
63
IsVisible . Value = false ;
@@ -67,7 +67,7 @@ public bool OnPressed(GlobalAction action)
67
67
return false ;
68
68
}
69
69
70
- public void OnReleased ( GlobalAction action )
70
+ public void OnReleased ( KeyBindingReleaseEvent < GlobalAction > e )
71
71
{
72
72
}
73
73
Original file line number Diff line number Diff line change 11
11
<EmbeddedResource Include =" Resources\**\*" />
12
12
</ItemGroup >
13
13
<ItemGroup >
14
- <PackageReference Include =" ppy.osu.Framework" Version =" 2021.728.0" />
15
- <PackageReference Include =" ppy.osu.Game" Version =" 2021.731.0" />
14
+ <PackageReference Include =" ppy.osu.Game" Version =" 2021.916.0" />
16
15
</ItemGroup >
17
16
</Project >
You can’t perform that action at this time.
0 commit comments