sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Huo Yaoyuan
2016-11-06 00:10:38 +08:00
parent 2d86cb1e81 3c8f94dd0f
commit c470140d64
36 changed files with 452 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ using osu.Framework.Timing;
using osu.Game.Beatmaps.Objects;
using osu.Game.Beatmaps.Objects.Osu;
using osu.Game.Beatmaps.Objects.Osu.Drawable;
using OpenTK;
namespace osu.Desktop.VisualTests.Tests
{
@ -33,12 +34,14 @@ namespace osu.Desktop.VisualTests.Tests
ourClock.ProcessFrame();
for (int i = 0; i < 20; i++)
const int count = 10;
for (int i = 0; i < count; i++)
{
var h = new Circle
{
StartTime = ourClock.CurrentTime + 1000 + i * 80,
Position = new OpenTK.Vector2(i * 14),
Position = new Vector2((i - count / 2) * 14),
};
Add(new DrawableCircle(h)

21
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.GameModes.Testing;
using osu.Framework.MathUtils;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Formats;
using osu.Game.Beatmaps.Objects;
using osu.Game.Beatmaps.Objects.Osu;
using osu.Game.GameModes.Play;
@ -38,21 +39,25 @@ namespace osu.Desktop.VisualTests.Tests
objects.Add(new Circle()
{
StartTime = time,
Position = new Vector2(RNG.Next(100, 400), RNG.Next(100, 200))
Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)),
NewCombo = i % 4 == 0
});
time += 500;
}
var decoder = new ConstructableBeatmapDecoder();
Beatmap b = new Beatmap
{
HitObjects = objects
};
decoder.Process(b);
Add(new Player
{
Beatmap = new WorkingBeatmap
{
Beatmap = new Beatmap
{
HitObjects = objects
}
}
Beatmap = new WorkingBeatmap(b)
});
}