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

Merge branch 'master' into use-lifetime-optimization

Browse Source
This commit is contained in:
Dan Balasescu 2019-02-18 15:22:34 +09:00 committed by GitHub
commit c9c8cccd68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
156 changed files with 3046 additions and 1577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md vendored
View File

5
.gitignore vendored
View File

@ -11,8 +11,9 @@
*.userprefs *.userprefs
### Cake ### ### Cake ###
tools/* tools/**
!tools/cakebuild.csproj build/tools/**
# Build results # Build results
bin/[Dd]ebug/ bin/[Dd]ebug/

14
.vscode/launch.json vendored
View File

@ -68,6 +68,20 @@
} }
}, },
"console": "internalConsole" "console": "internalConsole"
},
{
"name": "Cake: Debug Script",
"type": "coreclr",
"request": "launch",
"program": "${workspaceRoot}/build/tools/Cake.CoreCLR/0.30.0/Cake.dll",
"args": [
"${workspaceRoot}/build/build.cake",
"--debug",
"--verbosity=diagnostic"
],
"cwd": "${workspaceRoot}/build",
"stopAtEntry": true,
"externalConsole": false
} }
] ]
} }

3
.vscode/tasks.json vendored
View File

@ -70,7 +70,8 @@
"type": "shell", "type": "shell",
"command": "dotnet", "command": "dotnet",
"args": [ "args": [
"restore" "restore",
"osu.sln"
], ],
"problemMatcher": [] "problemMatcher": []
} }

2
README.md
View File

@ -75,7 +75,7 @@ Sometimes it may be necessary to cross-test changes in [osu-resources](https://g
## Code analysis ## Code analysis
Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternative, you can install resharper or use rider to get inline support in your IDE of choice. Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternatively, you can install resharper or use rider to get inline support in your IDE of choice.
# Contributing # Contributing

13
build.ps1
View File

@ -41,27 +41,28 @@ Param(
[switch]$ShowDescription, [switch]$ShowDescription,
[Alias("WhatIf", "Noop")] [Alias("WhatIf", "Noop")]
[switch]$DryRun, [switch]$DryRun,
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] [Parameter(Position = 0, Mandatory = $false, ValueFromRemainingArguments = $true)]
[string[]]$ScriptArgs [string[]]$ScriptArgs
) )
Write-Host "Preparing to run build script..." Write-Host "Preparing to run build script..."
# Determine the script root for resolving other paths. # Determine the script root for resolving other paths.
if(!$PSScriptRoot){ if(!$PSScriptRoot) {
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
} }
# Resolve the paths for resources used for debugging. # Resolve the paths for resources used for debugging.
$TOOLS_DIR = Join-Path $PSScriptRoot "tools" $BUILD_DIR = Join-Path $PSScriptRoot "build"
$CAKE_CSPROJ = Join-Path $TOOLS_DIR "cakebuild.csproj" $TOOLS_DIR = Join-Path $BUILD_DIR "tools"
$CAKE_CSPROJ = Join-Path $BUILD_DIR "cakebuild.csproj"
# Install the required tools locally. # Install the required tools locally.
Write-Host "Restoring cake tools..." Write-Host "Restoring cake tools..."
Invoke-Expression "dotnet restore `"$CAKE_CSPROJ`" --packages `"$TOOLS_DIR`"" | Out-Null Invoke-Expression "dotnet restore `"$CAKE_CSPROJ`" --packages `"$TOOLS_DIR`"" | Out-Null
# Find the Cake executable # Find the Cake executable
$CAKE_EXECUTABLE = (Get-ChildItem -Path ./tools/cake.coreclr/ -Filter Cake.dll -Recurse).FullName $CAKE_EXECUTABLE = (Get-ChildItem -Path "$TOOLS_DIR/cake.coreclr/" -Filter Cake.dll -Recurse).FullName
# Build Cake arguments # Build Cake arguments
$cakeArguments = @("$Script"); $cakeArguments = @("$Script");
@ -75,5 +76,7 @@ $cakeArguments += $ScriptArgs
# Start Cake # Start Cake
Write-Host "Running build script..." Write-Host "Running build script..."
Push-Location -Path $BUILD_DIR
Invoke-Expression "dotnet `"$CAKE_EXECUTABLE`" $cakeArguments" Invoke-Expression "dotnet `"$CAKE_EXECUTABLE`" $cakeArguments"
Pop-Location
exit $LASTEXITCODE exit $LASTEXITCODE

3
build.sh
View File

@ -6,12 +6,13 @@
echo "Preparing to run build script..." echo "Preparing to run build script..."
cd build
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
TOOLS_DIR=$SCRIPT_DIR/tools TOOLS_DIR=$SCRIPT_DIR/tools
CAKE_BINARY_PATH=$TOOLS_DIR/"cake.coreclr" CAKE_BINARY_PATH=$TOOLS_DIR/"cake.coreclr"
SCRIPT="build.cake" SCRIPT="build.cake"
CAKE_CSPROJ=$TOOLS_DIR/"cakebuild.csproj" CAKE_CSPROJ=$SCRIPT_DIR/"cakebuild.csproj"
# Parse arguments. # Parse arguments.
CAKE_ARGUMENTS=() CAKE_ARGUMENTS=()

21
build.cake → build/build.cake
View File

@ -1,6 +1,7 @@
#addin "nuget:?package=CodeFileSanity&version=0.0.21" #addin "nuget:?package=CodeFileSanity&version=0.0.21"
#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2018.2.2" #addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2018.2.2"
#tool "nuget:?package=NVika.MSBuild&version=1.0.1" #tool "nuget:?package=NVika.MSBuild&version=1.0.1"
var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// ARGUMENTS // ARGUMENTS
@ -9,30 +10,24 @@
var target = Argument("target", "Build"); var target = Argument("target", "Build");
var configuration = Argument("configuration", "Release"); var configuration = Argument("configuration", "Release");
var osuSolution = new FilePath("./osu.sln"); var rootDirectory = new DirectoryPath("..");
var solution = rootDirectory.CombineWithFilePath("osu.sln");
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// TASKS // TASKS
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
Task("Restore")
.Does(() => {
DotNetCoreRestore(osuSolution.FullPath);
});
Task("Compile") Task("Compile")
.IsDependentOn("Restore")
.Does(() => { .Does(() => {
DotNetCoreBuild(osuSolution.FullPath, new DotNetCoreBuildSettings { DotNetCoreBuild(solution.FullPath, new DotNetCoreBuildSettings {
Configuration = configuration, Configuration = configuration,
NoRestore = true,
}); });
}); });
Task("Test") Task("Test")
.IsDependentOn("Compile") .IsDependentOn("Compile")
.Does(() => { .Does(() => {
var testAssemblies = GetFiles("**/*.Tests/bin/**/*.Tests.dll"); var testAssemblies = GetFiles(rootDirectory + "/**/*.Tests/bin/**/*.Tests.dll");
DotNetCoreVSTest(testAssemblies, new DotNetCoreVSTestSettings { DotNetCoreVSTest(testAssemblies, new DotNetCoreVSTestSettings {
Logger = AppVeyor.IsRunningOnAppVeyor ? "Appveyor" : $"trx", Logger = AppVeyor.IsRunningOnAppVeyor ? "Appveyor" : $"trx",
@ -46,9 +41,7 @@ Task("InspectCode")
.WithCriteria(IsRunningOnWindows()) .WithCriteria(IsRunningOnWindows())
.IsDependentOn("Compile") .IsDependentOn("Compile")
.Does(() => { .Does(() => {
var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First(); InspectCode(solution, new InspectCodeSettings {
InspectCode(osuSolution, new InspectCodeSettings {
CachesHome = "inspectcode", CachesHome = "inspectcode",
OutputFile = "inspectcodereport.xml", OutputFile = "inspectcodereport.xml",
}); });
@ -59,7 +52,7 @@ Task("InspectCode")
Task("CodeFileSanity") Task("CodeFileSanity")
.Does(() => { .Does(() => {
ValidateCodeSanity(new ValidateCodeSanitySettings { ValidateCodeSanity(new ValidateCodeSanitySettings {
RootDirectory = ".", RootDirectory = rootDirectory.FullPath,
IsAppveyorBuild = AppVeyor.IsRunningOnAppVeyor IsAppveyorBuild = AppVeyor.IsRunningOnAppVeyor
}); });
}); });

0
tools/cakebuild.csproj → build/cakebuild.csproj
View File

24
osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs Normal file
View File

@ -0,0 +1,24 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Difficulty;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Rulesets.Catch.Tests
{
public class CatchDifficultyCalculatorTest : DifficultyCalculatorTest
{
protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
[TestCase(3.8664391043534758, "diffcalc-test")]
public void Test(double expected, string name)
=> base.Test(expected, name);
protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(new CatchRuleset(), beatmap);
protected override Ruleset CreateRuleset() => new CatchRuleset();
}
}

2
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
View File

@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
base.SkinChanged(skin, allowFallback); base.SkinChanged(skin, allowFallback);
if (HitObject is IHasComboInformation combo) if (HitObject is IHasComboInformation combo)
AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : Color4.White); AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : (Color4?)null) ?? Color4.White;
} }
private const float preempt = 1000; private const float preempt = 1000;

138
osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/diffcalc-test.osu Normal file
View File

@ -0,0 +1,138 @@
osu file format v14
[General]
StackLeniency: 0.3
Mode: 2
[Difficulty]
CircleSize:4
OverallDifficulty:7
ApproachRate:8.3
SliderMultiplier:1.6
SliderTickRate:1
[TimingPoints]
500,500,4,2,1,50,1,0
34500,-50,4,2,1,50,0,0
[HitObjects]
// fruits spaced 1/1 beat apart
32,128,0,5,0,0:0:0:0:
96,128,500,1,0,0:0:0:0:
160,128,1000,1,0,0:0:0:0:
224,128,1500,1,0,0:0:0:0:
288,128,2000,1,0,0:0:0:0:
352,128,2500,1,0,0:0:0:0:
416,128,3000,1,0,0:0:0:0:
480,128,3500,1,0,0:0:0:0:
// fruits spaced 1/2 beat apart
32,160,4500,1,0,0:0:0:0:
64,160,4750,1,0,0:0:0:0:
96,160,5000,1,0,0:0:0:0:
128,160,5250,1,0,0:0:0:0:
160,160,5500,1,0,0:0:0:0:
192,160,5750,1,0,0:0:0:0:
224,160,6000,1,0,0:0:0:0:
256,160,6250,1,0,0:0:0:0:
288,160,6500,1,0,0:0:0:0:
// fruits spaced 1/4 beat apart
96,128,7500,1,0,0:0:0:0:
128,128,7625,1,0,0:0:0:0:
160,128,7750,1,0,0:0:0:0:
192,128,7875,1,0,0:0:0:0:
224,128,8000,1,0,0:0:0:0:
256,128,8125,1,0,0:0:0:0:
288,128,8250,1,0,0:0:0:0:
320,128,8375,1,0,0:0:0:0:
352,128,8500,1,0,0:0:0:0:
// fruit hyperdashes, spaced 1/2 beat apart
32,160,9500,1,0,0:0:0:0:
480,160,9750,1,0,0:0:0:0:
32,160,10000,1,0,0:0:0:0:
480,160,10250,1,0,0:0:0:0:
32,160,10500,1,0,0:0:0:0:
480,160,10750,1,0,0:0:0:0:
32,160,11000,1,0,0:0:0:0:
// fruit hyperdashes, spaced 1/4 beat apart
32,192,12000,1,0,0:0:0:0:
480,192,12125,1,0,0:0:0:0:
32,192,12250,1,0,0:0:0:0:
480,192,12375,1,0,0:0:0:0:
32,192,12500,1,0,0:0:0:0:
480,192,12625,1,0,0:0:0:0:
32,192,12750,1,0,0:0:0:0:
480,192,12875,1,0,0:0:0:0:
32,192,13000,1,0,0:0:0:0:
// stream + hyperdash + stream, spaced 1/4 beat apart
32,192,14000,1,0,0:0:0:0:
64,192,14125,1,0,0:0:0:0:
96,192,14250,1,0,0:0:0:0:
128,192,14375,1,0,0:0:0:0:
480,192,14500,1,0,0:0:0:0:
448,192,14625,1,0,0:0:0:0:
416,192,14750,1,0,0:0:0:0:
384,192,14875,1,0,0:0:0:0:
32,192,15000,1,0,0:0:0:0:
// basic sliders
32,192,16000,2,0,L|192:192,1,160
224,192,17000,2,0,L|384:192,1,160
416,192,17875,2,0,L|480:192,1,40
// slider hyperdashes, spaced 1/4 beat apart
32,192,19000,2,0,L|128:192,1,80
480,192,19375,2,0,L|384:192,1,80
352,192,19750,2,0,L|256:192,1,80
0,192,20125,2,0,L|128:192,1,120
// stream + slider hyperdashes, spaced 1/4 beat apart
32,192,21500,1,0,0:0:0:0:
64,192,21625,1,0,0:0:0:0:
96,192,21750,1,0,0:0:0:0:
512,192,21875,2,0,L|320:192,1,160
320,192,22500,1,0,0:0:0:0:
288,192,22625,1,0,0:0:0:0:
256,192,22750,1,0,0:0:0:0:
0,192,22875,2,0,L|64:192,1,40
// streams, spaced 1/4 beat apart
64,192,24000,1,0,0:0:0:0:
160,192,24125,1,0,0:0:0:0:
64,192,24250,1,0,0:0:0:0:
160,192,24375,1,0,0:0:0:0:
64,192,24500,1,0,0:0:0:0:
160,192,24625,1,0,0:0:0:0:
64,192,24750,1,0,0:0:0:0:
160,192,24875,1,0,0:0:0:0:
64,192,25000,1,0,0:0:0:0:
160,192,25125,1,0,0:0:0:0:
64,192,25250,1,0,0:0:0:0:
160,192,25375,1,0,0:0:0:0:
64,192,25500,1,0,0:0:0:0:
// stream + spinner combo, spaced 1/4 beat apart
256,192,26500,12,0,27000,0:0:0:0:
128,192,27250,5,0,0:0:0:0:
128,192,27375,1,0,0:0:0:0:
160,192,27500,1,0,0:0:0:0:
192,192,27625,1,0,0:0:0:0:
256,192,27750,12,0,28500,0:0:0:0:
192,192,28625,5,0,0:0:0:0:
224,192,28750,1,0,0:0:0:0:
256,192,28875,1,0,0:0:0:0:
256,192,29000,1,0,0:0:0:0:
256,192,29125,12,0,29500,0:0:0:0:
// long slow slider
0,192,30500,6,0,B|480:192|480:192|0:192,2,960
// long fast slider
0,192,37500,6,0,B|480:192|480:192|0:192,2,960
// long hyperdash slider
0,192,41500,2,0,P|544:192|544:192,5,480

2
osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
View File

@ -43,6 +43,6 @@ namespace osu.Game.Rulesets.Catch.Scoring
Health.Value += Math.Max(result.Judgement.HealthIncreaseFor(result) - hpDrainRate, 0) * harshness; Health.Value += Math.Max(result.Judgement.HealthIncreaseFor(result) - hpDrainRate, 0) * harshness;
} }
protected override HitWindows CreateHitWindows() => new CatchHitWindows(); public override HitWindows CreateHitWindows() => new CatchHitWindows();
} }
} }

24
osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs Normal file
View File

@ -0,0 +1,24 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mania.Difficulty;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Rulesets.Mania.Tests
{
public class ManiaDifficultyCalculatorTest : DifficultyCalculatorTest
{
protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
[TestCase(2.2676066895468976, "diffcalc-test")]
public void Test(double expected, string name)
=> base.Test(expected, name);
protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new ManiaDifficultyCalculator(new ManiaRuleset(), beatmap);
protected override Ruleset CreateRuleset() => new ManiaRuleset();
}
}

2
osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
difficultyHitObjects.AddRange(beatmap.HitObjects.Select(h => new ManiaHitObjectDifficulty((ManiaHitObject)h, columnCount)).OrderBy(h => h.BaseHitObject.StartTime)); difficultyHitObjects.AddRange(beatmap.HitObjects.Select(h => new ManiaHitObjectDifficulty((ManiaHitObject)h, columnCount)).OrderBy(h => h.BaseHitObject.StartTime));
if (!calculateStrainValues(difficultyHitObjects, timeRate)) if (!calculateStrainValues(difficultyHitObjects, timeRate))
return new DifficultyAttributes(mods, 0); return new ManiaDifficultyAttributes(mods, 0);
double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor; double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor;

180
osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/diffcalc-test.osu Normal file
View File

@ -0,0 +1,180 @@
osu file format v14
[General]
Mode: 3
[Difficulty]
CircleSize:4
OverallDifficulty:7
ApproachRate:8.3
SliderMultiplier:1.6
SliderTickRate:1
[TimingPoints]
500,500,4,2,1,50,1,0
37500,-50,4,2,1,50,0,0
41500,-25,4,2,1,50,0,0
[HitObjects]
// jacks spaced 1/1 beat apart
64,192,0,1,0,0:0:0:0:
64,192,500,1,0,0:0:0:0:
64,192,1000,1,0,0:0:0:0:
64,192,1500,1,0,0:0:0:0:
64,192,2000,1,0,0:0:0:0:
64,192,2500,1,0,0:0:0:0:
// jacks spaced 1/2 beat apart
64,192,3500,1,0,0:0:0:0:
64,192,3750,1,0,0:0:0:0:
64,192,4000,1,0,0:0:0:0:
64,192,4250,1,0,0:0:0:0:
64,192,4500,1,0,0:0:0:0:
64,192,4750,1,0,0:0:0:0:
64,192,5000,1,0,0:0:0:0:
64,192,6000,1,0,0:0:0:0:
// doubles jacks spaced 1/2 beat apart
192,192,6000,1,0,0:0:0:0:
64,192,6250,1,0,0:0:0:0:
192,192,6250,1,0,0:0:0:0:
64,192,6500,1,0,0:0:0:0:
192,192,6500,1,0,0:0:0:0:
64,192,6750,1,0,0:0:0:0:
192,192,6750,1,0,0:0:0:0:
64,192,7000,1,0,0:0:0:0:
192,192,7000,1,0,0:0:0:0:
64,192,7250,1,0,0:0:0:0:
192,192,7250,1,0,0:0:0:0:
64,192,7500,1,0,0:0:0:0:
192,192,7500,1,0,0:0:0:0:
// trill spaced 1/2 beat apart
64,192,8500,1,0,0:0:0:0:
192,192,8750,1,0,0:0:0:0:
64,192,9000,1,0,0:0:0:0:
192,192,9250,1,0,0:0:0:0:
64,192,9500,1,0,0:0:0:0:
192,192,9750,1,0,0:0:0:0:
64,192,10000,1,0,0:0:0:0:
192,192,10250,1,0,0:0:0:0:
64,192,10500,1,0,0:0:0:0:
// stair spaced 1/4 apart
64,192,11500,1,0,0:0:0:0:
192,192,11625,1,0,0:0:0:0:
320,192,11750,1,0,0:0:0:0:
448,192,11875,1,0,0:0:0:0:
320,192,12000,1,0,0:0:0:0:
192,192,12125,1,0,0:0:0:0:
64,192,12250,1,0,0:0:0:0:
192,192,12375,1,0,0:0:0:0:
320,192,12500,1,0,0:0:0:0:
448,192,12625,1,0,0:0:0:0:
// jumpstreams?
64,192,13500,1,0,0:0:0:0:
192,192,13625,1,0,0:0:0:0:
320,192,13750,1,0,0:0:0:0:
448,192,13875,1,0,0:0:0:0:
320,192,14000,1,0,0:0:0:0:
192,192,14000,1,0,0:0:0:0:
64,192,14125,1,0,0:0:0:0:
192,192,14250,1,0,0:0:0:0:
320,192,14250,1,0,0:0:0:0:
448,192,14250,1,0,0:0:0:0:
64,192,14375,1,0,0:0:0:0:
64,192,14500,1,0,0:0:0:0:
320,192,14625,1,0,0:0:0:0:
448,192,14625,1,0,0:0:0:0:
192,192,14625,1,0,0:0:0:0:
192,192,14750,1,0,0:0:0:0:
64,192,14875,1,0,0:0:0:0:
192,192,15000,1,0,0:0:0:0:
320,192,15125,1,0,0:0:0:0:
448,192,15125,1,0,0:0:0:0:
// double... jumps?
64,192,16000,1,0,0:0:0:0:
64,192,16250,1,0,0:0:0:0:
192,192,16250,1,0,0:0:0:0:
192,192,16500,1,0,0:0:0:0:
320,192,16500,1,0,0:0:0:0:
320,192,16750,1,0,0:0:0:0:
448,192,16750,1,0,0:0:0:0:
448,192,17000,1,0,0:0:0:0:
// notes alongside hold
64,192,18000,128,0,18500:0:0:0:0:
192,192,18000,1,0,0:0:0:0:
192,192,18250,1,0,0:0:0:0:
192,192,18500,1,0,0:0:0:0:
// notes overlapping hold
64,192,19500,1,0,0:0:0:0:
192,192,19625,128,0,20875:0:0:0:0:
64,192,19750,1,0,0:0:0:0:
64,192,20000,1,0,0:0:0:0:
64,192,20250,1,0,0:0:0:0:
64,192,20500,1,0,0:0:0:0:
64,192,20750,1,0,0:0:0:0:
64,192,21000,1,0,0:0:0:0:
// simultaneous holds
64,192,22000,128,0,23000:0:0:0:0:
192,192,22000,128,0,23000:0:0:0:0:
320,192,22000,128,0,23000:0:0:0:0:
448,192,22000,128,0,23000:0:0:0:0:
// hold stairs
64,192,24500,128,0,25500:0:0:0:0:
192,192,24625,128,0,25375:0:0:0:0:
320,192,24750,128,0,25250:0:0:0:0:
448,192,24875,128,0,25125:0:0:0:0:
448,192,25375,128,0,26375:0:0:0:0:
320,192,25500,128,0,26250:0:0:0:0:
192,192,25625,128,0,26125:0:0:0:0:
64,192,25750,128,0,26000:0:0:0:0:
// quads
64,192,26500,1,0,0:0:0:0:
64,192,27500,1,0,0:0:0:0:
192,192,27500,1,0,0:0:0:0:
320,192,27500,1,0,0:0:0:0:
448,192,27500,1,0,0:0:0:0:
64,192,27750,1,0,0:0:0:0:
192,192,27750,1,0,0:0:0:0:
320,192,27750,1,0,0:0:0:0:
448,192,27750,1,0,0:0:0:0:
64,192,28000,1,0,0:0:0:0:
192,192,28000,1,0,0:0:0:0:
320,192,28000,1,0,0:0:0:0:
448,192,28000,1,0,0:0:0:0:
64,192,28250,1,0,0:0:0:0:
192,192,28250,1,0,0:0:0:0:
320,192,28250,1,0,0:0:0:0:
448,192,28250,1,0,0:0:0:0:
64,192,28500,1,0,0:0:0:0:
192,192,28500,1,0,0:0:0:0:
320,192,28500,1,0,0:0:0:0:
448,192,28500,1,0,0:0:0:0:
// double-trills
64,192,29500,1,0,0:0:0:0:
192,192,29500,1,0,0:0:0:0:
320,192,29625,1,0,0:0:0:0:
448,192,29625,1,0,0:0:0:0:
64,192,29750,1,0,0:0:0:0:
192,192,29750,1,0,0:0:0:0:
320,192,29875,1,0,0:0:0:0:
448,192,29875,1,0,0:0:0:0:
64,192,30000,1,0,0:0:0:0:
192,192,30000,1,0,0:0:0:0:
320,192,30125,1,0,0:0:0:0:
448,192,30125,1,0,0:0:0:0:
64,192,30250,1,0,0:0:0:0:
192,192,30250,1,0,0:0:0:0:
320,192,30375,1,0,0:0:0:0:
448,192,30375,1,0,0:0:0:0:
64,192,30500,1,0,0:0:0:0:
192,192,30500,1,0,0:0:0:0:

2
osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
View File

@ -159,6 +159,6 @@ namespace osu.Game.Rulesets.Mania.Scoring
} }
} }
protected override HitWindows CreateHitWindows() => new ManiaHitWindows(); public override HitWindows CreateHitWindows() => new ManiaHitWindows();
} }
} }

25
osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs Normal file
View File

@ -0,0 +1,25 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Osu.Difficulty;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Rulesets.Osu.Tests
{
[TestFixture]
public class OsuDifficultyCalculatorTest : DifficultyCalculatorTest
{
protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
[TestCase(6.931145117263422, "diffcalc-test")]
public void Test(double expected, string name)
=> base.Test(expected, name);
protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(new OsuRuleset(), beatmap);
protected override Ruleset CreateRuleset() => new OsuRuleset();
}
}

36
osu.Game.Rulesets.Osu.Tests/TestCaseHitCircleLongCombo.cs Normal file
View File

@ -0,0 +1,36 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Osu.Objects;
using osuTK;
namespace osu.Game.Rulesets.Osu.Tests
{
[TestFixture]
public class TestCaseHitCircleLongCombo : Game.Tests.Visual.TestCasePlayer
{
public TestCaseHitCircleLongCombo()
: base(new OsuRuleset())
{
}
protected override IBeatmap CreateBeatmap(Ruleset ruleset)
{
var beatmap = new Beatmap
{
BeatmapInfo = new BeatmapInfo
{
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
Ruleset = ruleset.RulesetInfo
}
};
for (int i = 0; i < 512; i++)
beatmap.HitObjects.Add(new HitCircle { Position = new Vector2(256, 192), StartTime = i * 100 });
return beatmap;
}
}
}

1
osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
View File

@ -143,7 +143,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
var scoringTimes = slider.NestedHitObjects.Skip(1).Select(t => t.StartTime); var scoringTimes = slider.NestedHitObjects.Skip(1).Select(t => t.StartTime);
foreach (var time in scoringTimes) foreach (var time in scoringTimes)
computeVertex(time); computeVertex(time);
computeVertex(slider.EndTime);
} }
private Vector2 getEndCursorPosition(OsuHitObject hitObject) private Vector2 getEndCursorPosition(OsuHitObject hitObject)

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
base.SkinChanged(skin, allowFallback); base.SkinChanged(skin, allowFallback);
if (HitObject is IHasComboInformation combo) if (HitObject is IHasComboInformation combo)
AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : Color4.White); AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : (Color4?)null) ?? Color4.White;
} }
protected virtual void UpdatePreemptState() => this.FadeIn(HitObject.TimeFadeIn); protected virtual void UpdatePreemptState() => this.FadeIn(HitObject.TimeFadeIn);

6
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -156,9 +156,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
base.SkinChanged(skin, allowFallback); base.SkinChanged(skin, allowFallback);
Body.AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.CustomColours.ContainsKey("SliderTrackOverride") ? s.CustomColours["SliderTrackOverride"] : Body.AccentColour); Body.AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderTrackOverride") ? s.CustomColours["SliderTrackOverride"] : (Color4?)null) ?? Body.AccentColour;
Body.BorderColour = skin.GetValue<SkinConfiguration, Color4>(s => s.CustomColours.ContainsKey("SliderBorder") ? s.CustomColours["SliderBorder"] : Body.BorderColour); Body.BorderColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderBorder") ? s.CustomColours["SliderBorder"] : (Color4?)null) ?? Body.BorderColour;
Ball.AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.CustomColours.ContainsKey("SliderBall") ? s.CustomColours["SliderBall"] : Ball.AccentColour); Ball.AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderBall") ? s.CustomColours["SliderBall"] : (Color4?)null) ?? Ball.AccentColour;
} }
protected override void CheckForResult(bool userTriggered, double timeOffset) protected override void CheckForResult(bool userTriggered, double timeOffset)

179
osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/diffcalc-test.osu Normal file
View File

@ -0,0 +1,179 @@
osu file format v14
[General]
StackLeniency: 0.3
Mode: 0
[Difficulty]
CircleSize:4
OverallDifficulty:7
ApproachRate:8.3
SliderMultiplier:1.6
SliderTickRate:1
[TimingPoints]
500,500,4,2,1,50,1,0
62500,-500,4,2,1,50,0,0
71000,-100,4,2,1,50,0,0
[HitObjects]
// Circles spaced 1 beat apart, with increasing jump distance
126,112,500,5,0,0:0:0:0:
130,155,1000,1,0,0:0:0:0:
131,269,1500,1,0,0:0:0:0:
341,269,2000,1,0,0:0:0:0:
113,95,2500,1,0,0:0:0:0:
// Circles spaced 1/2 beat apart, with increasing jump distance
108,104,3500,5,0,0:0:0:0:
110,145,3750,1,0,0:0:0:0:
115,262,4000,1,0,0:0:0:0:
285,265,4250,1,0,0:0:0:0:
458,48,4500,1,0,0:0:0:0:
35,199,4750,1,0,0:0:0:0:
251,340,5000,1,0,0:0:0:0:
20,352,5250,1,0,0:0:0:0:
426,62,5500,1,0,0:0:0:0:
// Circles spaced 1/4 beat apart, with increasing jump distances
211,138,6500,5,0,0:0:0:0:
99,256,6625,1,0,0:0:0:0:
68,129,6750,1,0,0:0:0:0:
371,340,6875,1,0,0:0:0:0:
241,219,7000,1,0,0:0:0:0:
252,148,7125,1,0,0:0:0:0:
434,97,7250,1,0,0:0:0:0:
40,38,7375,1,0,0:0:0:0:
114,334,7500,1,0,0:0:0:0:
301,19,7625,1,0,0:0:0:0:
441,241,7750,1,0,0:0:0:0:
121,91,7875,1,0,0:0:0:0:
270,384,8000,1,0,0:0:0:0:
488,92,8125,1,0,0:0:0:0:
332,82,8250,1,0,0:0:0:0:
108,240,8375,1,0,0:0:0:0:
281,268,8500,1,0,0:0:0:0:
// Constant spaced circles spaced 1/2 beat apart, small jump distances, changing angles
252,191,9500,5,0,0:0:0:0:
356,191,9750,1,0,0:0:0:0:
311,268,10000,1,0,0:0:0:0:
190,270,10250,1,0,0:0:0:0:
107,199,10500,1,0,0:0:0:0:
172,105,10750,1,0,0:0:0:0:
297,102,11000,1,0,0:0:0:0:
373,178,11250,1,0,0:0:0:0:
252,195,11500,1,0,0:0:0:0:
// Constant spaced circles spaced 1/2 beat apart, large jump distances, changing angles
140,187,12500,5,0,0:0:0:0:
451,331,12750,1,0,0:0:0:0:
46,338,13000,1,0,0:0:0:0:
204,50,13250,1,0,0:0:0:0:
464,162,13500,1,0,0:0:0:0:
252,346,13750,1,0,0:0:0:0:
13,175,14000,1,0,0:0:0:0:
488,181,14250,1,0,0:0:0:0:
251,187,14500,1,0,0:0:0:0:
// Constant spaced circles spaced 1/4 beat apart, small jump distances, changing angles
188,192,15500,5,0,0:0:0:0:
298,194,15625,1,0,0:0:0:0:
317,84,15750,1,0,0:0:0:0:
185,85,15875,1,0,0:0:0:0:
77,200,16000,1,0,0:0:0:0:
184,303,16125,1,0,0:0:0:0:
295,225,16250,1,0,0:0:0:0:
300,84,16375,1,0,0:0:0:0:
144,82,16500,1,0,0:0:0:0:
141,215,16625,1,0,0:0:0:0:
314,184,16750,1,0,0:0:0:0:
188,192,16875,1,0,0:0:0:0:
188,192,17000,1,0,0:0:0:0:
// Constant spaced circles spaced 1/4 beat apart, large jump distances, changing angles
97,192,18000,5,0,0:0:0:0:
336,38,18125,1,0,0:0:0:0:
440,322,18250,1,0,0:0:0:0:
39,331,18375,1,0,0:0:0:0:
98,39,18500,1,0,0:0:0:0:
460,179,18625,1,0,0:0:0:0:
245,338,18750,1,0,0:0:0:0:
12,184,18875,1,0,0:0:0:0:
250,41,19000,1,0,0:0:0:0:
265,193,19125,1,0,0:0:0:0:
486,22,19250,1,0,0:0:0:0:
411,205,19375,1,0,0:0:0:0:
107,198,19500,1,0,0:0:0:0:
// Short sliders spaced 1 beat apart
28,108,20500,2,0,L|196:107,1,160
25,177,21500,2,0,L|193:176,1,160
26,308,22500,2,0,L|194:307,1,160
320,89,23500,2,0,L|488:88,1,160
// Short sliders spaced 1/2 beat apart
28,108,25000,6,0,L|196:107,1,160
27,173,25750,2,0,L|195:172,1,160
25,292,26500,2,0,L|193:291,1,160
340,213,27250,2,0,L|508:212,1,160
21,44,28000,2,0,L|189:43,1,160
// Short sliders spaced 1/4 beat apart
28,108,29500,6,0,L|196:107,1,160
30,169,30125,2,0,L|198:168,1,160
35,282,30750,2,0,L|203:281,1,160
327,286,31375,2,0,L|495:285,1,160
51,61,32000,2,0,L|219:60,1,160
// Large, medium-paced slider shapes
// PerfectCurve
66,86,33500,6,0,P|246:348|427:44,1,800
66,86,36500,2,0,P|246:348|427:44,1,800
66,86,39500,2,0,P|246:348|427:44,1,800
// Linear
66,72,42500,2,0,B|419:65|419:65|66:316|66:316|426:318,1,1120
66,72,46500,2,0,B|419:65|419:65|66:316|66:316|426:318,1,1120
66,72,50500,2,0,B|419:65|419:65|66:316|66:316|426:318,1,1120
// Bezier
76,287,54500,2,0,B|440:325|138:128|470:302|500:30|130:85|66:82,1,640
76,287,57000,2,0,B|440:325|138:128|470:302|500:30|130:85|66:82,1,640
76,287,59500,2,0,B|440:325|138:128|470:302|500:30|130:85|66:82,1,640
// Large slow slider with many ticks
81,170,62500,6,0,P|263:78|168:268,1,480
// Fast slider with many repeats
102,152,71000,6,0,L|175:153,18,64
// Slider-circle combos, spaced 1/2 beat apart
106,204,75500,6,0,P|275:33|171:304,1,800
255,179,78250,1,0,0:0:0:0:
106,204,78500,2,0,P|275:33|171:304,1,800
255,179,81250,1,0,0:0:0:0:
106,204,81500,2,0,P|275:33|171:304,1,800
// Circle-spinner combos, spaced 1/2 beat apart
82,69,85000,5,0,0:0:0:0:
256,192,85250,8,0,86000,0:0:0:0:
384,189,86250,5,0,0:0:0:0:
256,192,86500,12,0,87000,0:0:0:0:
// Spinner-spinner combos, spaced 1/2 beat apart
256,192,88000,12,0,89000,0:0:0:0:
256,192,89250,12,0,90250,0:0:0:0:
256,192,90500,12,0,91500,0:0:0:0:
256,192,91750,12,0,92750,0:0:0:0:
256,192,93000,12,0,94000,0:0:0:0:
// Slider-spinner combos, spaced 1/2 beat apart
49,89,95000,6,0,L|214:87,1,160
256,192,95625,12,0,96500,0:0:0:0:
12,299,96625,6,0,L|177:297,1,160
256,192,97250,12,0,98125,0:0:0:0:
295,107,98250,6,0,L|460:105,1,160
256,192,98875,12,0,99750,0:0:0:0:
279,325,99875,6,0,L|444:323,1,160
256,192,100500,12,0,101375,0:0:0:0:
197,197,101500,6,0,L|362:195,1,160
256,192,102125,12,0,103000,0:0:0:0:

2
osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
View File

@ -74,6 +74,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(judgement); protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(judgement);
protected override HitWindows CreateHitWindows() => new OsuHitWindows(); public override HitWindows CreateHitWindows() => new OsuHitWindows();
} }
} }

2
osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs
View File

@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, IBindableBeatmap beatmap) private void load(OsuConfigManager config, IBindable<WorkingBeatmap> beatmap)
{ {
InternalChild = expandTarget = new Container InternalChild = expandTarget = new Container
{ {

25
osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs Normal file
View File

@ -0,0 +1,25 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Taiko.Difficulty;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Rulesets.Taiko.Tests
{
public class TaikoDifficultyCalculatorTest : DifficultyCalculatorTest
{
protected override string ResourceAssembly => "osu.Game.Rulesets.Taiko";
[TestCase(2.9811336589467095, "diffcalc-test")]
[TestCase(2.9811336589467095, "diffcalc-test-strong")]
public void Test(double expected, string name)
=> base.Test(expected, name);
protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(new TaikoRuleset(), beatmap);
protected override Ruleset CreateRuleset() => new TaikoRuleset();
}
}

2
osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
difficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime)); difficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime));
if (!calculateStrainValues(difficultyHitObjects, timeRate)) if (!calculateStrainValues(difficultyHitObjects, timeRate))
return new DifficultyAttributes(mods, 0); return new TaikoDifficultyAttributes(mods, 0);
double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor; double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor;

257
osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/diffcalc-test-strong.osu Normal file
View File

@ -0,0 +1,257 @@
osu file format v14
[General]
Mode: 1
[Difficulty]
CircleSize:4
OverallDifficulty:7
ApproachRate:8.3
SliderMultiplier:1.6
SliderTickRate:1
[TimingPoints]
500,500,4,2,1,50,1,0
62500,-500,4,2,1,50,0,0
71000,-100,4,2,1,50,0,0
[HitObjects]
// Same as diffcalc-test with finishers on every note
142,122,0,5,4,0:0:0:0:
142,122,125,1,4,0:0:0:0:
142,122,250,1,4,0:0:0:0:
142,122,375,1,4,0:0:0:0:
142,122,500,1,4,0:0:0:0:
142,122,625,1,4,0:0:0:0:
142,122,750,1,4,0:0:0:0:
142,122,875,1,4,0:0:0:0:
142,122,1000,1,4,0:0:0:0:
142,122,1125,1,4,0:0:0:0:
142,122,1250,1,4,0:0:0:0:
142,122,1375,1,4,0:0:0:0:
142,122,1500,1,4,0:0:0:0:
119,106,2500,1,6,0:0:0:0:
119,106,2625,1,6,0:0:0:0:
119,106,2750,1,6,0:0:0:0:
119,106,2875,1,6,0:0:0:0:
119,106,3000,1,6,0:0:0:0:
119,106,3125,1,6,0:0:0:0:
119,106,3250,1,6,0:0:0:0:
119,106,3375,1,6,0:0:0:0:
119,106,3500,1,6,0:0:0:0:
119,106,3625,1,6,0:0:0:0:
119,106,3750,1,6,0:0:0:0:
119,106,3875,1,6,0:0:0:0:
119,106,4000,1,6,0:0:0:0:
136,90,5000,1,4,0:0:0:0:
136,90,5125,1,6,0:0:0:0:
136,90,5250,1,4,0:0:0:0:
136,90,5375,1,6,0:0:0:0:
136,90,5500,1,4,0:0:0:0:
136,90,5625,1,6,0:0:0:0:
136,90,5750,1,4,0:0:0:0:
136,90,5875,1,6,0:0:0:0:
136,90,6000,1,4,0:0:0:0:
136,90,6125,1,6,0:0:0:0:
136,90,6250,1,4,0:0:0:0:
136,90,6375,1,6,0:0:0:0:
136,90,6500,1,4,0:0:0:0:
86,113,7500,1,4,0:0:0:0:
86,113,7625,1,4,0:0:0:0:
86,113,7750,1,6,0:0:0:0:
86,113,7875,1,6,0:0:0:0:
86,113,8000,1,4,0:0:0:0:
86,113,8125,1,4,0:0:0:0:
86,113,8250,1,6,0:0:0:0:
86,113,8375,1,6,0:0:0:0:
86,113,8500,1,4,0:0:0:0:
86,113,8625,1,4,0:0:0:0:
86,113,8750,1,6,0:0:0:0:
86,113,8875,1,6,0:0:0:0:
86,113,9000,1,4,0:0:0:0:
146,90,10000,1,4,0:0:0:0:
146,90,10125,1,4,0:0:0:0:
146,90,10250,1,4,0:0:0:0:
146,90,10375,1,6,0:0:0:0:
146,90,10500,1,6,0:0:0:0:
146,90,10625,1,6,0:0:0:0:
146,90,10750,1,4,0:0:0:0:
146,90,10875,1,4,0:0:0:0:
146,90,11000,1,4,0:0:0:0:
146,90,11125,1,6,0:0:0:0:
146,90,11250,1,6,0:0:0:0:
146,90,11375,1,6,0:0:0:0:
146,90,11500,1,4,0:0:0:0:
146,90,11625,1,4,0:0:0:0:
146,90,11750,1,4,0:0:0:0:
146,90,11875,1,6,0:0:0:0:
146,90,12000,1,6,0:0:0:0:
146,90,12125,1,6,0:0:0:0:
146,90,12250,1,4,0:0:0:0:
146,90,12375,1,4,0:0:0:0:
146,90,12500,1,4,0:0:0:0:
69,99,13500,1,4,0:0:0:0:
69,99,13625,1,4,0:0:0:0:
69,99,13750,1,4,0:0:0:0:
69,99,13875,1,6,0:0:0:0:
69,99,14000,1,4,0:0:0:0:
69,99,14125,1,4,0:0:0:0:
69,99,14250,1,4,0:0:0:0:
69,99,14375,1,6,0:0:0:0:
69,99,14500,1,4,0:0:0:0:
69,99,14625,1,4,0:0:0:0:
69,99,14750,1,4,0:0:0:0:
69,99,14875,1,6,0:0:0:0:
69,99,15000,1,4,0:0:0:0:
69,99,15125,1,4,0:0:0:0:
69,99,15250,1,4,0:0:0:0:
69,99,15375,1,6,0:0:0:0:
69,99,15500,1,4,0:0:0:0:
83,89,16500,1,4,0:0:0:0:
83,89,16625,1,6,0:0:0:0:
83,89,16750,1,6,0:0:0:0:
83,89,16875,1,4,0:0:0:0:
83,89,17000,1,4,0:0:0:0:
83,89,17125,1,4,0:0:0:0:
83,89,17250,1,6,0:0:0:0:
83,89,17375,1,6,0:0:0:0:
83,89,17500,1,6,0:0:0:0:
83,89,17625,1,6,0:0:0:0:
83,89,17750,1,4,0:0:0:0:
83,89,17875,1,4,0:0:0:0:
83,89,18000,1,4,0:0:0:0:
83,89,18125,1,4,0:0:0:0:
83,89,18250,1,4,0:0:0:0:
83,89,18375,1,6,0:0:0:0:
83,89,18500,1,6,0:0:0:0:
83,89,18625,1,6,0:0:0:0:
83,89,18750,1,6,0:0:0:0:
83,89,18875,1,4,0:0:0:0:
83,89,19000,1,4,0:0:0:0:
83,89,19125,1,4,0:0:0:0:
83,89,19250,1,4,0:0:0:0:
83,89,19375,1,6,0:0:0:0:
83,89,19500,1,6,0:0:0:0:
83,89,19625,1,4,0:0:0:0:
84,122,20500,1,4,0:0:0:0:
84,122,20625,2,4,L|217:123,1,120
84,122,21125,1,4,0:0:0:0:
84,122,21250,2,4,L|217:123,1,120
84,122,21750,1,4,0:0:0:0:
84,122,21875,2,4,L|217:123,1,120
84,122,22375,1,4,0:0:0:0:
84,122,22500,2,4,L|217:123,1,120
84,122,23000,1,4,0:0:0:0:
84,122,23125,2,4,L|217:123,1,120
99,106,24500,1,4,0:0:0:0:
99,106,24625,1,4,0:0:0:0:
99,106,24750,2,4,L|194:107,1,80
99,106,25125,1,4,0:0:0:0:
99,106,25250,1,4,0:0:0:0:
99,106,25375,2,4,L|194:107,1,80
99,106,25750,1,4,0:0:0:0:
99,106,25875,1,4,0:0:0:0:
99,106,26000,2,4,L|194:107,1,80
99,106,26375,1,4,0:0:0:0:
99,106,26500,1,4,0:0:0:0:
99,106,26625,2,4,L|194:107,1,80
99,106,27000,1,4,0:0:0:0:
99,106,27125,1,4,0:0:0:0:
99,106,27250,2,4,L|194:107,1,80
121,103,28500,1,4,0:0:0:0:
121,103,28625,1,4,0:0:0:0:
121,103,28750,1,4,0:0:0:0:
121,103,28875,2,4,L|190:103,1,40
121,103,29125,1,4,0:0:0:0:
121,103,29250,1,4,0:0:0:0:
121,103,29375,1,4,0:0:0:0:
121,103,29500,2,4,L|190:103,1,40
121,103,29750,1,4,0:0:0:0:
121,103,29875,1,4,0:0:0:0:
121,103,30000,1,4,0:0:0:0:
121,103,30125,2,4,L|190:103,1,40
121,103,30375,1,4,0:0:0:0:
121,103,30500,1,4,0:0:0:0:
121,103,30625,1,4,0:0:0:0:
121,103,30750,2,4,L|190:103,1,40
121,103,31000,1,4,0:0:0:0:
121,103,31125,1,4,0:0:0:0:
121,103,31250,1,4,0:0:0:0:
121,103,31375,2,4,L|190:103,1,40
121,103,32500,1,4,0:0:0:0:
121,103,32625,1,6,0:0:0:0:
121,103,32750,1,4,0:0:0:0:
121,103,32875,2,4,L|190:103,1,40
121,103,33125,1,4,0:0:0:0:
121,103,33250,1,6,0:0:0:0:
121,103,33375,1,4,0:0:0:0:
121,103,33500,2,4,L|190:103,1,40
121,103,33750,1,4,0:0:0:0:
121,103,33875,1,6,0:0:0:0:
121,103,34000,1,4,0:0:0:0:
121,103,34125,2,4,L|190:103,1,40
121,103,34375,1,4,0:0:0:0:
121,103,34500,1,6,0:0:0:0:
121,103,34625,1,4,0:0:0:0:
121,103,34750,2,4,L|190:103,1,40
121,103,35000,1,4,0:0:0:0:
121,103,35125,1,6,0:0:0:0:
121,103,35250,1,4,0:0:0:0:
121,103,35375,2,4,L|190:103,1,40
121,103,36500,1,4,0:0:0:0:
121,103,36625,1,4,0:0:0:0:
121,103,36750,1,6,0:0:0:0:
121,103,36875,2,4,L|190:103,1,40
121,103,37125,1,4,0:0:0:0:
121,103,37250,1,4,0:0:0:0:
121,103,37375,1,6,0:0:0:0:
121,103,37500,2,4,L|190:103,1,40
121,103,37750,1,4,0:0:0:0:
121,103,37875,1,4,0:0:0:0:
121,103,38000,1,6,0:0:0:0:
121,103,38125,2,4,L|190:103,1,40
121,103,38375,1,4,0:0:0:0:
121,103,38500,1,4,0:0:0:0:
121,103,38625,1,6,0:0:0:0:
121,103,38750,2,4,L|190:103,1,40
121,103,39000,1,4,0:0:0:0:
121,103,39125,1,4,0:0:0:0:
121,103,39250,1,6,0:0:0:0:
121,103,39375,2,4,L|190:103,1,40
107,106,40500,1,4,0:0:0:0:
107,106,40625,1,4,0:0:0:0:
107,106,40750,1,6,0:0:0:0:
107,106,40875,1,6,0:0:0:0:
46,112,41000,2,4,L|214:112,1,160
107,106,41625,1,4,0:0:0:0:
107,106,41750,1,4,0:0:0:0:
107,106,41875,1,6,0:0:0:0:
107,106,42000,1,6,0:0:0:0:
46,112,42125,2,4,L|214:112,1,160
107,106,42750,1,4,0:0:0:0:
107,106,42875,1,4,0:0:0:0:
107,106,43000,1,6,0:0:0:0:
107,106,43125,1,6,0:0:0:0:
46,112,43250,2,4,L|214:112,1,160
107,106,43875,1,4,0:0:0:0:
107,106,44000,1,4,0:0:0:0:
107,106,44125,1,6,0:0:0:0:
107,106,44250,1,6,0:0:0:0:
46,112,44375,2,4,L|214:112,1,160
107,106,45000,1,4,0:0:0:0:
107,106,45125,1,4,0:0:0:0:
107,106,45250,1,6,0:0:0:0:
107,106,45375,1,6,0:0:0:0:
46,112,45500,2,4,L|214:112,1,160
256,192,47000,12,4,47500,0:0:0:0:
256,192,47625,12,4,48000,0:0:0:0:
256,192,48125,12,4,48500,0:0:0:0:
256,192,48625,12,4,49000,0:0:0:0:
256,192,50000,12,4,50500,0:0:0:0:
183,143,50625,5,4,0:0:0:0:
256,192,50750,12,4,51250,0:0:0:0:
114,106,51375,5,4,0:0:0:0:
256,192,51625,12,4,52125,0:0:0:0:
154,143,52250,5,4,0:0:0:0:
256,192,52375,12,4,52875,0:0:0:0:
116,111,53000,5,4,0:0:0:0:

285
osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/diffcalc-test.osu Normal file
View File

@ -0,0 +1,285 @@
osu file format v14
[General]
Mode: 1
[Difficulty]
CircleSize:4
OverallDifficulty:7
ApproachRate:8.3
SliderMultiplier:1.6
SliderTickRate:1
[TimingPoints]
500,500,4,2,1,50,1,0
62500,-500,4,2,1,50,0,0
71000,-100,4,2,1,50,0,0
[HitObjects]
// dd, spaced 1/4 beat apart
142,122,0,5,0,0:0:0:0:
142,122,125,1,0,0:0:0:0:
142,122,250,1,0,0:0:0:0:
142,122,375,1,0,0:0:0:0:
142,122,500,1,0,0:0:0:0:
142,122,625,1,0,0:0:0:0:
142,122,750,1,0,0:0:0:0:
142,122,875,1,0,0:0:0:0:
142,122,1000,1,0,0:0:0:0:
142,122,1125,1,0,0:0:0:0:
142,122,1250,1,0,0:0:0:0:
142,122,1375,1,0,0:0:0:0:
142,122,1500,1,0,0:0:0:0:
// kk, spaced 1/4 beat apart
119,106,2500,1,2,0:0:0:0:
119,106,2625,1,2,0:0:0:0:
119,106,2750,1,2,0:0:0:0:
119,106,2875,1,2,0:0:0:0:
119,106,3000,1,2,0:0:0:0:
119,106,3125,1,2,0:0:0:0:
119,106,3250,1,2,0:0:0:0:
119,106,3375,1,2,0:0:0:0:
119,106,3500,1,2,0:0:0:0:
119,106,3625,1,2,0:0:0:0:
119,106,3750,1,2,0:0:0:0:
119,106,3875,1,2,0:0:0:0:
119,106,4000,1,2,0:0:0:0:
// dk, spaced 1/4 beat apart
136,90,5000,1,0,0:0:0:0:
136,90,5125,1,2,0:0:0:0:
136,90,5250,1,0,0:0:0:0:
136,90,5375,1,2,0:0:0:0:
136,90,5500,1,0,0:0:0:0:
136,90,5625,1,2,0:0:0:0:
136,90,5750,1,0,0:0:0:0:
136,90,5875,1,2,0:0:0:0:
136,90,6000,1,0,0:0:0:0:
136,90,6125,1,2,0:0:0:0:
136,90,6250,1,0,0:0:0:0:
136,90,6375,1,2,0:0:0:0:
136,90,6500,1,0,0:0:0:0:
// ddkk, spaced 1/4 beat apart
86,113,7500,1,0,0:0:0:0:
86,113,7625,1,0,0:0:0:0:
86,113,7750,1,2,0:0:0:0:
86,113,7875,1,2,0:0:0:0:
86,113,8000,1,0,0:0:0:0:
86,113,8125,1,0,0:0:0:0:
86,113,8250,1,2,0:0:0:0:
86,113,8375,1,2,0:0:0:0:
86,113,8500,1,0,0:0:0:0:
86,113,8625,1,0,0:0:0:0:
86,113,8750,1,2,0:0:0:0:
86,113,8875,1,2,0:0:0:0:
86,113,9000,1,0,0:0:0:0:
// dddkkk, spaced 1/4 beat apart
146,90,10000,1,0,0:0:0:0:
146,90,10125,1,0,0:0:0:0:
146,90,10250,1,0,0:0:0:0:
146,90,10375,1,2,0:0:0:0:
146,90,10500,1,2,0:0:0:0:
146,90,10625,1,2,0:0:0:0:
146,90,10750,1,0,0:0:0:0:
146,90,10875,1,0,0:0:0:0:
146,90,11000,1,0,0:0:0:0:
146,90,11125,1,2,0:0:0:0:
146,90,11250,1,2,0:0:0:0:
146,90,11375,1,2,0:0:0:0:
146,90,11500,1,0,0:0:0:0:
146,90,11625,1,0,0:0:0:0:
146,90,11750,1,0,0:0:0:0:
146,90,11875,1,2,0:0:0:0:
146,90,12000,1,2,0:0:0:0:
146,90,12125,1,2,0:0:0:0:
146,90,12250,1,0,0:0:0:0:
146,90,12375,1,0,0:0:0:0:
146,90,12500,1,0,0:0:0:0:
// dddk, spaced 1/4 beat apart
69,99,13500,1,0,0:0:0:0:
69,99,13625,1,0,0:0:0:0:
69,99,13750,1,0,0:0:0:0:
69,99,13875,1,2,0:0:0:0:
69,99,14000,1,0,0:0:0:0:
69,99,14125,1,0,0:0:0:0:
69,99,14250,1,0,0:0:0:0:
69,99,14375,1,2,0:0:0:0:
69,99,14500,1,0,0:0:0:0:
69,99,14625,1,0,0:0:0:0:
69,99,14750,1,0,0:0:0:0:
69,99,14875,1,2,0:0:0:0:
69,99,15000,1,0,0:0:0:0:
69,99,15125,1,0,0:0:0:0:
69,99,15250,1,0,0:0:0:0:
69,99,15375,1,2,0:0:0:0:
69,99,15500,1,0,0:0:0:0:
// arbitrary pattern, spaced 1/4 beat apart
83,89,16500,1,0,0:0:0:0:
83,89,16625,1,2,0:0:0:0:
83,89,16750,1,2,0:0:0:0:
83,89,16875,1,0,0:0:0:0:
83,89,17000,1,0,0:0:0:0:
83,89,17125,1,0,0:0:0:0:
83,89,17250,1,2,0:0:0:0:
83,89,17375,1,2,0:0:0:0:
83,89,17500,1,2,0:0:0:0:
83,89,17625,1,2,0:0:0:0:
83,89,17750,1,0,0:0:0:0:
83,89,17875,1,0,0:0:0:0:
83,89,18000,1,0,0:0:0:0:
83,89,18125,1,0,0:0:0:0:
83,89,18250,1,0,0:0:0:0:
83,89,18375,1,2,0:0:0:0:
83,89,18500,1,2,0:0:0:0:
83,89,18625,1,2,0:0:0:0:
83,89,18750,1,2,0:0:0:0:
83,89,18875,1,0,0:0:0:0:
83,89,19000,1,0,0:0:0:0:
83,89,19125,1,0,0:0:0:0:
83,89,19250,1,0,0:0:0:0:
83,89,19375,1,2,0:0:0:0:
83,89,19500,1,2,0:0:0:0:
83,89,19625,1,0,0:0:0:0:
// d-slider pattern, spaced 1/4 beat apart
84,122,20500,1,0,0:0:0:0:
84,122,20625,2,0,L|217:123,1,120
84,122,21125,1,0,0:0:0:0:
84,122,21250,2,0,L|217:123,1,120
84,122,21750,1,0,0:0:0:0:
84,122,21875,2,0,L|217:123,1,120
84,122,22375,1,0,0:0:0:0:
84,122,22500,2,0,L|217:123,1,120
84,122,23000,1,0,0:0:0:0:
84,122,23125,2,0,L|217:123,1,120
// dd-slider pattern, spaced 1/4 beat apart
99,106,24500,1,0,0:0:0:0:
99,106,24625,1,0,0:0:0:0:
99,106,24750,2,0,L|194:107,1,80
99,106,25125,1,0,0:0:0:0:
99,106,25250,1,0,0:0:0:0:
99,106,25375,2,0,L|194:107,1,80
99,106,25750,1,0,0:0:0:0:
99,106,25875,1,0,0:0:0:0:
99,106,26000,2,0,L|194:107,1,80
99,106,26375,1,0,0:0:0:0:
99,106,26500,1,0,0:0:0:0:
99,106,26625,2,0,L|194:107,1,80
99,106,27000,1,0,0:0:0:0:
99,106,27125,1,0,0:0:0:0:
99,106,27250,2,0,L|194:107,1,80
// ddd-slider pattern, spaced 1/4 beat apart
121,103,28500,1,0,0:0:0:0:
121,103,28625,1,0,0:0:0:0:
121,103,28750,1,0,0:0:0:0:
121,103,28875,2,0,L|190:103,1,40
121,103,29125,1,0,0:0:0:0:
121,103,29250,1,0,0:0:0:0:
121,103,29375,1,0,0:0:0:0:
121,103,29500,2,0,L|190:103,1,40
121,103,29750,1,0,0:0:0:0:
121,103,29875,1,0,0:0:0:0:
121,103,30000,1,0,0:0:0:0:
121,103,30125,2,0,L|190:103,1,40
121,103,30375,1,0,0:0:0:0:
121,103,30500,1,0,0:0:0:0:
121,103,30625,1,0,0:0:0:0:
121,103,30750,2,0,L|190:103,1,40
121,103,31000,1,0,0:0:0:0:
121,103,31125,1,0,0:0:0:0:
121,103,31250,1,0,0:0:0:0:
121,103,31375,2,0,L|190:103,1,40
// dkd-slider pattern, spaced 1/4 beat apart
121,103,32500,1,0,0:0:0:0:
121,103,32625,1,2,0:0:0:0:
121,103,32750,1,0,0:0:0:0:
121,103,32875,2,0,L|190:103,1,40
121,103,33125,1,0,0:0:0:0:
121,103,33250,1,2,0:0:0:0:
121,103,33375,1,0,0:0:0:0:
121,103,33500,2,0,L|190:103,1,40
121,103,33750,1,0,0:0:0:0:
121,103,33875,1,2,0:0:0:0:
121,103,34000,1,0,0:0:0:0:
121,103,34125,2,0,L|190:103,1,40
121,103,34375,1,0,0:0:0:0:
121,103,34500,1,2,0:0:0:0:
121,103,34625,1,0,0:0:0:0:
121,103,34750,2,0,L|190:103,1,40
121,103,35000,1,0,0:0:0:0:
121,103,35125,1,2,0:0:0:0:
121,103,35250,1,0,0:0:0:0:
121,103,35375,2,0,L|190:103,1,40
//ddk-slider pattern, spaced 1/4 beat apart
121,103,36500,1,0,0:0:0:0:
121,103,36625,1,0,0:0:0:0:
121,103,36750,1,2,0:0:0:0:
121,103,36875,2,0,L|190:103,1,40
121,103,37125,1,0,0:0:0:0:
121,103,37250,1,0,0:0:0:0:
121,103,37375,1,2,0:0:0:0:
121,103,37500,2,0,L|190:103,1,40
121,103,37750,1,0,0:0:0:0:
121,103,37875,1,0,0:0:0:0:
121,103,38000,1,2,0:0:0:0:
121,103,38125,2,0,L|190:103,1,40
121,103,38375,1,0,0:0:0:0:
121,103,38500,1,0,0:0:0:0:
121,103,38625,1,2,0:0:0:0:
121,103,38750,2,0,L|190:103,1,40
121,103,39000,1,0,0:0:0:0:
121,103,39125,1,0,0:0:0:0:
121,103,39250,1,2,0:0:0:0:
121,103,39375,2,0,L|190:103,1,40
//ddkk-slider pattern, spaced 1/4 beat apart
107,106,40500,1,0,0:0:0:0:
107,106,40625,1,0,0:0:0:0:
107,106,40750,1,2,0:0:0:0:
107,106,40875,1,2,0:0:0:0:
46,112,41000,2,0,L|214:112,1,160
107,106,41625,1,0,0:0:0:0:
107,106,41750,1,0,0:0:0:0:
107,106,41875,1,2,0:0:0:0:
107,106,42000,1,2,0:0:0:0:
46,112,42125,2,0,L|214:112,1,160
107,106,42750,1,0,0:0:0:0:
107,106,42875,1,0,0:0:0:0:
107,106,43000,1,2,0:0:0:0:
107,106,43125,1,2,0:0:0:0:
46,112,43250,2,0,L|214:112,1,160
107,106,43875,1,0,0:0:0:0:
107,106,44000,1,0,0:0:0:0:
107,106,44125,1,2,0:0:0:0:
107,106,44250,1,2,0:0:0:0:
46,112,44375,2,0,L|214:112,1,160
107,106,45000,1,0,0:0:0:0:
107,106,45125,1,0,0:0:0:0:
107,106,45250,1,2,0:0:0:0:
107,106,45375,1,2,0:0:0:0:
46,112,45500,2,0,L|214:112,1,160
// spinner-spinner pattern, spaced 1/4 beat apart
256,192,47000,12,0,47500,0:0:0:0:
256,192,47625,12,0,48000,0:0:0:0:
256,192,48125,12,0,48500,0:0:0:0:
256,192,48625,12,0,49000,0:0:0:0:
// spinner-d pattern, spaced 1/4 beat apart
256,192,50000,12,0,50500,0:0:0:0:
183,143,50625,5,0,0:0:0:0:
256,192,50750,12,0,51250,0:0:0:0:
114,106,51375,5,0,0:0:0:0:
256,192,51625,12,0,52125,0:0:0:0:
154,143,52250,5,0,0:0:0:0:
256,192,52375,12,0,52875,0:0:0:0:
116,111,53000,5,0,0:0:0:0:

2
osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -67,6 +67,6 @@ namespace osu.Game.Rulesets.Taiko.Scoring
Health.Value = 0; Health.Value = 0;
} }
protected override HitWindows CreateHitWindows() => new TaikoHitWindows(); public override HitWindows CreateHitWindows() => new TaikoHitWindows();
} }
} }

2
osu.Game.Tests/Resources/skin-empty.ini Normal file
View File

@ -0,0 +1,2 @@
[General]
Name: test skin

8
osu.Game.Tests/Resources/skin.ini Normal file
View File

@ -0,0 +1,8 @@
[General]
Name: test skin
[Colours]
Combo1 : 142,199,255
Combo2 : 255,128,128
Combo3 : 128,255,255
Combo7 : 100,100,100,100

44
osu.Game.Tests/Skins/LegacySkinDecoderTest.cs Normal file
View File

@ -0,0 +1,44 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.IO;
using NUnit.Framework;
using osu.Game.Skinning;
using osu.Game.Tests.Resources;
using osuTK.Graphics;
namespace osu.Game.Tests.Skins
{
[TestFixture]
public class LegacySkinDecoderTest
{
[TestCase(true)]
[TestCase(false)]
public void TestDecodeSkinColours(bool hasColours)
{
var decoder = new LegacySkinDecoder();
using (var resStream = TestResources.OpenResource(hasColours ? "skin.ini" : "skin-empty.ini"))
using (var stream = new StreamReader(resStream))
{
var comboColors = decoder.Decode(stream).ComboColours;
List<Color4> expectedColors;
if (hasColours)
expectedColors = new List<Color4>
{
new Color4(142, 199, 255, 255),
new Color4(255, 128, 128, 255),
new Color4(128, 255, 255, 255),
new Color4(100, 100, 100, 100),
};
else
expectedColors = new DefaultSkin().Configuration.ComboColours;
Assert.AreEqual(expectedColors.Count, comboColors.Count);
for (int i = 0; i < expectedColors.Count; i++)
Assert.AreEqual(expectedColors[i], comboColors[i]);
}
}
}
}

15
osu.Game.Tests/Visual/TestCaseDisclaimer.cs
View File

@ -2,27 +2,16 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Screens.Menu; using osu.Game.Screens.Menu;
using osuTK.Graphics;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseDisclaimer : OsuTestCase public class TestCaseDisclaimer : ScreenTestCase
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Children = new Drawable[] LoadScreen(new Disclaimer());
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
new Disclaimer()
};
} }
} }
} }

4
osu.Game.Tests/Visual/TestCaseDrawings.cs
View File

@ -9,11 +9,11 @@ using osu.Game.Screens.Tournament.Teams;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[Description("for tournament use")] [Description("for tournament use")]
public class TestCaseDrawings : OsuTestCase public class TestCaseDrawings : ScreenTestCase
{ {
public TestCaseDrawings() public TestCaseDrawings()
{ {
Add(new Drawings LoadScreen(new Drawings
{ {
TeamList = new TestTeamList(), TeamList = new TestTeamList(),
}); });

2
osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
View File

@ -85,7 +85,7 @@ namespace osu.Game.Tests.Visual
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IAdjustableClock adjustableClock, IBindableBeatmap beatmap) private void load(IAdjustableClock adjustableClock, IBindable<WorkingBeatmap> beatmap)
{ {
this.adjustableClock = adjustableClock; this.adjustableClock = adjustableClock;
this.beatmap.BindTo(beatmap); this.beatmap.BindTo(beatmap);

14
osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
View File

@ -16,7 +16,7 @@ using osuTK.Graphics;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseLoungeRoomsContainer : OsuTestCase public class TestCaseLoungeRoomsContainer : MultiplayerTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual
AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0)); AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0));
AddStep("select first room", () => container.Rooms.First().Action?.Invoke()); AddStep("select first room", () => container.Rooms.First().Action?.Invoke());
AddAssert("first room selected", () => container.SelectedRoom.Value == roomManager.Rooms.First()); AddAssert("first room selected", () => Room == roomManager.Rooms.First());
AddStep("join first room", () => container.Rooms.First().Action?.Invoke()); AddStep("join first room", () => container.Rooms.First().Action?.Invoke());
AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus); AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus);
@ -71,7 +71,11 @@ namespace osu.Game.Tests.Visual
private class TestRoomManager : IRoomManager private class TestRoomManager : IRoomManager
{ {
public event Action RoomsUpdated; public event Action RoomsUpdated
{
add { }
remove { }
}
public readonly BindableList<Room> Rooms = new BindableList<Room>(); public readonly BindableList<Room> Rooms = new BindableList<Room>();
IBindableList<Room> IRoomManager.Rooms => Rooms; IBindableList<Room> IRoomManager.Rooms => Rooms;
@ -85,10 +89,6 @@ namespace osu.Game.Tests.Visual
public void PartRoom() public void PartRoom()
{ {
} }
public void Filter(FilterCriteria criteria)
{
}
} }
private class JoinedRoomStatus : RoomStatus private class JoinedRoomStatus : RoomStatus

12
osu.Game.Tests/Visual/TestCaseMatchHeader.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Screens.Multi.Match.Components;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseMatchHeader : OsuTestCase public class TestCaseMatchHeader : MultiplayerTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
@ -21,11 +21,7 @@ namespace osu.Game.Tests.Visual
public TestCaseMatchHeader() public TestCaseMatchHeader()
{ {
var room = new Room(); Room.Playlist.Add(new PlaylistItem
var header = new Header(room);
room.Playlist.Add(new PlaylistItem
{ {
Beatmap = new BeatmapInfo Beatmap = new BeatmapInfo
{ {
@ -46,9 +42,9 @@ namespace osu.Game.Tests.Visual
} }
}); });
room.Type.Value = new GameTypeTimeshift(); Room.Type.Value = new GameTypeTimeshift();
Child = header; Child = new Header();
} }
} }
} }

29
osu.Game.Tests/Visual/TestCaseMatchInfo.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Screens.Multi.Match.Components;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[TestFixture] [TestFixture]
public class TestCaseMatchInfo : OsuTestCase public class TestCaseMatchInfo : MultiplayerTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
@ -27,18 +27,15 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(RulesetStore rulesets) private void load(RulesetStore rulesets)
{ {
var room = new Room(); Add(new Info());
Info info = new Info(room); AddStep(@"set name", () => Room.Name.Value = @"Room Name?");
Add(info); AddStep(@"set availability", () => Room.Availability.Value = RoomAvailability.FriendsOnly);
AddStep(@"set status", () => Room.Status.Value = new RoomStatusPlaying());
AddStep(@"set name", () => room.Name.Value = @"Room Name?");
AddStep(@"set availability", () => room.Availability.Value = RoomAvailability.FriendsOnly);
AddStep(@"set status", () => room.Status.Value = new RoomStatusPlaying());
AddStep(@"set beatmap", () => AddStep(@"set beatmap", () =>
{ {
room.Playlist.Clear(); Room.Playlist.Clear();
room.Playlist.Add(new PlaylistItem Room.Playlist.Add(new PlaylistItem
{ {
Beatmap = new BeatmapInfo Beatmap = new BeatmapInfo
{ {
@ -54,14 +51,14 @@ namespace osu.Game.Tests.Visual
}); });
}); });
AddStep(@"change name", () => room.Name.Value = @"Room Name!"); AddStep(@"change name", () => Room.Name.Value = @"Room Name!");
AddStep(@"change availability", () => room.Availability.Value = RoomAvailability.InviteOnly); AddStep(@"change availability", () => Room.Availability.Value = RoomAvailability.InviteOnly);
AddStep(@"change status", () => room.Status.Value = new RoomStatusOpen()); AddStep(@"change status", () => Room.Status.Value = new RoomStatusOpen());
AddStep(@"null beatmap", () => room.Playlist.Clear()); AddStep(@"null beatmap", () => Room.Playlist.Clear());
AddStep(@"change beatmap", () => AddStep(@"change beatmap", () =>
{ {
room.Playlist.Clear(); Room.Playlist.Clear();
room.Playlist.Add(new PlaylistItem Room.Playlist.Add(new PlaylistItem
{ {
Beatmap = new BeatmapInfo Beatmap = new BeatmapInfo
{ {

6
osu.Game.Tests/Visual/TestCaseMatchLeaderboard.cs
View File

@ -6,24 +6,24 @@ using Newtonsoft.Json;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseMatchLeaderboard : OsuTestCase public class TestCaseMatchLeaderboard : MultiplayerTestCase
{ {
public TestCaseMatchLeaderboard() public TestCaseMatchLeaderboard()
{ {
Room.RoomID.Value = 3;
Add(new MatchLeaderboard Add(new MatchLeaderboard
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Size = new Vector2(550f, 450f), Size = new Vector2(550f, 450f),
Scope = MatchLeaderboardScope.Overall, Scope = MatchLeaderboardScope.Overall,
Room = new Room { RoomID = { Value = 3 } }
}); });
} }

24
osu.Game.Tests/Visual/TestCaseMatchParticipants.cs
View File

@ -1,9 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Users; using osu.Game.Users;
@ -11,22 +9,14 @@ using osu.Game.Users;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[TestFixture] [TestFixture]
public class TestCaseMatchParticipants : OsuTestCase public class TestCaseMatchParticipants : MultiplayerTestCase
{ {
private readonly Bindable<int?> maxParticipants = new Bindable<int?>();
private readonly Bindable<IEnumerable<User>> users = new Bindable<IEnumerable<User>>();
public TestCaseMatchParticipants() public TestCaseMatchParticipants()
{ {
Participants participants; Add(new Participants { RelativeSizeAxes = Axes.Both });
Add(participants = new Participants { RelativeSizeAxes = Axes.Both }); AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
AddStep(@"set users", () => Room.Participants.Value = new[]
participants.MaxParticipants.BindTo(maxParticipants);
participants.Users.BindTo(users);
AddStep(@"set max to null", () => maxParticipants.Value = null);
AddStep(@"set users", () => users.Value = new[]
{ {
new User new User
{ {
@ -54,9 +44,9 @@ namespace osu.Game.Tests.Visual
}, },
}); });
AddStep(@"set max", () => maxParticipants.Value = 10); AddStep(@"set max", () => Room.MaxParticipants.Value = 10);
AddStep(@"clear users", () => users.Value = new User[] { }); AddStep(@"clear users", () => Room.Participants.Value = new User[] { });
AddStep(@"set max to null", () => maxParticipants.Value = null); AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
} }
} }
} }

45
osu.Game.Tests/Visual/TestCaseMatchResults.cs
View File

@ -8,7 +8,6 @@ using osu.Framework.Allocation;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Multiplayer;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.Multi.Ranking; using osu.Game.Screens.Multi.Ranking;
@ -19,7 +18,7 @@ using osu.Game.Users;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseMatchResults : OsuTestCase public class TestCaseMatchResults : MultiplayerTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
@ -38,68 +37,52 @@ namespace osu.Game.Tests.Visual
if (beatmapInfo != null) if (beatmapInfo != null)
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo); Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
Child = new TestMatchResults(new ScoreInfo Room.RoomID.Value = 1;
Room.Name.Value = "an awesome room";
LoadScreen(new TestMatchResults(new ScoreInfo
{ {
User = new User { Id = 10 }, User = new User { Id = 10 },
}); }));
} }
private class TestMatchResults : MatchResults private class TestMatchResults : MatchResults
{ {
private readonly Room room;
public TestMatchResults(ScoreInfo score) public TestMatchResults(ScoreInfo score)
: this(score, new Room : base(score)
{
RoomID = { Value = 1 },
Name = { Value = "an awesome room" }
})
{ {
} }
public TestMatchResults(ScoreInfo score, Room room) protected override IEnumerable<IResultPageInfo> CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap.Value) };
: base(score, room)
{
this.room = room;
}
protected override IEnumerable<IResultPageInfo> CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap, room) };
} }
private class TestRoomLeaderboardPageInfo : RoomLeaderboardPageInfo private class TestRoomLeaderboardPageInfo : RoomLeaderboardPageInfo
{ {
private readonly ScoreInfo score; private readonly ScoreInfo score;
private readonly WorkingBeatmap beatmap; private readonly WorkingBeatmap beatmap;
private readonly Room room;
public TestRoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap, Room room) public TestRoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap)
: base(score, beatmap, room) : base(score, beatmap)
{ {
this.score = score; this.score = score;
this.beatmap = beatmap; this.beatmap = beatmap;
this.room = room;
} }
public override ResultsPage CreatePage() => new TestRoomLeaderboardPage(score, beatmap, room); public override ResultsPage CreatePage() => new TestRoomLeaderboardPage(score, beatmap);
} }
private class TestRoomLeaderboardPage : RoomLeaderboardPage private class TestRoomLeaderboardPage : RoomLeaderboardPage
{ {
public TestRoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap, Room room) public TestRoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap)
: base(score, beatmap, room) : base(score, beatmap)
{ {
} }
protected override MatchLeaderboard CreateLeaderboard(Room room) => new TestMatchLeaderboard(room); protected override MatchLeaderboard CreateLeaderboard() => new TestMatchLeaderboard();
} }
private class TestMatchLeaderboard : RoomLeaderboardPage.ResultsMatchLeaderboard private class TestMatchLeaderboard : RoomLeaderboardPage.ResultsMatchLeaderboard
{ {
public TestMatchLeaderboard(Room room)
: base(room)
{
}
protected override APIRequest FetchScores(Action<IEnumerable<APIRoomScoreInfo>> scoresCallback) protected override APIRequest FetchScores(Action<IEnumerable<APIRoomScoreInfo>> scoresCallback)
{ {
var scores = Enumerable.Range(0, 50).Select(createRoomScore).ToArray(); var scores = Enumerable.Range(0, 50).Select(createRoomScore).ToArray();

40
osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
View File

@ -13,12 +13,11 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi; using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Match.Components;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseMatchSettingsOverlay : OsuTestCase public class TestCaseMatchSettingsOverlay : MultiplayerTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
@ -28,14 +27,14 @@ namespace osu.Game.Tests.Visual
[Cached(Type = typeof(IRoomManager))] [Cached(Type = typeof(IRoomManager))]
private TestRoomManager roomManager = new TestRoomManager(); private TestRoomManager roomManager = new TestRoomManager();
private Room room;
private TestRoomSettings settings; private TestRoomSettings settings;
[SetUp] [SetUp]
public void Setup() => Schedule(() => public void Setup() => Schedule(() =>
{ {
room = new Room(); Room = new Room();
settings = new TestRoomSettings(room)
settings = new TestRoomSettings
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
State = Visibility.Visible State = Visibility.Visible
@ -49,19 +48,19 @@ namespace osu.Game.Tests.Visual
{ {
AddStep("clear name and beatmap", () => AddStep("clear name and beatmap", () =>
{ {
room.Name.Value = ""; Room.Name.Value = "";
room.Playlist.Clear(); Room.Playlist.Clear();
}); });
AddAssert("button disabled", () => !settings.ApplyButton.Enabled); AddAssert("button disabled", () => !settings.ApplyButton.Enabled);
AddStep("set name", () => room.Name.Value = "Room name"); AddStep("set name", () => Room.Name.Value = "Room name");
AddAssert("button disabled", () => !settings.ApplyButton.Enabled); AddAssert("button disabled", () => !settings.ApplyButton.Enabled);
AddStep("set beatmap", () => room.Playlist.Add(new PlaylistItem { Beatmap = new DummyWorkingBeatmap().BeatmapInfo })); AddStep("set beatmap", () => Room.Playlist.Add(new PlaylistItem { Beatmap = new DummyWorkingBeatmap().BeatmapInfo }));
AddAssert("button enabled", () => settings.ApplyButton.Enabled); AddAssert("button enabled", () => settings.ApplyButton.Enabled);
AddStep("clear name", () => room.Name.Value = ""); AddStep("clear name", () => Room.Name.Value = "");
AddAssert("button disabled", () => !settings.ApplyButton.Enabled); AddAssert("button disabled", () => !settings.ApplyButton.Enabled);
} }
@ -117,17 +116,12 @@ namespace osu.Game.Tests.Visual
private class TestRoomSettings : MatchSettingsOverlay private class TestRoomSettings : MatchSettingsOverlay
{ {
public new TriangleButton ApplyButton => base.ApplyButton; public TriangleButton ApplyButton => Settings.ApplyButton;
public new OsuTextBox NameField => base.NameField; public OsuTextBox NameField => Settings.NameField;
public new OsuDropdown<TimeSpan> DurationField => base.DurationField; public OsuDropdown<TimeSpan> DurationField => Settings.DurationField;
public new OsuSpriteText ErrorText => base.ErrorText; public OsuSpriteText ErrorText => Settings.ErrorText;
public TestRoomSettings(Room room)
: base(room)
{
}
} }
private class TestRoomManager : IRoomManager private class TestRoomManager : IRoomManager
@ -136,7 +130,11 @@ namespace osu.Game.Tests.Visual
public Func<Room, bool> CreateRequested; public Func<Room, bool> CreateRequested;
public event Action RoomsUpdated; public event Action RoomsUpdated
{
add { }
remove { }
}
public IBindableList<Room> Rooms { get; } = null; public IBindableList<Room> Rooms { get; } = null;
@ -154,8 +152,6 @@ namespace osu.Game.Tests.Visual
public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException(); public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException();
public void PartRoom() => throw new NotImplementedException(); public void PartRoom() => throw new NotImplementedException();
public void Filter(FilterCriteria criteria) => throw new NotImplementedException();
} }
} }
} }

4
osu.Game.Tests/Visual/TestCaseMultiScreen.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Screens.Multi.Lounge.Components;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[TestFixture] [TestFixture]
public class TestCaseMultiScreen : OsuTestCase public class TestCaseMultiScreen : ScreenTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual
{ {
Multiplayer multi = new Multiplayer(); Multiplayer multi = new Multiplayer();
AddStep(@"show", () => Add(multi)); AddStep(@"show", () => LoadScreen(multi));
AddWaitStep(5); AddWaitStep(5);
AddStep(@"exit", multi.Exit); AddStep(@"exit", multi.Exit);
} }

6
osu.Game.Tests/Visual/TestCaseOsuGame.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Screens;
using osu.Game.Screens; using osu.Game.Screens;
using osu.Game.Screens.Menu; using osu.Game.Screens.Menu;
using osuTK.Graphics; using osuTK.Graphics;
@ -29,7 +30,10 @@ namespace osu.Game.Tests.Visual
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.Black, Colour = Color4.Black,
}, },
new Loader() new ScreenStack(new Loader())
{
RelativeSizeAxes = Axes.Both,
}
}; };
} }
} }

7
osu.Game.Tests/Visual/TestCaseParallaxContainer.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Backgrounds;
@ -14,7 +16,10 @@ namespace osu.Game.Tests.Visual
Add(parallax = new ParallaxContainer Add(parallax = new ParallaxContainer
{ {
Child = new BackgroundScreenDefault { Alpha = 0.8f } Child = new ScreenStack(new BackgroundScreenDefault { Alpha = 0.8f })
{
RelativeSizeAxes = Axes.Both,
}
}); });
AddStep("default parallax", () => parallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT); AddStep("default parallax", () => parallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT);

27
osu.Game.Tests/Visual/TestCasePlaySongSelect.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Configuration;
using osu.Framework.Extensions; using osu.Framework.Extensions;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Rulesets; using osu.Game.Rulesets;
@ -25,7 +26,7 @@ using osu.Game.Screens.Select.Filter;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[TestFixture] [TestFixture]
public class TestCasePlaySongSelect : OsuTestCase public class TestCasePlaySongSelect : ScreenTestCase
{ {
private BeatmapManager manager; private BeatmapManager manager;
@ -102,21 +103,16 @@ namespace osu.Game.Tests.Visual
} }
[SetUp] [SetUp]
public virtual void SetUp() public virtual void SetUp() =>
{ Schedule(() => { manager?.Delete(manager.GetAllUsableBeatmapSets()); });
Schedule(() =>
{
manager?.Delete(manager.GetAllUsableBeatmapSets());
Child = songSelect = new TestSongSelect();
});
}
[Test] [Test]
public void TestDummy() public void TestDummy()
{ {
createSongSelect();
AddAssert("dummy selected", () => songSelect.CurrentBeatmap == defaultBeatmap); AddAssert("dummy selected", () => songSelect.CurrentBeatmap == defaultBeatmap);
AddAssert("dummy shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap == defaultBeatmap); AddUntilStep(() => songSelect.CurrentBeatmapDetailsBeatmap == defaultBeatmap, "dummy shown on wedge");
addManyTestMaps(); addManyTestMaps();
AddWaitStep(3); AddWaitStep(3);
@ -127,6 +123,7 @@ namespace osu.Game.Tests.Visual
[Test] [Test]
public void TestSorting() public void TestSorting()
{ {
createSongSelect();
addManyTestMaps(); addManyTestMaps();
AddWaitStep(3); AddWaitStep(3);
@ -142,6 +139,7 @@ namespace osu.Game.Tests.Visual
[Ignore("needs fixing")] [Ignore("needs fixing")]
public void TestImportUnderDifferentRuleset() public void TestImportUnderDifferentRuleset()
{ {
createSongSelect();
changeRuleset(2); changeRuleset(2);
importForRuleset(0); importForRuleset(0);
AddUntilStep(() => songSelect.Carousel.SelectedBeatmap == null, "no selection"); AddUntilStep(() => songSelect.Carousel.SelectedBeatmap == null, "no selection");
@ -150,6 +148,7 @@ namespace osu.Game.Tests.Visual
[Test] [Test]
public void TestImportUnderCurrentRuleset() public void TestImportUnderCurrentRuleset()
{ {
createSongSelect();
changeRuleset(2); changeRuleset(2);
importForRuleset(2); importForRuleset(2);
importForRuleset(1); importForRuleset(1);
@ -165,6 +164,7 @@ namespace osu.Game.Tests.Visual
[Test] [Test]
public void TestRulesetChangeResetsMods() public void TestRulesetChangeResetsMods()
{ {
createSongSelect();
changeRuleset(0); changeRuleset(0);
changeMods(new OsuModHardRock()); changeMods(new OsuModHardRock());
@ -194,6 +194,7 @@ namespace osu.Game.Tests.Visual
[Test] [Test]
public void TestStartAfterUnMatchingFilterDoesNotStart() public void TestStartAfterUnMatchingFilterDoesNotStart()
{ {
createSongSelect();
addManyTestMaps(); addManyTestMaps();
AddUntilStep(() => songSelect.Carousel.SelectedBeatmap != null, "has selection"); AddUntilStep(() => songSelect.Carousel.SelectedBeatmap != null, "has selection");
@ -221,6 +222,12 @@ namespace osu.Game.Tests.Visual
private void changeRuleset(int id) => AddStep($"change ruleset to {id}", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == id)); private void changeRuleset(int id) => AddStep($"change ruleset to {id}", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == id));
private void createSongSelect()
{
AddStep("create song select", () => LoadScreen(songSelect = new TestSongSelect()));
AddUntilStep(() => songSelect.IsCurrentScreen(), "wait for present");
}
private void addManyTestMaps() private void addManyTestMaps()
{ {
AddStep("import test maps", () => AddStep("import test maps", () =>

14
osu.Game.Tests/Visual/TestCasePlayerLoader.cs
View File

@ -3,6 +3,7 @@
using System.Threading; using System.Threading;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
@ -12,28 +13,37 @@ namespace osu.Game.Tests.Visual
public class TestCasePlayerLoader : ManualInputManagerTestCase public class TestCasePlayerLoader : ManualInputManagerTestCase
{ {
private PlayerLoader loader; private PlayerLoader loader;
private ScreenStack stack;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGameBase game) private void load(OsuGameBase game)
{ {
Beatmap.Value = new DummyWorkingBeatmap(game); Beatmap.Value = new DummyWorkingBeatmap(game);
AddStep("load dummy beatmap", () => Add(loader = new PlayerLoader(() => new Player InputManager.Add(stack = new ScreenStack { RelativeSizeAxes = Axes.Both });
AddStep("load dummy beatmap", () => stack.Push(loader = new PlayerLoader(() => new Player
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false, AllowLeadIn = false,
AllowResults = false, AllowResults = false,
}))); })));
AddUntilStep(() => loader.IsCurrentScreen(), "wait for current");
AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre)); AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
AddUntilStep(() => !loader.IsCurrentScreen(), "wait for no longer current"); AddUntilStep(() => !loader.IsCurrentScreen(), "wait for no longer current");
AddStep("exit loader", () => loader.Exit());
AddUntilStep(() => !loader.IsAlive, "wait for no longer alive");
AddStep("load slow dummy beatmap", () => AddStep("load slow dummy beatmap", () =>
{ {
SlowLoadPlayer slow = null; SlowLoadPlayer slow = null;
Add(loader = new PlayerLoader(() => slow = new SlowLoadPlayer stack.Push(loader = new PlayerLoader(() => slow = new SlowLoadPlayer
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false, AllowLeadIn = false,

4
osu.Game.Tests/Visual/TestCaseResults.cs
View File

@ -16,7 +16,7 @@ using osu.Game.Users;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[TestFixture] [TestFixture]
public class TestCaseResults : OsuTestCase public class TestCaseResults : ScreenTestCase
{ {
private BeatmapManager beatmaps; private BeatmapManager beatmaps;
@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual
if (beatmapInfo != null) if (beatmapInfo != null)
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo); Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
Add(new SoloResults(new ScoreInfo LoadScreen(new SoloResults(new ScoreInfo
{ {
TotalScore = 2845370, TotalScore = 2845370,
Accuracy = 0.98, Accuracy = 0.98,

7
osu.Game/Beatmaps/BindableBeatmap.cs
View File

@ -12,9 +12,9 @@ namespace osu.Game.Beatmaps
{ {
/// <summary> /// <summary>
/// A <see cref="Bindable{WorkingBeatmap}"/> for the <see cref="OsuGame"/> beatmap. /// A <see cref="Bindable{WorkingBeatmap}"/> for the <see cref="OsuGame"/> beatmap.
/// This should be used sparingly in-favour of <see cref="IBindableBeatmap"/>. /// This should be used sparingly in-favour of <see cref="IBindable<WorkingBeatmap>"/>.
/// </summary> /// </summary>
public abstract class BindableBeatmap : NonNullableBindable<WorkingBeatmap>, IBindableBeatmap public abstract class BindableBeatmap : NonNullableBindable<WorkingBeatmap>
{ {
private AudioManager audioManager; private AudioManager audioManager;
private WorkingBeatmap lastBeatmap; private WorkingBeatmap lastBeatmap;
@ -62,9 +62,6 @@ namespace osu.Game.Beatmaps
lastBeatmap = beatmap; lastBeatmap = beatmap;
} }
[NotNull]
IBindableBeatmap IBindableBeatmap.GetBoundCopy() => GetBoundCopy();
/// <summary> /// <summary>
/// Retrieve a new <see cref="BindableBeatmap"/> instance weakly bound to this <see cref="BindableBeatmap"/>. /// Retrieve a new <see cref="BindableBeatmap"/> instance weakly bound to this <see cref="BindableBeatmap"/>.
/// If you are further binding to events of the retrieved <see cref="BindableBeatmap"/>, ensure a local reference is held. /// If you are further binding to events of the retrieved <see cref="BindableBeatmap"/>, ensure a local reference is held.

112
osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
View File

@ -1,112 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Game.Online.API.Requests;
namespace osu.Game.Beatmaps.Drawables
{
/// <summary>
/// A component to allow downloading of a beatmap set. Automatically handles state syncing between other instances.
/// </summary>
public class BeatmapSetDownloader : Component
{
private readonly BeatmapSetInfo set;
private readonly bool noVideo;
private BeatmapManager beatmaps;
/// <summary>
/// Holds the current download state of the beatmap, whether is has already been downloaded, is in progress, or is not downloaded.
/// </summary>
public readonly Bindable<DownloadStatus> DownloadState = new Bindable<DownloadStatus>();
public BeatmapSetDownloader(BeatmapSetInfo set, bool noVideo = false)
{
this.set = set;
this.noVideo = noVideo;
}
[BackgroundDependencyLoader]
private void load(BeatmapManager beatmaps)
{
this.beatmaps = beatmaps;
beatmaps.ItemAdded += setAdded;
beatmaps.ItemRemoved += setRemoved;
beatmaps.BeatmapDownloadBegan += downloadBegan;
beatmaps.BeatmapDownloadFailed += downloadFailed;
// initial value
if (set.OnlineBeatmapSetID != null && beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID && !s.DeletePending).Any())
DownloadState.Value = DownloadStatus.Downloaded;
else if (beatmaps.GetExistingDownload(set) != null)
DownloadState.Value = DownloadStatus.Downloading;
else
DownloadState.Value = DownloadStatus.NotDownloaded;
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (beatmaps != null)
{
beatmaps.ItemAdded -= setAdded;
beatmaps.ItemRemoved -= setRemoved;
beatmaps.BeatmapDownloadBegan -= downloadBegan;
beatmaps.BeatmapDownloadFailed -= downloadFailed;
}
}
/// <summary>
/// Begin downloading the associated beatmap set.
/// </summary>
/// <returns>True if downloading began. False if an existing download is active or completed.</returns>
public void Download()
{
if (DownloadState.Value > DownloadStatus.NotDownloaded)
return;
if (beatmaps.Download(set, noVideo))
{
// Only change state if download can happen
DownloadState.Value = DownloadStatus.Downloading;
}
}
private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => Schedule(() =>
{
if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.Downloaded;
});
private void setRemoved(BeatmapSetInfo s) => Schedule(() =>
{
if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.NotDownloaded;
});
private void downloadBegan(DownloadBeatmapSetRequest d)
{
if (d.BeatmapSet.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.Downloading;
}
private void downloadFailed(DownloadBeatmapSetRequest d)
{
if (d.BeatmapSet.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.NotDownloaded;
}
public enum DownloadStatus
{
NotDownloaded,
Downloading,
Downloaded,
}
}
}

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

@ -13,7 +13,7 @@ namespace osu.Game.Beatmaps.Drawables
/// </summary> /// </summary>
public class UpdateableBeatmapBackgroundSprite : ModelBackedDrawable<BeatmapInfo> public class UpdateableBeatmapBackgroundSprite : ModelBackedDrawable<BeatmapInfo>
{ {
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>(); public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
[Resolved] [Resolved]
private BeatmapManager beatmaps { get; set; } private BeatmapManager beatmaps { get; set; }

19
osu.Game/Beatmaps/IBindableBeatmap.cs
View File

@ -1,19 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Configuration;
namespace osu.Game.Beatmaps
{
/// <summary>
/// Read-only interface for the <see cref="OsuGame"/> beatmap.
/// </summary>
public interface IBindableBeatmap : IBindable<WorkingBeatmap>
{
/// <summary>
/// Retrieve a new <see cref="IBindableBeatmap"/> instance weakly bound to this <see cref="IBindableBeatmap"/>.
/// If you are further binding to events of the retrieved <see cref="IBindableBeatmap"/>, ensure a local reference is held.
/// </summary>
IBindableBeatmap GetBoundCopy();
}
}

2
osu.Game/Graphics/Containers/BeatSyncedContainer.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Graphics.Containers
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap) private void load(IBindable<WorkingBeatmap> beatmap)
{ {
Beatmap.BindTo(beatmap); Beatmap.BindTo(beatmap);
} }

3
osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
View File

@ -9,12 +9,13 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Platform; using osu.Framework.Platform;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
public class OsuPasswordTextBox : OsuTextBox public class OsuPasswordTextBox : OsuTextBox, ISuppressKeyEventLogging
{ {
protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize); protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize);

15
osu.Game/Online/API/APIAccess.cs
View File

@ -355,11 +355,7 @@ namespace osu.Game.Online.API
State = APIState.Offline; State = APIState.Offline;
} }
private static User createGuestUser() => new User private static User createGuestUser() => new GuestUser();
{
Username = @"Guest",
Id = 1,
};
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
@ -370,6 +366,15 @@ namespace osu.Game.Online.API
} }
} }
internal class GuestUser : User
{
public GuestUser()
{
Username = @"Guest";
Id = 1;
}
}
public enum APIState public enum APIState
{ {
/// <summary> /// <summary>

4
osu.Game/Online/API/APIDownloadRequest.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Online.API
return request; return request;
} }
private void request_Progress(long current, long total) => API.Schedule(() => Progress?.Invoke(current, total)); private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
protected APIDownloadRequest() protected APIDownloadRequest()
{ {
@ -29,7 +29,7 @@ namespace osu.Game.Online.API
Success?.Invoke(filename); Success?.Invoke(filename);
} }
public event APIProgressHandler Progress; public event APIProgressHandler Progressed;
public new event APISuccessHandler<string> Success; public new event APISuccessHandler<string> Success;
} }

6
osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
View File

@ -10,7 +10,9 @@ namespace osu.Game.Online.API.Requests
{ {
public readonly BeatmapSetInfo BeatmapSet; public readonly BeatmapSetInfo BeatmapSet;
public Action<float> DownloadProgressed; public float Progress;
public event Action<float> DownloadProgressed;
private readonly bool noVideo; private readonly bool noVideo;
@ -19,7 +21,7 @@ namespace osu.Game.Online.API.Requests
this.noVideo = noVideo; this.noVideo = noVideo;
BeatmapSet = set; BeatmapSet = set;
Progress += (current, total) => DownloadProgressed?.Invoke((float) current / total); Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
} }
protected override string Target => $@"beatmapsets/{BeatmapSet.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}"; protected override string Target => $@"beatmapsets/{BeatmapSet.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";

6
osu.Game/Online/Multiplayer/PlaylistItem.cs
View File

@ -1,9 +1,9 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Configuration;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets; using osu.Game.Rulesets;
@ -37,10 +37,10 @@ namespace osu.Game.Online.Multiplayer
public RulesetInfo Ruleset { get; set; } public RulesetInfo Ruleset { get; set; }
[JsonIgnore] [JsonIgnore]
public readonly BindableList<Mod> AllowedMods = new BindableList<Mod>(); public readonly List<Mod> AllowedMods = new List<Mod>();
[JsonIgnore] [JsonIgnore]
public readonly BindableList<Mod> RequiredMods = new BindableList<Mod>(); public readonly List<Mod> RequiredMods = new List<Mod>();
[JsonProperty("beatmap")] [JsonProperty("beatmap")]
private APIBeatmap apiBeatmap { get; set; } private APIBeatmap apiBeatmap { get; set; }

35
osu.Game/Online/Multiplayer/Room.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Game.Online.Multiplayer.GameTypes; using osu.Game.Online.Multiplayer.GameTypes;
using osu.Game.Online.Multiplayer.RoomStatuses; using osu.Game.Online.Multiplayer.RoomStatuses;
@ -14,44 +15,73 @@ namespace osu.Game.Online.Multiplayer
{ {
public class Room public class Room
{ {
[Cached]
[JsonProperty("id")] [JsonProperty("id")]
public Bindable<int?> RoomID { get; private set; } = new Bindable<int?>(); public Bindable<int?> RoomID { get; private set; } = new Bindable<int?>();
[Cached]
[JsonProperty("name")] [JsonProperty("name")]
public Bindable<string> Name { get; private set; } = new Bindable<string>(); public Bindable<string> Name { get; private set; } = new Bindable<string>();
[Cached]
[JsonProperty("host")] [JsonProperty("host")]
public Bindable<User> Host { get; private set; } = new Bindable<User>(); public Bindable<User> Host { get; private set; } = new Bindable<User>();
[Cached]
[JsonProperty("playlist")] [JsonProperty("playlist")]
public BindableList<PlaylistItem> Playlist { get; set; } = new BindableList<PlaylistItem>(); public BindableList<PlaylistItem> Playlist { get; private set; } = new BindableList<PlaylistItem>();
[Cached]
[JsonIgnore]
public Bindable<PlaylistItem> CurrentItem { get; private set; } = new Bindable<PlaylistItem>();
[Cached]
[JsonProperty("channel_id")] [JsonProperty("channel_id")]
public Bindable<int> ChannelId { get; private set; } = new Bindable<int>(); public Bindable<int> ChannelId { get; private set; } = new Bindable<int>();
[Cached]
[JsonIgnore] [JsonIgnore]
public Bindable<TimeSpan> Duration { get; private set; } = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30)); public Bindable<TimeSpan> Duration { get; private set; } = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));
[Cached]
[JsonIgnore] [JsonIgnore]
public Bindable<int?> MaxAttempts { get; private set; } = new Bindable<int?>(); public Bindable<int?> MaxAttempts { get; private set; } = new Bindable<int?>();
[Cached]
[JsonIgnore] [JsonIgnore]
public Bindable<RoomStatus> Status { get; private set; } = new Bindable<RoomStatus>(new RoomStatusOpen()); public Bindable<RoomStatus> Status { get; private set; } = new Bindable<RoomStatus>(new RoomStatusOpen());
[Cached]
[JsonIgnore] [JsonIgnore]
public Bindable<RoomAvailability> Availability { get; private set; } = new Bindable<RoomAvailability>(); public Bindable<RoomAvailability> Availability { get; private set; } = new Bindable<RoomAvailability>();
[Cached]
[JsonIgnore] [JsonIgnore]
public Bindable<GameType> Type { get; private set; } = new Bindable<GameType>(new GameTypeTimeshift()); public Bindable<GameType> Type { get; private set; } = new Bindable<GameType>(new GameTypeTimeshift());
[Cached]
[JsonIgnore] [JsonIgnore]
public Bindable<int?> MaxParticipants { get; private set; } = new Bindable<int?>(); public Bindable<int?> MaxParticipants { get; private set; } = new Bindable<int?>();
[Cached]
[JsonIgnore] [JsonIgnore]
public Bindable<IEnumerable<User>> Participants { get; private set; } = new Bindable<IEnumerable<User>>(Enumerable.Empty<User>()); public Bindable<IEnumerable<User>> Participants { get; private set; } = new Bindable<IEnumerable<User>>(Enumerable.Empty<User>());
[Cached]
public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>(); public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>();
public Room()
{
Playlist.ItemsAdded += updateCurrent;
Playlist.ItemsRemoved += updateCurrent;
updateCurrent(Playlist);
}
private void updateCurrent(IEnumerable<PlaylistItem> playlist)
{
CurrentItem.Value = playlist.FirstOrDefault();
}
// todo: TEMPORARY // todo: TEMPORARY
[JsonProperty("participant_count")] [JsonProperty("participant_count")]
private int? participantCount private int? participantCount
@ -68,6 +98,7 @@ namespace osu.Game.Online.Multiplayer
} }
// Only supports retrieval for now // Only supports retrieval for now
[Cached]
[JsonProperty("ends_at")] [JsonProperty("ends_at")]
public Bindable<DateTimeOffset> EndDate { get; private set; } = new Bindable<DateTimeOffset>(); public Bindable<DateTimeOffset> EndDate { get; private set; } = new Bindable<DateTimeOffset>();
@ -83,7 +114,7 @@ namespace osu.Game.Online.Multiplayer
/// The position of this <see cref="Room"/> in the list. This is not read from or written to the API. /// The position of this <see cref="Room"/> in the list. This is not read from or written to the API.
/// </summary> /// </summary>
[JsonIgnore] [JsonIgnore]
public int Position = -1; public Bindable<int> Position { get; private set; } = new Bindable<int>(-1);
public void CopyFrom(Room other) public void CopyFrom(Room other)
{ {

46
osu.Game/OsuGame.cs
View File

@ -169,7 +169,7 @@ namespace osu.Game
dependencies.CacheAs(ruleset); dependencies.CacheAs(ruleset);
dependencies.CacheAs<IBindable<RulesetInfo>>(ruleset); dependencies.CacheAs<IBindable<RulesetInfo>>(ruleset);
dependencies.Cache(osuLogo = new OsuLogo()); dependencies.Cache(osuLogo = new OsuLogo { Alpha = 0 });
// bind config int to database RulesetInfo // bind config int to database RulesetInfo
configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset); configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
@ -292,7 +292,7 @@ namespace osu.Game
return; return;
} }
if ((screenStack.CurrentScreen as IOsuScreen)?.AllowExternalScreenChange != true) if ((screenStack.CurrentScreen as IOsuScreen)?.AllowExternalScreenChange == false)
{ {
notifications.Post(new SimpleNotification notifications.Post(new SimpleNotification
{ {
@ -311,7 +311,7 @@ namespace osu.Game
void loadScore() void loadScore()
{ {
if (!menuScreen.IsCurrentScreen()) if (!menuScreen.IsCurrentScreen() || Beatmap.Disabled)
{ {
menuScreen.MakeCurrent(); menuScreen.MakeCurrent();
this.Delay(500).Schedule(loadScore, out scoreLoad); this.Delay(500).Schedule(loadScore, out scoreLoad);
@ -337,6 +337,11 @@ namespace osu.Game
{ {
base.LoadComplete(); base.LoadComplete();
// The next time this is updated is in UpdateAfterChildren, which occurs too late and results
// in the cursor being shown for a few frames during the intro.
// This prevents the cursor from showing until we have a screen with CursorVisible = true
MenuCursorContainer.CanShowCursor = menuScreen?.CursorVisible ?? false;
// todo: all archive managers should be able to be looped here. // todo: all archive managers should be able to be looped here.
SkinManager.PostNotification = n => notifications?.Post(n); SkinManager.PostNotification = n => notifications?.Post(n);
SkinManager.GetStableStorage = GetStorageForStableInstall; SkinManager.GetStableStorage = GetStorageForStableInstall;
@ -723,46 +728,13 @@ namespace osu.Game
{ {
base.UpdateAfterChildren(); base.UpdateAfterChildren();
// we only want to apply these restrictions when we are inside a screen stack.
// the use case for not applying is in visual/unit tests.
bool applyBeatmapRulesetRestrictions = !(screenStack.CurrentScreen as IOsuScreen)?.AllowBeatmapRulesetChange ?? false;
ruleset.Disabled = applyBeatmapRulesetRestrictions;
Beatmap.Disabled = applyBeatmapRulesetRestrictions;
screenContainer.Padding = new MarginPadding { Top = ToolbarOffset }; screenContainer.Padding = new MarginPadding { Top = ToolbarOffset };
overlayContent.Padding = new MarginPadding { Top = ToolbarOffset }; overlayContent.Padding = new MarginPadding { Top = ToolbarOffset };
MenuCursorContainer.CanShowCursor = (screenStack.CurrentScreen as IOsuScreen)?.CursorVisible ?? false; MenuCursorContainer.CanShowCursor = (screenStack.CurrentScreen as IOsuScreen)?.CursorVisible ?? false;
} }
/// <summary> protected virtual void ScreenChanged(IScreen current, IScreen newScreen)
/// Sets <see cref="Beatmap"/> while ignoring any beatmap.
/// </summary>
/// <param name="beatmap">The beatmap to set.</param>
public void ForcefullySetBeatmap(WorkingBeatmap beatmap)
{
var beatmapDisabled = Beatmap.Disabled;
Beatmap.Disabled = false;
Beatmap.Value = beatmap;
Beatmap.Disabled = beatmapDisabled;
}
/// <summary>
/// Sets <see cref="Ruleset"/> while ignoring any ruleset restrictions.
/// </summary>
/// <param name="beatmap">The beatmap to set.</param>
public void ForcefullySetRuleset(RulesetInfo ruleset)
{
var rulesetDisabled = this.ruleset.Disabled;
this.ruleset.Disabled = false;
this.ruleset.Value = ruleset;
this.ruleset.Disabled = rulesetDisabled;
}
protected virtual void ScreenChanged(IScreen lastScreen, IScreen newScreen)
{ {
switch (newScreen) switch (newScreen)
{ {

12
osu.Game/OsuGameBase.cs
View File

@ -69,8 +69,9 @@ namespace osu.Game
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
private OsuBindableBeatmap beatmap; private Bindable<WorkingBeatmap> beatmap;
protected BindableBeatmap Beatmap => beatmap;
protected Bindable<WorkingBeatmap> Beatmap => beatmap;
private Bindable<bool> fpsDisplayVisible; private Bindable<bool> fpsDisplayVisible;
@ -155,7 +156,6 @@ namespace osu.Game
dependencies.CacheAs<IAPIProvider>(API); dependencies.CacheAs<IAPIProvider>(API);
var defaultBeatmap = new DummyWorkingBeatmap(this); var defaultBeatmap = new DummyWorkingBeatmap(this);
beatmap = new OsuBindableBeatmap(defaultBeatmap, Audio);
dependencies.Cache(RulesetStore = new RulesetStore(contextFactory)); dependencies.Cache(RulesetStore = new RulesetStore(contextFactory));
dependencies.Cache(FileStore = new FileStore(contextFactory, Host.Storage)); dependencies.Cache(FileStore = new FileStore(contextFactory, Host.Storage));
@ -174,8 +174,10 @@ namespace osu.Game
// this adds a global reduction of track volume for the time being. // this adds a global reduction of track volume for the time being.
Audio.Track.AddAdjustment(AdjustableProperty.Volume, new BindableDouble(0.8)); Audio.Track.AddAdjustment(AdjustableProperty.Volume, new BindableDouble(0.8));
dependencies.CacheAs<BindableBeatmap>(beatmap); beatmap = new OsuBindableBeatmap(defaultBeatmap, Audio);
dependencies.CacheAs<IBindableBeatmap>(beatmap);
dependencies.CacheAs<IBindable<WorkingBeatmap>>(beatmap);
dependencies.CacheAs(beatmap);
FileStore.Cleanup(); FileStore.Cleanup();

7
osu.Game/Overlays/AccountCreation/ScreenEntry.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Framework.Platform;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
@ -38,11 +39,13 @@ namespace osu.Game.Overlays.AccountCreation
private OsuTextBox[] textboxes; private OsuTextBox[] textboxes;
private ProcessingOverlay processingOverlay; private ProcessingOverlay processingOverlay;
private GameHost host;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, APIAccess api) private void load(OsuColour colours, APIAccess api, GameHost host)
{ {
this.api = api; this.api = api;
this.host = host;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
@ -139,7 +142,7 @@ namespace osu.Game.Overlays.AccountCreation
{ {
base.Update(); base.Update();
if (!textboxes.Any(t => t.HasFocus)) if (host?.OnScreenKeyboardOverlapsGameWindow != true && !textboxes.Any(t => t.HasFocus))
focusNextTextbox(); focusNextTextbox();
} }

5
osu.Game/Overlays/AccountCreationOverlay.cs
View File

@ -70,7 +70,10 @@ namespace osu.Game.Overlays
Colour = Color4.Black, Colour = Color4.Black,
Alpha = 0.9f, Alpha = 0.9f,
}, },
welcomeScreen = new ScreenWelcome(), new ScreenStack(welcomeScreen = new ScreenWelcome())
{
RelativeSizeAxes = Axes.Both,
},
} }
} }
} }

181
osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
View File

@ -7,42 +7,138 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Overlays.Direct;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Overlays.BeatmapSet.Buttons namespace osu.Game.Overlays.BeatmapSet.Buttons
{ {
public class DownloadButton : HeaderButton, IHasTooltip public class DownloadButton : DownloadTrackingComposite, IHasTooltip
{ {
public string TooltipText => "Download this beatmap"; private readonly bool noVideo;
public string TooltipText => button.Enabled ? "Download this beatmap" : "Login to download";
private readonly IBindable<User> localUser = new Bindable<User>(); private readonly IBindable<User> localUser = new Bindable<User>();
public DownloadButton(BeatmapSetInfo set, bool noVideo = false) private ShakeContainer shakeContainer;
{ private HeaderButton button;
Width = 120;
BeatmapSetDownloader downloader; public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
Add(new Container : base(beatmapSet)
{
this.noVideo = noVideo;
Width = 120;
RelativeSizeAxes = Axes.Y;
}
[BackgroundDependencyLoader]
private void load(APIAccess api, BeatmapManager beatmaps)
{
FillFlowContainer textSprites;
AddRangeInternal(new Drawable[]
{ {
Depth = -1, shakeContainer = new ShakeContainer
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = 10 },
Children = new Drawable[]
{ {
downloader = new BeatmapSetDownloader(set, noVideo), Depth = -1,
new FillFlowContainer RelativeSizeAxes = Axes.Both,
Masking = true,
CornerRadius = 5,
Children = new Drawable[]
{ {
Anchor = Anchor.CentreLeft, button = new HeaderButton { RelativeSizeAxes = Axes.Both },
Origin = Anchor.CentreLeft, new Container
AutoSizeAxes = Axes.Both, {
Direction = FillDirection.Vertical, // cannot nest inside here due to the structure of button (putting things in its own content).
Children = new[] // requires framework fix.
Padding = new MarginPadding { Horizontal = 10 },
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
textSprites = new FillFlowContainer
{
Depth = -1,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
AutoSizeDuration = 500,
AutoSizeEasing = Easing.OutQuint,
Direction = FillDirection.Vertical,
},
new SpriteIcon
{
Depth = -1,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Icon = FontAwesome.fa_download,
Size = new Vector2(16),
Margin = new MarginPadding { Right = 5 },
},
}
},
new DownloadProgressBar(BeatmapSet)
{
Depth = -2,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
},
},
},
});
button.Action = () =>
{
if (State.Value != DownloadState.NotDownloaded)
{
shakeContainer.Shake();
return;
}
beatmaps.Download(BeatmapSet, noVideo);
};
localUser.BindTo(api.LocalUser);
localUser.BindValueChanged(userChanged, true);
button.Enabled.BindValueChanged(enabledChanged, true);
State.BindValueChanged(state =>
{
switch (state)
{
case DownloadState.Downloading:
textSprites.Children = new Drawable[]
{
new OsuSpriteText
{
Text = "Downloading...",
TextSize = 13,
Font = @"Exo2.0-Bold",
},
};
break;
case DownloadState.Downloaded:
textSprites.Children = new Drawable[]
{
new OsuSpriteText
{
Text = "Importing...",
TextSize = 13,
Font = @"Exo2.0-Bold",
},
};
break;
case DownloadState.LocallyAvailable:
this.FadeOut(200);
break;
case DownloadState.NotDownloaded:
textSprites.Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText
{ {
@ -52,57 +148,18 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = set.OnlineInfo.HasVideo && noVideo ? "without Video" : string.Empty, Text = BeatmapSet.Value.OnlineInfo.HasVideo && noVideo ? "without Video" : string.Empty,
TextSize = 11, TextSize = 11,
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
}, },
}, };
},
new SpriteIcon
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Icon = FontAwesome.fa_download,
Size = new Vector2(16),
Margin = new MarginPadding { Right = 5 },
},
},
});
Action = () =>
{
if (downloader.DownloadState.Value == BeatmapSetDownloader.DownloadStatus.Downloading)
{
Content.MoveToX(-5, 50, Easing.OutSine).Then()
.MoveToX(5, 100, Easing.InOutSine).Then()
.MoveToX(-5, 100, Easing.InOutSine).Then()
.MoveToX(0, 50, Easing.InSine);
return;
}
downloader.Download();
};
downloader.DownloadState.ValueChanged += state =>
{
switch (state)
{
case BeatmapSetDownloader.DownloadStatus.Downloaded:
this.FadeOut(200);
break;
case BeatmapSetDownloader.DownloadStatus.NotDownloaded:
this.FadeIn(200); this.FadeIn(200);
break; break;
} }
}; }, true);
} }
[BackgroundDependencyLoader] private void userChanged(User user) => button.Enabled.Value = !(user is GuestUser);
private void load(APIAccess api)
{
localUser.BindTo(api.LocalUser);
Enabled.BindValueChanged(enabledChanged, true);
}
private void enabledChanged(bool enabled) => this.FadeColour(enabled ? Color4.White : Color4.Gray, 200, Easing.OutQuint); private void enabledChanged(bool enabled) => this.FadeColour(enabled ? Color4.White : Color4.Gray, 200, Easing.OutQuint);
} }

137
osu.Game/Overlays/BeatmapSet/Header.cs
View File

@ -13,12 +13,14 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.BeatmapSet.Buttons; using osu.Game.Overlays.BeatmapSet.Buttons;
using osu.Game.Overlays.Direct;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using DownloadButton = osu.Game.Overlays.BeatmapSet.Buttons.DownloadButton;
namespace osu.Game.Overlays.BeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class Header : Container public class Header : DownloadTrackingComposite
{ {
private const float transition_duration = 200; private const float transition_duration = 200;
private const float tabs_height = 50; private const float tabs_height = 50;
@ -28,76 +30,23 @@ namespace osu.Game.Overlays.BeatmapSet
private readonly Box tabsBg; private readonly Box tabsBg;
private readonly UpdateableBeatmapSetCover cover; private readonly UpdateableBeatmapSetCover cover;
private readonly OsuSpriteText title, artist; private readonly OsuSpriteText title, artist;
private readonly Container noVideoButtons;
private readonly FillFlowContainer videoButtons;
private readonly AuthorInfo author; private readonly AuthorInfo author;
private readonly Container downloadButtonsContainer; private readonly FillFlowContainer downloadButtonsContainer;
private readonly BeatmapSetOnlineStatusPill onlineStatusPill; private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
public Details Details; public Details Details;
public readonly BeatmapPicker Picker; public readonly BeatmapPicker Picker;
private BeatmapSetInfo beatmapSet;
private readonly FavouriteButton favouriteButton; private readonly FavouriteButton favouriteButton;
public BeatmapSetInfo BeatmapSet
{
get { return beatmapSet; }
set
{
if (value == beatmapSet) return;
beatmapSet = value;
Picker.BeatmapSet = author.BeatmapSet = Details.BeatmapSet = BeatmapSet;
updateDisplay();
}
}
private void updateDisplay()
{
title.Text = BeatmapSet?.Metadata.Title ?? string.Empty;
artist.Text = BeatmapSet?.Metadata.Artist ?? string.Empty;
onlineStatusPill.Status = BeatmapSet?.OnlineInfo.Status ?? BeatmapSetOnlineStatus.None;
cover.BeatmapSet = BeatmapSet;
if (BeatmapSet != null)
{
downloadButtonsContainer.FadeIn(transition_duration);
favouriteButton.FadeIn(transition_duration);
if (BeatmapSet.OnlineInfo.HasVideo)
{
videoButtons.Children = new[]
{
new DownloadButton(BeatmapSet),
new DownloadButton(BeatmapSet, true),
};
videoButtons.FadeIn(transition_duration);
noVideoButtons.FadeOut(transition_duration);
}
else
{
noVideoButtons.Child = new DownloadButton(BeatmapSet);
noVideoButtons.FadeIn(transition_duration);
videoButtons.FadeOut(transition_duration);
}
}
else
{
downloadButtonsContainer.FadeOut(transition_duration);
favouriteButton.FadeOut(transition_duration);
}
}
public Header() public Header()
{ {
ExternalLinkButton externalLink; ExternalLinkButton externalLink;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = 400; Height = 400;
Masking = true; Masking = true;
EdgeEffect = new EdgeEffectParameters EdgeEffect = new EdgeEffectParameters
{ {
Colour = Color4.Black.Opacity(0.25f), Colour = Color4.Black.Opacity(0.25f),
@ -105,7 +54,8 @@ namespace osu.Game.Overlays.BeatmapSet
Radius = 3, Radius = 3,
Offset = new Vector2(0f, 1f), Offset = new Vector2(0f, 1f),
}; };
Children = new Drawable[]
InternalChildren = new Drawable[]
{ {
new Container new Container
{ {
@ -196,24 +146,11 @@ namespace osu.Game.Overlays.BeatmapSet
Children = new Drawable[] Children = new Drawable[]
{ {
favouriteButton = new FavouriteButton(), favouriteButton = new FavouriteButton(),
downloadButtonsContainer = new Container downloadButtonsContainer = new FillFlowContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Left = buttons_height + buttons_spacing }, Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
Children = new Drawable[] Spacing = new Vector2(buttons_spacing),
{
noVideoButtons = new Container
{
RelativeSizeAxes = Axes.Both,
Alpha = 0f,
},
videoButtons = new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
Spacing = new Vector2(buttons_spacing),
Alpha = 0f,
},
},
}, },
}, },
}, },
@ -245,14 +182,64 @@ namespace osu.Game.Overlays.BeatmapSet
}; };
Picker.Beatmap.ValueChanged += b => Details.Beatmap = b; Picker.Beatmap.ValueChanged += b => Details.Beatmap = b;
Picker.Beatmap.ValueChanged += b => externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet?.OnlineBeatmapSetID}#{b?.Ruleset.ShortName}/{b?.OnlineBeatmapID}"; Picker.Beatmap.ValueChanged += b => externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b?.Ruleset.ShortName}/{b?.OnlineBeatmapID}";
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
tabsBg.Colour = colours.Gray3; tabsBg.Colour = colours.Gray3;
updateDisplay();
State.BindValueChanged(_ => updateDownloadButtons());
BeatmapSet.BindValueChanged(beatmapSet =>
{
Picker.BeatmapSet = author.BeatmapSet = Details.BeatmapSet = beatmapSet;
title.Text = beatmapSet?.Metadata.Title ?? string.Empty;
artist.Text = beatmapSet?.Metadata.Artist ?? string.Empty;
onlineStatusPill.Status = beatmapSet?.OnlineInfo.Status ?? BeatmapSetOnlineStatus.None;
cover.BeatmapSet = beatmapSet;
if (beatmapSet != null)
{
downloadButtonsContainer.FadeIn(transition_duration);
favouriteButton.FadeIn(transition_duration);
}
else
{
downloadButtonsContainer.FadeOut(transition_duration);
favouriteButton.FadeOut(transition_duration);
}
updateDownloadButtons();
}, true);
}
private void updateDownloadButtons()
{
if (BeatmapSet.Value == null) return;
switch (State.Value)
{
case DownloadState.LocallyAvailable:
// temporary for UX until new design is implemented.
downloadButtonsContainer.Child = new osu.Game.Overlays.Direct.DownloadButton(BeatmapSet)
{
Width = 50,
RelativeSizeAxes = Axes.Y
};
break;
case DownloadState.Downloading:
case DownloadState.Downloaded:
// temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
downloadButtonsContainer.Child = new DownloadButton(BeatmapSet);
break;
default:
downloadButtonsContainer.Child = new DownloadButton(BeatmapSet);
if (BeatmapSet.Value.OnlineInfo.HasVideo)
downloadButtonsContainer.Add(new DownloadButton(BeatmapSet, true));
break;
}
} }
} }
} }

4
osu.Game/Overlays/BeatmapSetOverlay.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Overlays
if (value == beatmapSet) if (value == beatmapSet)
return; return;
header.BeatmapSet = info.BeatmapSet = beatmapSet = value; header.BeatmapSet.Value = info.BeatmapSet = beatmapSet = value;
} }
} }
@ -140,7 +140,7 @@ namespace osu.Game.Overlays
req.Success += res => req.Success += res =>
{ {
BeatmapSet = res.ToBeatmapSet(rulesets); BeatmapSet = res.ToBeatmapSet(rulesets);
header.Picker.Beatmap.Value = header.BeatmapSet.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId); header.Picker.Beatmap.Value = header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
}; };
api.Queue(req); api.Queue(req);
Show(); Show();

60
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -16,8 +16,6 @@ using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -31,8 +29,6 @@ namespace osu.Game.Overlays.Direct
private Container content; private Container content;
private ProgressBar progressBar;
private BeatmapManager beatmaps;
private BeatmapSetOverlay beatmapSetOverlay; private BeatmapSetOverlay beatmapSetOverlay;
public PreviewTrack Preview => PlayButton.Preview; public PreviewTrack Preview => PlayButton.Preview;
@ -65,14 +61,10 @@ namespace osu.Game.Overlays.Direct
Colour = Color4.Black.Opacity(0.3f), Colour = Color4.Black.Opacity(0.3f),
}; };
private OsuColour colours;
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay) private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay)
{ {
this.beatmaps = beatmaps;
this.beatmapSetOverlay = beatmapSetOverlay; this.beatmapSetOverlay = beatmapSetOverlay;
this.colours = colours;
AddInternal(content = new Container AddInternal(content = new Container
{ {
@ -82,33 +74,14 @@ namespace osu.Game.Overlays.Direct
Children = new[] Children = new[]
{ {
CreateBackground(), CreateBackground(),
progressBar = new ProgressBar new DownloadProgressBar(SetInfo)
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Height = 0,
Alpha = 0,
BackgroundColour = Color4.Black.Opacity(0.7f),
FillColour = colours.Blue,
Depth = -1, Depth = -1,
}, },
} }
}); });
var downloadRequest = beatmaps.GetExistingDownload(SetInfo);
if (downloadRequest != null)
attachDownload(downloadRequest);
beatmaps.BeatmapDownloadBegan += attachDownload;
beatmaps.ItemAdded += setAdded;
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
beatmaps.BeatmapDownloadBegan -= attachDownload;
beatmaps.ItemAdded -= setAdded;
} }
protected override void Update() protected override void Update()
@ -149,37 +122,6 @@ namespace osu.Game.Overlays.Direct
protected void ShowInformation() => beatmapSetOverlay?.ShowBeatmapSet(SetInfo); protected void ShowInformation() => beatmapSetOverlay?.ShowBeatmapSet(SetInfo);
private void attachDownload(DownloadBeatmapSetRequest request)
{
if (request.BeatmapSet.OnlineBeatmapSetID != SetInfo.OnlineBeatmapSetID)
return;
progressBar.FadeIn(400, Easing.OutQuint);
progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
progressBar.Current.Value = 0;
request.Failure += e =>
{
progressBar.Current.Value = 0;
progressBar.FadeOut(500);
};
request.DownloadProgressed += progress => Schedule(() => progressBar.Current.Value = progress);
request.Success += data =>
{
progressBar.Current.Value = 1;
progressBar.FillColour = colours.Yellow;
};
}
private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => Schedule(() =>
{
if (s.OnlineBeatmapSetID == SetInfo.OnlineBeatmapSetID)
progressBar.FadeOut(500);
});
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();

101
osu.Game/Overlays/Direct/DownloadButton.cs
View File

@ -5,103 +5,114 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osuTK; using osuTK;
namespace osu.Game.Overlays.Direct namespace osu.Game.Overlays.Direct
{ {
public class DownloadButton : OsuAnimatedButton public class DownloadButton : DownloadTrackingComposite
{ {
private readonly BeatmapSetInfo beatmapSet; private readonly bool noVideo;
private readonly SpriteIcon icon; private readonly SpriteIcon icon;
private readonly SpriteIcon checkmark; private readonly SpriteIcon checkmark;
private readonly BeatmapSetDownloader downloader;
private readonly Box background; private readonly Box background;
private OsuColour colours; private OsuColour colours;
public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false) private readonly ShakeContainer shakeContainer;
{
this.beatmapSet = beatmapSet;
AddRange(new Drawable[] private readonly OsuAnimatedButton button;
public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
: base(beatmapSet)
{
this.noVideo = noVideo;
InternalChild = shakeContainer = new ShakeContainer
{ {
downloader = new BeatmapSetDownloader(beatmapSet, noVideo), RelativeSizeAxes = Axes.Both,
background = new Box Child = button = new OsuAnimatedButton
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Depth = float.MaxValue Children = new Drawable[]
}, {
icon = new SpriteIcon background = new Box
{ {
Anchor = Anchor.Centre, RelativeSizeAxes = Axes.Both,
Origin = Anchor.Centre, Depth = float.MaxValue
Size = new Vector2(13), },
Icon = FontAwesome.fa_download, icon = new SpriteIcon
}, {
checkmark = new SpriteIcon Anchor = Anchor.Centre,
{ Origin = Anchor.Centre,
Anchor = Anchor.Centre, Size = new Vector2(13),
Origin = Anchor.Centre, Icon = FontAwesome.fa_download,
X = 8, },
Size = Vector2.Zero, checkmark = new SpriteIcon
Icon = FontAwesome.fa_check, {
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
X = 8,
Size = Vector2.Zero,
Icon = FontAwesome.fa_check,
}
}
} }
}); };
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
downloader.DownloadState.BindValueChanged(updateState, true);
State.BindValueChanged(updateState, true);
FinishTransforms(true); FinishTransforms(true);
} }
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuColour colours, OsuGame game) private void load(OsuColour colours, OsuGame game, BeatmapManager beatmaps)
{ {
this.colours = colours; this.colours = colours;
Action = () => button.Action = () =>
{ {
switch (downloader.DownloadState.Value) switch (State.Value)
{ {
case BeatmapSetDownloader.DownloadStatus.Downloading: case DownloadState.Downloading:
// todo: replace with ShakeContainer after https://github.com/ppy/osu/pull/2909 is merged. case DownloadState.Downloaded:
Content.MoveToX(-5, 50, Easing.OutSine).Then() shakeContainer.Shake();
.MoveToX(5, 100, Easing.InOutSine).Then()
.MoveToX(-5, 100, Easing.InOutSine).Then()
.MoveToX(0, 50, Easing.InSine);
break; break;
case BeatmapSetDownloader.DownloadStatus.Downloaded: case DownloadState.LocallyAvailable:
game.PresentBeatmap(beatmapSet); game.PresentBeatmap(BeatmapSet);
break; break;
default: default:
downloader.Download(); beatmaps.Download(BeatmapSet, noVideo);
break; break;
} }
}; };
} }
private void updateState(BeatmapSetDownloader.DownloadStatus state) private void updateState(DownloadState state)
{ {
switch (state) switch (state)
{ {
case BeatmapSetDownloader.DownloadStatus.NotDownloaded: case DownloadState.NotDownloaded:
background.FadeColour(colours.Gray4, 500, Easing.InOutExpo); background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
icon.MoveToX(0, 500, Easing.InOutExpo); icon.MoveToX(0, 500, Easing.InOutExpo);
checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo); checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
break; break;
case BeatmapSetDownloader.DownloadStatus.Downloading: case DownloadState.Downloading:
background.FadeColour(colours.Blue, 500, Easing.InOutExpo); background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
icon.MoveToX(0, 500, Easing.InOutExpo); icon.MoveToX(0, 500, Easing.InOutExpo);
checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo); checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
break; break;
case DownloadState.Downloaded:
case BeatmapSetDownloader.DownloadStatus.Downloaded: background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
break;
case DownloadState.LocallyAvailable:
background.FadeColour(colours.Green, 500, Easing.InOutExpo); background.FadeColour(colours.Green, 500, Easing.InOutExpo);
icon.MoveToX(-8, 500, Easing.InOutExpo); icon.MoveToX(-8, 500, Easing.InOutExpo);
checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo); checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);

64
osu.Game/Overlays/Direct/DownloadProgressBar.cs Normal file
View File

@ -0,0 +1,64 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osuTK.Graphics;
namespace osu.Game.Overlays.Direct
{
public class DownloadProgressBar : DownloadTrackingComposite
{
private readonly ProgressBar progressBar;
public DownloadProgressBar(BeatmapSetInfo beatmapSet)
: base(beatmapSet)
{
AddInternal(progressBar = new ProgressBar
{
Height = 0,
Alpha = 0,
});
AutoSizeAxes = Axes.Y;
RelativeSizeAxes = Axes.X;
}
[BackgroundDependencyLoader(true)]
private void load(OsuColour colours)
{
progressBar.FillColour = colours.Blue;
progressBar.BackgroundColour = Color4.Black.Opacity(0.7f);
progressBar.Current = Progress;
State.BindValueChanged(state =>
{
switch (state)
{
case DownloadState.NotDownloaded:
progressBar.Current.Value = 0;
progressBar.FadeOut(500);
break;
case DownloadState.Downloading:
progressBar.FadeIn(400, Easing.OutQuint);
progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
break;
case DownloadState.Downloaded:
progressBar.FadeIn(400, Easing.OutQuint);
progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
progressBar.Current.Value = 1;
progressBar.FillColour = colours.Yellow;
break;
case DownloadState.LocallyAvailable:
progressBar.FadeOut(500);
break;
}
}, true);
}
}
}

13
osu.Game/Overlays/Direct/DownloadState.cs Normal file
View File

@ -0,0 +1,13 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
namespace osu.Game.Overlays.Direct
{
public enum DownloadState
{
NotDownloaded,
Downloading,
Downloaded,
LocallyAvailable
}
}

130
osu.Game/Overlays/Direct/DownloadTrackingComposite.cs Normal file
View File

@ -0,0 +1,130 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using Microsoft.EntityFrameworkCore.Internal;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Online.API.Requests;
namespace osu.Game.Overlays.Direct
{
/// <summary>
/// A component which tracks a beatmap through potential download/import/deletion.
/// </summary>
public abstract class DownloadTrackingComposite : CompositeDrawable
{
public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
private BeatmapManager beatmaps;
/// <summary>
/// Holds the current download state of the beatmap, whether is has already been downloaded, is in progress, or is not downloaded.
/// </summary>
protected readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
protected readonly Bindable<double> Progress = new Bindable<double>();
protected DownloadTrackingComposite(BeatmapSetInfo beatmapSet = null)
{
BeatmapSet.Value = beatmapSet;
}
[BackgroundDependencyLoader(true)]
private void load(BeatmapManager beatmaps)
{
this.beatmaps = beatmaps;
BeatmapSet.BindValueChanged(set =>
{
if (set == null)
attachDownload(null);
else if (beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID).Any())
State.Value = DownloadState.LocallyAvailable;
else
attachDownload(beatmaps.GetExistingDownload(set));
}, true);
beatmaps.BeatmapDownloadBegan += download =>
{
if (download.BeatmapSet.OnlineBeatmapSetID == BeatmapSet.Value?.OnlineBeatmapSetID)
attachDownload(download);
};
beatmaps.ItemAdded += setAdded;
beatmaps.ItemRemoved += setRemoved;
}
#region Disposal
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
beatmaps.BeatmapDownloadBegan -= attachDownload;
beatmaps.ItemAdded -= setAdded;
State.UnbindAll();
attachDownload(null);
}
#endregion
private DownloadBeatmapSetRequest attachedRequest;
private void attachDownload(DownloadBeatmapSetRequest request)
{
if (attachedRequest != null)
{
attachedRequest.Failure -= onRequestFailure;
attachedRequest.DownloadProgressed -= onRequestProgress;
attachedRequest.Success -= onRequestSuccess;
}
attachedRequest = request;
if (attachedRequest != null)
{
if (attachedRequest.Progress == 1)
{
State.Value = DownloadState.Downloaded;
Progress.Value = 1;
}
else
{
State.Value = DownloadState.Downloading;
Progress.Value = attachedRequest.Progress;
attachedRequest.Failure += onRequestFailure;
attachedRequest.DownloadProgressed += onRequestProgress;
attachedRequest.Success += onRequestSuccess;
}
}
else
{
State.Value = DownloadState.NotDownloaded;
}
}
private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Downloaded);
private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
private void setRemoved(BeatmapSetInfo s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded);
private void setDownloadStateFromManager(BeatmapSetInfo s, DownloadState state) => Schedule(() =>
{
if (s.OnlineBeatmapSetID != BeatmapSet.Value?.OnlineBeatmapSetID)
return;
State.Value = state;
});
}
}

2
osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Overlays.KeyBinding
{ {
public class GlobalKeyBindingsSection : SettingsSection public class GlobalKeyBindingsSection : SettingsSection
{ {
public override FontAwesome Icon => FontAwesome.fa_osu_hot; public override FontAwesome Icon => FontAwesome.fa_globe;
public override string Header => "Global"; public override string Header => "Global";
public GlobalKeyBindingsSection(GlobalActionContainer manager) public GlobalKeyBindingsSection(GlobalActionContainer manager)

2
osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Overlays.KeyBinding
{ {
public class RulesetBindingsSection : SettingsSection public class RulesetBindingsSection : SettingsSection
{ {
public override FontAwesome Icon => FontAwesome.fa_osu_hot; public override FontAwesome Icon => (ruleset.CreateInstance().CreateIcon() as SpriteIcon)?.Icon ?? FontAwesome.fa_osu_hot;
public override string Header => ruleset.Name; public override string Header => ruleset.Name;
private readonly RulesetInfo ruleset; private readonly RulesetInfo ruleset;

83
osu.Game/Overlays/KeyBindingOverlay.cs
View File

@ -3,10 +3,17 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Overlays.KeyBinding; using osu.Game.Overlays.KeyBinding;
using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Screens.Ranking;
using osuTK;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
@ -21,11 +28,85 @@ namespace osu.Game.Overlays
foreach (var ruleset in rulesets.AvailableRulesets) foreach (var ruleset in rulesets.AvailableRulesets)
AddSection(new RulesetBindingsSection(ruleset)); AddSection(new RulesetBindingsSection(ruleset));
AddInternal(new BackButton
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Action = Hide
});
} }
public KeyBindingOverlay() public KeyBindingOverlay()
: base(false) : base(true)
{ {
} }
private class BackButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
{
private AspectContainer aspect;
[BackgroundDependencyLoader]
private void load()
{
Size = new Vector2(Sidebar.DEFAULT_WIDTH);
Children = new Drawable[]
{
aspect = new AspectContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y,
Children = new Drawable[]
{
new SpriteIcon
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Y = -15,
Size = new Vector2(15),
Shadow = true,
Icon = FontAwesome.fa_chevron_left
},
new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Y = 15,
TextSize = 12,
Font = @"Exo2.0-Bold",
Text = @"back",
},
}
}
};
}
protected override bool OnMouseDown(MouseDownEvent e)
{
aspect.ScaleTo(0.75f, 2000, Easing.OutQuint);
return base.OnMouseDown(e);
}
protected override bool OnMouseUp(MouseUpEvent e)
{
aspect.ScaleTo(1, 1000, Easing.OutElastic);
return base.OnMouseUp(e);
}
public bool OnPressed(GlobalAction action)
{
switch (action)
{
case GlobalAction.Back:
Click();
return true;
}
return false;
}
public bool OnReleased(GlobalAction action) => false;
}
} }
} }

97
osu.Game/Overlays/MainSettings.cs
View File

@ -1,28 +1,19 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Input.Bindings;
using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings;
using osu.Game.Overlays.Settings.Sections; using osu.Game.Overlays.Settings.Sections;
using osu.Game.Screens.Ranking;
using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using System.Collections.Generic;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
public class MainSettings : SettingsOverlay public class MainSettings : SettingsOverlay
{ {
private readonly KeyBindingOverlay keyBindingOverlay; private readonly KeyBindingOverlay keyBindingOverlay;
private BackButton backButton;
protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[] protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
{ {
@ -53,8 +44,6 @@ namespace osu.Game.Overlays
public override bool AcceptsFocus => keyBindingOverlay.State != Visibility.Visible; public override bool AcceptsFocus => keyBindingOverlay.State != Visibility.Visible;
private const float hidden_width = 120;
private void keyBindingOverlay_StateChanged(Visibility visibility) private void keyBindingOverlay_StateChanged(Visibility visibility)
{ {
switch (visibility) switch (visibility)
@ -64,9 +53,7 @@ namespace osu.Game.Overlays
Sidebar?.FadeColour(Color4.DarkGray, 300, Easing.OutQuint); Sidebar?.FadeColour(Color4.DarkGray, 300, Easing.OutQuint);
SectionsContainer.FadeOut(300, Easing.OutQuint); SectionsContainer.FadeOut(300, Easing.OutQuint);
ContentContainer.MoveToX(hidden_width - WIDTH, 500, Easing.OutQuint); ContentContainer.MoveToX(-WIDTH, 500, Easing.OutQuint);
backButton.Delay(100).FadeIn(100);
break; break;
case Visibility.Hidden: case Visibility.Hidden:
Background.FadeTo(0.6f, 500, Easing.OutQuint); Background.FadeTo(0.6f, 500, Easing.OutQuint);
@ -74,94 +61,16 @@ namespace osu.Game.Overlays
SectionsContainer.FadeIn(500, Easing.OutQuint); SectionsContainer.FadeIn(500, Easing.OutQuint);
ContentContainer.MoveToX(0, 500, Easing.OutQuint); ContentContainer.MoveToX(0, 500, Easing.OutQuint);
backButton.FadeOut(100);
break; break;
} }
} }
protected override float ExpandedPosition => keyBindingOverlay.State == Visibility.Visible ? hidden_width - WIDTH : base.ExpandedPosition; protected override float ExpandedPosition => keyBindingOverlay.State == Visibility.Visible ? -WIDTH : base.ExpandedPosition;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
ContentContainer.Add(keyBindingOverlay); ContentContainer.Add(keyBindingOverlay);
ContentContainer.Add(backButton = new BackButton
{
Alpha = 0,
Width = hidden_width,
RelativeSizeAxes = Axes.Y,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Action = () => keyBindingOverlay.Hide()
});
}
private class BackButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
{
private AspectContainer aspect;
[BackgroundDependencyLoader]
private void load()
{
Children = new Drawable[]
{
aspect = new AspectContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y,
Children = new Drawable[]
{
new SpriteIcon
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Y = -15,
Size = new Vector2(15),
Shadow = true,
Icon = FontAwesome.fa_chevron_left
},
new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Y = 15,
TextSize = 12,
Font = @"Exo2.0-Bold",
Text = @"back",
},
}
}
};
}
protected override bool OnMouseDown(MouseDownEvent e)
{
aspect.ScaleTo(0.75f, 2000, Easing.OutQuint);
return base.OnMouseDown(e);
}
protected override bool OnMouseUp(MouseUpEvent e)
{
aspect.ScaleTo(1, 1000, Easing.OutElastic);
return base.OnMouseUp(e);
}
public bool OnPressed(GlobalAction action)
{
switch (action)
{
case GlobalAction.Back:
Click();
return true;
}
return false;
}
public bool OnReleased(GlobalAction action) => false;
} }
} }
} }

2
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -169,6 +169,8 @@ namespace osu.Game.Overlays.Music
Alpha = 0f; Alpha = 0f;
Margin = new MarginPadding { Left = 5, Top = 2 }; Margin = new MarginPadding { Left = 5, Top = 2 };
} }
public override bool HandlePositionalInput => IsPresent;
} }
} }

2
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -73,7 +73,7 @@ namespace osu.Game.Overlays.Music
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(BeatmapManager beatmaps, IBindableBeatmap beatmap) private void load(BeatmapManager beatmaps, IBindable<WorkingBeatmap> beatmap)
{ {
beatmaps.GetAllUsableBeatmapSets().ForEach(b => addBeatmapSet(b, false, false)); beatmaps.GetAllUsableBeatmapSets().ForEach(b => addBeatmapSet(b, false, false));
beatmaps.ItemAdded += addBeatmapSet; beatmaps.ItemAdded += addBeatmapSet;

2
osu.Game/Overlays/Music/PlaylistOverlay.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Music
private PlaylistList list; private PlaylistList list;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, BindableBeatmap beatmap, BeatmapManager beatmaps) private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps)
{ {
this.beatmap.BindTo(beatmap); this.beatmap.BindTo(beatmap);
this.beatmaps = beatmaps; this.beatmaps = beatmaps;

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

@ -66,7 +66,7 @@ namespace osu.Game.Overlays
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(BindableBeatmap beatmap, BeatmapManager beatmaps, OsuColour colours) private void load(Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps, OsuColour colours)
{ {
this.beatmap.BindTo(beatmap); this.beatmap.BindTo(beatmap);
this.beatmaps = beatmaps; this.beatmaps = beatmaps;

2
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap, IFrameBasedClock framedClock) private void load(IBindable<WorkingBeatmap> beatmap, IFrameBasedClock framedClock)
{ {
Beatmap.BindTo(beatmap); Beatmap.BindTo(beatmap);

2
osu.Game/Rulesets/Edit/PlacementBlueprint.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Edit
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap, IAdjustableClock clock) private void load(IBindable<WorkingBeatmap> beatmap, IAdjustableClock clock)
{ {
this.beatmap.BindTo(beatmap); this.beatmap.BindTo(beatmap);

2
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Scoring
/// <summary> /// <summary>
/// Create a <see cref="HitWindows"/> for this processor. /// Create a <see cref="HitWindows"/> for this processor.
/// </summary> /// </summary>
protected virtual HitWindows CreateHitWindows() => new HitWindows(); public virtual HitWindows CreateHitWindows() => new HitWindows();
/// <summary> /// <summary>
/// The current rank. /// The current rank.

2
osu.Game/Rulesets/UI/Playfield.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.UI
private WorkingBeatmap beatmap; private WorkingBeatmap beatmap;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap) private void load(IBindable<WorkingBeatmap> beatmap)
{ {
this.beatmap = beatmap.Value; this.beatmap = beatmap.Value;
} }

44
osu.Game/Scoring/Legacy/LegacyScoreParser.cs
View File

@ -57,12 +57,32 @@ namespace osu.Game.Scoring.Legacy
var countKatu = (int)sr.ReadUInt16(); var countKatu = (int)sr.ReadUInt16();
var countMiss = (int)sr.ReadUInt16(); var countMiss = (int)sr.ReadUInt16();
score.ScoreInfo.Statistics[HitResult.Great] = count300; switch (currentRuleset.LegacyID)
score.ScoreInfo.Statistics[HitResult.Good] = count100; {
score.ScoreInfo.Statistics[HitResult.Meh] = count50; case 0:
score.ScoreInfo.Statistics[HitResult.Perfect] = countGeki; score.ScoreInfo.Statistics[HitResult.Great] = count300;
score.ScoreInfo.Statistics[HitResult.Ok] = countKatu; score.ScoreInfo.Statistics[HitResult.Good] = count100;
score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; score.ScoreInfo.Statistics[HitResult.Meh] = count50;
score.ScoreInfo.Statistics[HitResult.Miss] = countMiss;
break;
case 1:
score.ScoreInfo.Statistics[HitResult.Great] = count300;
score.ScoreInfo.Statistics[HitResult.Good] = count100;
score.ScoreInfo.Statistics[HitResult.Miss] = countMiss;
break;
case 2:
score.ScoreInfo.Statistics[HitResult.Perfect] = count300;
score.ScoreInfo.Statistics[HitResult.Miss] = countMiss;
break;
case 3:
score.ScoreInfo.Statistics[HitResult.Perfect] = countGeki;
score.ScoreInfo.Statistics[HitResult.Great] = count300;
score.ScoreInfo.Statistics[HitResult.Good] = countKatu;
score.ScoreInfo.Statistics[HitResult.Ok] = count100;
score.ScoreInfo.Statistics[HitResult.Meh] = count50;
score.ScoreInfo.Statistics[HitResult.Miss] = countMiss;
break;
}
score.ScoreInfo.TotalScore = sr.ReadInt32(); score.ScoreInfo.TotalScore = sr.ReadInt32();
score.ScoreInfo.MaxCombo = sr.ReadUInt16(); score.ScoreInfo.MaxCombo = sr.ReadUInt16();
@ -116,12 +136,12 @@ namespace osu.Game.Scoring.Legacy
protected void CalculateAccuracy(ScoreInfo score) protected void CalculateAccuracy(ScoreInfo score)
{ {
int countMiss = score.Statistics[HitResult.Miss]; score.Statistics.TryGetValue(HitResult.Miss, out int countMiss);
int count50 = score.Statistics[HitResult.Meh]; score.Statistics.TryGetValue(HitResult.Meh, out int count50);
int count100 = score.Statistics[HitResult.Good]; score.Statistics.TryGetValue(HitResult.Good, out int count100);
int count300 = score.Statistics[HitResult.Great]; score.Statistics.TryGetValue(HitResult.Great, out int count300);
int countGeki = score.Statistics[HitResult.Perfect]; score.Statistics.TryGetValue(HitResult.Perfect, out int countGeki);
int countKatu = score.Statistics[HitResult.Ok]; score.Statistics.TryGetValue(HitResult.Ok, out int countKatu);
switch (score.Ruleset.ID) switch (score.Ruleset.ID)
{ {

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

@ -14,6 +14,8 @@ namespace osu.Game.Screens
{ {
Scale = new Vector2(1.06f); Scale = new Vector2(1.06f);
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
} }
//public float ParallaxAmount { set => parallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * value; } //public float ParallaxAmount { set => parallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * value; }

2
osu.Game/Screens/Edit/Components/BottomBarContainer.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Screens.Edit.Components
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap, OsuColour colours) private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
{ {
Beatmap.BindTo(beatmap); Beatmap.BindTo(beatmap);
background.Colour = colours.Gray1; background.Colour = colours.Gray1;

2
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap) private void load(IBindable<WorkingBeatmap> beatmap)
{ {
Beatmap.BindTo(beatmap); Beatmap.BindTo(beatmap);
} }

2
osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private WaveformGraph waveform; private WaveformGraph waveform;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap, IAdjustableClock adjustableClock, OsuColour colours) private void load(IBindable<WorkingBeatmap> beatmap, IAdjustableClock adjustableClock, OsuColour colours)
{ {
this.adjustableClock = adjustableClock; this.adjustableClock = adjustableClock;

3
osu.Game/Screens/Edit/Editor.cs
View File

@ -29,7 +29,8 @@ namespace osu.Game.Screens.Edit
protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4"); protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
public override bool HideOverlaysOnEnter => true; public override bool HideOverlaysOnEnter => true;
public override bool AllowBeatmapRulesetChange => false;
public override bool DisallowExternalBeatmapRulesetChanges => true;
private Box bottomBackground; private Box bottomBackground;
private Container screenContainer; private Container screenContainer;

2
osu.Game/Screens/Edit/EditorScreen.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap) private void load(IBindable<WorkingBeatmap> beatmap)
{ {
Beatmap.BindTo(beatmap); Beatmap.BindTo(beatmap);
} }

13
osu.Game/Screens/IOsuScreen.cs
View File

@ -1,8 +1,11 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Configuration;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Rulesets;
namespace osu.Game.Screens namespace osu.Game.Screens
{ {
@ -12,8 +15,12 @@ namespace osu.Game.Screens
/// Whether the beatmap or ruleset should be allowed to be changed by the user or game. /// Whether the beatmap or ruleset should be allowed to be changed by the user or game.
/// Used to mark exclusive areas where this is strongly prohibited, like gameplay. /// Used to mark exclusive areas where this is strongly prohibited, like gameplay.
/// </summary> /// </summary>
bool AllowBeatmapRulesetChange { get; } bool DisallowExternalBeatmapRulesetChanges { get; }
/// <summary>
/// Whether a top-level component should be allowed to exit the current screen to, for example,
/// complete an import.
/// </summary>
bool AllowExternalScreenChange { get; } bool AllowExternalScreenChange { get; }
/// <summary> /// <summary>
@ -35,5 +42,9 @@ namespace osu.Game.Screens
/// The amount of parallax to be applied while this screen is displayed. /// The amount of parallax to be applied while this screen is displayed.
/// </summary> /// </summary>
float BackgroundParallaxAmount { get; } float BackgroundParallaxAmount { get; }
Bindable<WorkingBeatmap> Beatmap { get; }
Bindable<RulesetInfo> Ruleset { get; }
} }
} }

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

@ -21,6 +21,8 @@ namespace osu.Game.Screens
public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled; public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
public override bool CursorVisible => false;
protected override bool AllowBackButton => false; protected override bool AllowBackButton => false;
public Loader() public Loader()

8
osu.Game/Screens/Menu/Intro.cs
View File

@ -28,8 +28,6 @@ namespace osu.Game.Screens.Menu
/// </summary> /// </summary>
public bool DidLoadMenu; public bool DidLoadMenu;
private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private MainMenu mainMenu; private MainMenu mainMenu;
private SampleChannel welcome; private SampleChannel welcome;
private SampleChannel seeya; private SampleChannel seeya;
@ -47,10 +45,8 @@ namespace osu.Game.Screens.Menu
private WorkingBeatmap introBeatmap; private WorkingBeatmap introBeatmap;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, BindableBeatmap beatmap) private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
{ {
this.beatmap.BindTo(beatmap);
menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice); menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic); menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
@ -95,7 +91,7 @@ namespace osu.Game.Screens.Menu
if (!resuming) if (!resuming)
{ {
beatmap.Value = introBeatmap; Beatmap.Value = introBeatmap;
if (menuVoice) if (menuVoice)
welcome.Play(); welcome.Play();

2
osu.Game/Screens/Menu/LogoVisualisation.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Screens.Menu
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ShaderManager shaders, IBindableBeatmap beatmap) private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap)
{ {
this.beatmap.BindTo(beatmap); this.beatmap.BindTo(beatmap);
shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED); shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);

2
osu.Game/Screens/Menu/MenuSideFlashes.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Screens.Menu
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap, OsuColour colours) private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
{ {
this.beatmap.BindTo(beatmap); this.beatmap.BindTo(beatmap);

25
osu.Game/Screens/Multi/Components/BeatmapTitle.cs
View File

@ -2,11 +2,8 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
@ -14,10 +11,8 @@ using osu.Game.Online.Chat;
namespace osu.Game.Screens.Multi.Components namespace osu.Game.Screens.Multi.Components
{ {
public class BeatmapTitle : CompositeDrawable public class BeatmapTitle : MultiplayerComposite
{ {
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
private readonly LinkFlowContainer textFlow; private readonly LinkFlowContainer textFlow;
public BeatmapTitle() public BeatmapTitle()
@ -27,10 +22,10 @@ namespace osu.Game.Screens.Multi.Components
InternalChild = textFlow = new LinkFlowContainer { AutoSizeAxes = Axes.Both }; InternalChild = textFlow = new LinkFlowContainer { AutoSizeAxes = Axes.Both };
} }
protected override void LoadComplete() [BackgroundDependencyLoader]
private void load()
{ {
base.LoadComplete(); CurrentItem.BindValueChanged(v => updateText(), true);
Beatmap.BindValueChanged(v => updateText(), true);
} }
private float textSize = OsuSpriteText.FONT_SIZE; private float textSize = OsuSpriteText.FONT_SIZE;
@ -53,12 +48,14 @@ namespace osu.Game.Screens.Multi.Components
private void updateText() private void updateText()
{ {
if (!IsLoaded) if (LoadState < LoadState.Loading)
return; return;
textFlow.Clear(); textFlow.Clear();
if (Beatmap.Value == null) var beatmap = CurrentItem.Value?.Beatmap;
if (beatmap == null)
textFlow.AddText("No beatmap selected", s => textFlow.AddText("No beatmap selected", s =>
{ {
s.TextSize = TextSize; s.TextSize = TextSize;
@ -70,7 +67,7 @@ namespace osu.Game.Screens.Multi.Components
{ {
new OsuSpriteText new OsuSpriteText
{ {
Text = new LocalisedString((Beatmap.Value.Metadata.ArtistUnicode, Beatmap.Value.Metadata.Artist)), Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
TextSize = TextSize, TextSize = TextSize,
}, },
new OsuSpriteText new OsuSpriteText
@ -80,10 +77,10 @@ namespace osu.Game.Screens.Multi.Components
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = new LocalisedString((Beatmap.Value.Metadata.TitleUnicode, Beatmap.Value.Metadata.Title)), Text = new LocalisedString((beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title)),
TextSize = TextSize, TextSize = TextSize,
} }
}, null, LinkAction.OpenBeatmap, Beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap"); }, null, LinkAction.OpenBeatmap, beatmap.OnlineBeatmapID.ToString(), "Open beatmap");
} }
} }
} }

37
osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
View File

@ -1,31 +1,26 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Configuration; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets;
using osuTK; using osuTK;
namespace osu.Game.Screens.Multi.Components namespace osu.Game.Screens.Multi.Components
{ {
public class BeatmapTypeInfo : CompositeDrawable public class BeatmapTypeInfo : MultiplayerComposite
{ {
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly IBindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
public readonly IBindable<GameType> Type = new Bindable<GameType>();
public BeatmapTypeInfo() public BeatmapTypeInfo()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
}
BeatmapTitle beatmapTitle; [BackgroundDependencyLoader]
ModeTypeInfo modeTypeInfo; private void load()
{
LinkFlowContainer beatmapAuthor; LinkFlowContainer beatmapAuthor;
InternalChild = new FillFlowContainer InternalChild = new FillFlowContainer
@ -36,7 +31,7 @@ namespace osu.Game.Screens.Multi.Components
Spacing = new Vector2(5, 0), Spacing = new Vector2(5, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
modeTypeInfo = new ModeTypeInfo(), new ModeTypeInfo(),
new Container new Container
{ {
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
@ -44,7 +39,7 @@ namespace osu.Game.Screens.Multi.Components
Margin = new MarginPadding { Left = 5 }, Margin = new MarginPadding { Left = 5 },
Children = new Drawable[] Children = new Drawable[]
{ {
beatmapTitle = new BeatmapTitle(), new BeatmapTitle(),
beatmapAuthor = new LinkFlowContainer(s => s.TextSize = 14) beatmapAuthor = new LinkFlowContainer(s => s.TextSize = 14)
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
@ -56,22 +51,18 @@ namespace osu.Game.Screens.Multi.Components
} }
}; };
modeTypeInfo.Beatmap.BindTo(Beatmap); CurrentItem.BindValueChanged(item =>
modeTypeInfo.Ruleset.BindTo(Ruleset);
modeTypeInfo.Type.BindTo(Type);
beatmapTitle.Beatmap.BindTo(Beatmap);
Beatmap.BindValueChanged(v =>
{ {
beatmapAuthor.Clear(); beatmapAuthor.Clear();
if (v != null) var beatmap = item?.Beatmap;
if (beatmap != null)
{ {
beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f)); beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f));
beatmapAuthor.AddLink(v.Metadata.Author.Username, null, LinkAction.OpenUserProfile, v.Metadata.Author.Id.ToString(), "View Profile"); beatmapAuthor.AddLink(beatmap.Metadata.Author.Username, null, LinkAction.OpenUserProfile, beatmap.Metadata.Author.Id.ToString(), "View Profile");
} }
}); }, true);
} }
} }
} }

28
osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
View File

@ -1,32 +1,30 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Configuration; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets;
using osuTK; using osuTK;
namespace osu.Game.Screens.Multi.Components namespace osu.Game.Screens.Multi.Components
{ {
public class ModeTypeInfo : CompositeDrawable public class ModeTypeInfo : MultiplayerComposite
{ {
private const float height = 30; private const float height = 30;
private const float transition_duration = 100; private const float transition_duration = 100;
private readonly Container rulesetContainer; private Container rulesetContainer;
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly IBindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
public readonly IBindable<GameType> Type = new Bindable<GameType>();
public ModeTypeInfo() public ModeTypeInfo()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
}
[BackgroundDependencyLoader]
private void load()
{
Container gameTypeContainer; Container gameTypeContainer;
InternalChild = new FillFlowContainer InternalChild = new FillFlowContainer
@ -48,17 +46,17 @@ namespace osu.Game.Screens.Multi.Components
}, },
}; };
Beatmap.BindValueChanged(updateBeatmap); CurrentItem.BindValueChanged(updateBeatmap, true);
Ruleset.BindValueChanged(_ => updateBeatmap(Beatmap.Value));
Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }); Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }, true);
} }
private void updateBeatmap(BeatmapInfo beatmap) private void updateBeatmap(PlaylistItem item)
{ {
if (beatmap != null) if (item?.Beatmap != null)
{ {
rulesetContainer.FadeIn(transition_duration); rulesetContainer.FadeIn(transition_duration);
rulesetContainer.Child = new DifficultyIcon(beatmap, Ruleset.Value) { Size = new Vector2(height) }; rulesetContainer.Child = new DifficultyIcon(item.Beatmap, item.Ruleset) { Size = new Vector2(height) };
} }
else else
rulesetContainer.FadeOut(transition_duration); rulesetContainer.FadeOut(transition_duration);

24
osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs Normal file
View File

@ -0,0 +1,24 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Beatmaps.Drawables;
namespace osu.Game.Screens.Multi.Components
{
public class MultiplayerBackgroundSprite : MultiplayerComposite
{
[BackgroundDependencyLoader]
private void load()
{
UpdateableBeatmapBackgroundSprite sprite;
InternalChild = sprite = CreateBackgroundSprite();
CurrentItem.BindValueChanged(i => sprite.Beatmap.Value = i?.Beatmap, true);
}
protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both };
}
}

Some files were not shown because too many files have changed in this diff Show More