h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 12:32:58 +08:00
Code Issues Releases Wiki Activity

Namespace movement.

Browse Source
This commit is contained in:
smoogipooo 2017-06-09 16:20:55 +09:00
parent d11002e499
commit 4b2669e65d
13 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,7 @@ using osu.Framework.Timing;
using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Extensions.IEnumerableExtensions;
using System.Linq; using System.Linq;
using osu.Game.Rulesets.Mania.Timing; using osu.Game.Rulesets.Mania.Timing;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
{ {

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

@ -13,10 +13,8 @@ using osu.Game.Beatmaps.ControlPoints;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Rulesets.Mania.Timing; using osu.Game.Rulesets.Mania.Timing;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {

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

@ -5,7 +5,7 @@ using osu.Framework.Graphics;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables; using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.Timing.Drawables namespace osu.Game.Rulesets.Mania.Timing
{ {
internal class BasicScrollingDrawableTimingSection : DrawableTimingSection internal class BasicScrollingDrawableTimingSection : DrawableTimingSection
{ {

7
osu.Game.Rulesets.Mania/Timing/Drawables/GravityScrollingDrawableTimingSection.cs → osu.Game.Rulesets.Mania/Timing/GravityScrollingDrawableTimingSection.cs
View File

@ -1,12 +1,11 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables; using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.Timing.Drawables namespace osu.Game.Rulesets.Mania.Timing
{ {
internal class GravityScrollingDrawableTimingSection : DrawableTimingSection internal class GravityScrollingDrawableTimingSection : DrawableTimingSection
{ {
@ -52,10 +51,10 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
private double acceleration => 1 / VisibleTimeRange; private double acceleration => 1 / VisibleTimeRange;
/// <summary> /// <summary>
/// Computes the current time relative to <paramref name="time"/>, accounting for <see cref="timeSpan"/>. /// Computes the current time relative to <paramref name="time"/>, accounting for <see cref="DrawableTimingSection.VisibleTimeRange"/>.
/// </summary> /// </summary>
/// <param name="time">The non-offset time.</param> /// <param name="time">The non-offset time.</param>
/// <returns>The current time relative to <paramref name="time"/> - <see cref="timeSpan"/>. </returns> /// <returns>The current time relative to <paramref name="time"/> - <see cref="DrawableTimingSection.VisibleTimeRange"/>. </returns>
private double relativeTimeAt(double time) => Time.Current - time + VisibleTimeRange; private double relativeTimeAt(double time) => Time.Current - time + VisibleTimeRange;
} }
} }

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

@ -5,7 +5,7 @@ using osu.Framework.Graphics;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables; using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.Timing.Drawables namespace osu.Game.Rulesets.Mania.Timing
{ {
public class ManiaSpeedAdjustmentContainer : SpeedAdjustmentContainer public class ManiaSpeedAdjustmentContainer : SpeedAdjustmentContainer
{ {

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

@ -15,7 +15,6 @@ using osu.Game.Rulesets.Objects.Drawables;
using System; using System;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Mania.UI namespace osu.Game.Rulesets.Mania.UI
{ {

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

@ -21,12 +21,10 @@ using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Mania.Scoring; using osu.Game.Rulesets.Mania.Scoring;
using osu.Game.Rulesets.Mania.Timing; using osu.Game.Rulesets.Mania.Timing;
using osu.Game.Rulesets.Mania.Timing.Drawables;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.Timing.Drawables;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
namespace osu.Game.Rulesets.Mania.UI namespace osu.Game.Rulesets.Mania.UI

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

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

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

@ -77,8 +77,8 @@
<Compile Include="Objects\ManiaHitObject.cs" /> <Compile Include="Objects\ManiaHitObject.cs" />
<Compile Include="Objects\Note.cs" /> <Compile Include="Objects\Note.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Timing\Drawables\BasicScrollingDrawableTimingSection.cs" /> <Compile Include="Timing\BasicScrollingDrawableTimingSection.cs" />
<Compile Include="Timing\Drawables\GravityScrollingDrawableTimingSection.cs" /> <Compile Include="Timing\GravityScrollingDrawableTimingSection.cs" />
<Compile Include="Timing\ScrollingAlgorithm.cs" /> <Compile Include="Timing\ScrollingAlgorithm.cs" />
<Compile Include="UI\Column.cs" /> <Compile Include="UI\Column.cs" />
<Compile Include="UI\ManiaHitRenderer.cs" /> <Compile Include="UI\ManiaHitRenderer.cs" />
@ -87,7 +87,7 @@
<Compile Include="Mods\ManiaMod.cs" /> <Compile Include="Mods\ManiaMod.cs" />
<Compile Include="Mods\ManiaModGravity.cs" /> <Compile Include="Mods\ManiaModGravity.cs" />
<Compile Include="UI\SpecialColumnPosition.cs" /> <Compile Include="UI\SpecialColumnPosition.cs" />
<Compile Include="Timing\Drawables\ManiaSpeedAdjustmentContainer.cs" /> <Compile Include="Timing\ManiaSpeedAdjustmentContainer.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj"> <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">

0
osu.Game/Rulesets/Timing/Drawables/DrawableTimingSection.cs → osu.Game/Rulesets/Timing/DrawableTimingSection.cs
View File

1
osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs
View File

@ -8,7 +8,6 @@ using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Timing.Drawables;
namespace osu.Game.Rulesets.Timing namespace osu.Game.Rulesets.Timing
{ {

5
osu.Game/Rulesets/Timing/Drawables/SpeedAdjustmentContainer.cs → osu.Game/Rulesets/Timing/SpeedAdjustmentContainer.cs
View File

@ -3,13 +3,14 @@
using System; using System;
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.Graphics.Containers;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Timing.Drawables;
using OpenTK; using OpenTK;
using osu.Framework.Configuration;
namespace osu.Game.Rulesets.Timing.Drawables namespace osu.Game.Rulesets.Timing
{ {
/// <summary> /// <summary>
/// A container for hit objects which applies applies the speed changes defined by the <see cref="Timing.SpeedAdjustment.BeatLength"/> and <see cref="Timing.SpeedAdjustment.SpeedMultiplier"/> /// A container for hit objects which applies applies the speed changes defined by the <see cref="Timing.SpeedAdjustment.BeatLength"/> and <see cref="Timing.SpeedAdjustment.SpeedMultiplier"/>

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

@ -195,8 +195,8 @@
<Compile Include="Database\RulesetDatabase.cs" /> <Compile Include="Database\RulesetDatabase.cs" />
<Compile Include="Rulesets\Scoring\Score.cs" /> <Compile Include="Rulesets\Scoring\Score.cs" />
<Compile Include="Rulesets\Scoring\ScoreProcessor.cs" /> <Compile Include="Rulesets\Scoring\ScoreProcessor.cs" />
<Compile Include="Rulesets\Timing\Drawables\SpeedAdjustmentContainer.cs" /> <Compile Include="Rulesets\Timing\SpeedAdjustmentContainer.cs" />
<Compile Include="Rulesets\Timing\Drawables\DrawableTimingSection.cs" /> <Compile Include="Rulesets\Timing\DrawableTimingSection.cs" />
<Compile Include="Rulesets\Timing\SpeedAdjustment.cs" /> <Compile Include="Rulesets\Timing\SpeedAdjustment.cs" />
<Compile Include="Rulesets\Timing\SpeedAdjustmentCollection.cs" /> <Compile Include="Rulesets\Timing\SpeedAdjustmentCollection.cs" />
<Compile Include="Screens\Menu\MenuSideFlashes.cs" /> <Compile Include="Screens\Menu\MenuSideFlashes.cs" />