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

Move timing change stuff to osu.Game project.

Browse Source
This commit is contained in:
smoogipooo 2017-06-02 20:17:44 +09:00
parent e5720b9477
commit 7022c8d496
15 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
View File

@ -9,13 +9,14 @@ using System;
using OpenTK;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Timing;
using osu.Framework.Configuration;
using OpenTK.Input;
using osu.Framework.Timing;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using System.Linq;
using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Desktop.VisualTests.Tests
{

3
osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
View File

@ -6,7 +6,6 @@ using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.Mania.Timing;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Objects.Types;
using System.Linq;
@ -15,6 +14,8 @@ using osu.Game.Beatmaps.ControlPoints;
using osu.Framework.MathUtils;
using osu.Game.Graphics;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.Mods
{

2
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableGravityTimingChange.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Timing;
namespace osu.Game.Rulesets.Mania.Timing.Drawables
{
public class DrawableGravityTimingChange : DrawableManiaTimingChange

2
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableManiaTimingChange.cs
View File

@ -2,6 +2,8 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.Timing.Drawables
{

2
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableScrollingTimingChange.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Timing;
namespace osu.Game.Rulesets.Mania.Timing.Drawables
{
public class DrawableScrollingTimingChange : DrawableManiaTimingChange

13
osu.Game.Rulesets.Mania/Timing/IHasTimeSpan.cs
View File

@ -1,13 +0,0 @@
using OpenTK;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Rulesets.Mania.Timing
{
public interface IHasTimeSpan : IContainer
{
/// <summary>
/// The amount of time which this container spans. Drawables can be relatively positioned to this value.
/// </summary>
Vector2 TimeSpan { get; }
}
}

4
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -11,11 +11,11 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Colour;
using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mania.Timing;
using osu.Game.Rulesets.Objects.Drawables;
using System;
using osu.Framework.Configuration;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.UI
{

3
osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
View File

@ -20,11 +20,12 @@ using osu.Game.Rulesets.Mania.Judgements;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Mania.Scoring;
using osu.Game.Rulesets.Mania.Timing;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
using osu.Game.Rulesets.UI;
namespace osu.Game.Rulesets.Mania.UI

4
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -17,12 +17,12 @@ using System.Linq;
using System.Collections.Generic;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Mania.Timing;
using osu.Framework.Input;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.UI
{

4
osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
View File

@ -87,10 +87,6 @@
<Compile Include="Timing\Drawables\DrawableGravityTimingChange.cs" />
<Compile Include="Timing\Drawables\DrawableManiaTimingChange.cs" />
<Compile Include="Timing\Drawables\DrawableScrollingTimingChange.cs" />
<Compile Include="Timing\Drawables\DrawableTimingChange.cs" />
<Compile Include="Timing\IHasTimeSpan.cs" />
<Compile Include="Timing\TimingChange.cs" />
<Compile Include="Timing\TimingChangeContainer.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">

2
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableTimingChange.cs → osu.Game/Rulesets/Timing/Drawables/DrawableTimingChange.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;
namespace osu.Game.Rulesets.Mania.Timing.Drawables
namespace osu.Game.Rulesets.Timing.Drawables
{
/// <summary>
/// Represents a container in which contains hit objects and moves relative to the current time.

19
osu.Game/Rulesets/Timing/IHasTimeSpan.cs Normal file
View File

@ -0,0 +1,19 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics.Containers;
using OpenTK;
namespace osu.Game.Rulesets.Timing
{
/// <summary>
/// A type of container which spans a length of time.
/// </summary>
public interface IHasTimeSpan : IContainer
{
/// <summary>
/// The amount of time which this container spans.
/// </summary>
Vector2 TimeSpan { get; }
}
}

2
osu.Game.Rulesets.Mania/Timing/TimingChange.cs → osu.Game/Rulesets/Timing/TimingChange.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Rulesets.Mania.Timing
namespace osu.Game.Rulesets.Timing
{
public class TimingChange
{

4
osu.Game.Rulesets.Mania/Timing/TimingChangeContainer.cs → osu.Game/Rulesets/Timing/TimingChangeContainer.cs
View File

@ -7,10 +7,10 @@ using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Timing.Drawables;
using OpenTK;
namespace osu.Game.Rulesets.Mania.Timing
namespace osu.Game.Rulesets.Timing
{
public class TimingChangeContainer : Container<DrawableTimingChange>, IHasTimeSpan
{

4
osu.Game/osu.Game.csproj
View File

@ -190,6 +190,10 @@
<Compile Include="Database\RulesetDatabase.cs" />
<Compile Include="Rulesets\Scoring\Score.cs" />
<Compile Include="Rulesets\Scoring\ScoreProcessor.cs" />
<Compile Include="Rulesets\Timing\Drawables\DrawableTimingChange.cs" />
<Compile Include="Rulesets\Timing\IHasTimeSpan.cs" />
<Compile Include="Rulesets\Timing\TimingChange.cs" />
<Compile Include="Rulesets\Timing\TimingChangeContainer.cs" />
<Compile Include="Screens\Menu\MenuSideFlashes.cs" />
<Compile Include="Screens\Play\HUD\HealthDisplay.cs" />
<Compile Include="Screens\Play\HUDOverlay.cs" />