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

Move a few classes/enums into separate files.

Browse Source
This commit is contained in:
smoogipooo 2017-03-15 16:07:40 +09:00
parent 1317198628
commit bf66b84ff8
11 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.ComponentModel;
using osu.Game.Modes.Judgements;
using osu.Game.Modes.Objects.Drawables;
namespace osu.Game.Modes.Osu.Objects.Drawables

1
osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transforms;
using osu.Game.Beatmaps.Samples;
using osu.Game.Modes.Judgements;
using osu.Game.Modes.Objects.Drawables;
using OpenTK;
using OpenTK.Graphics;

1
osu.Game.Modes.Osu/OsuScoreProcessor.cs
View File

@ -1,6 +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
using osu.Game.Modes.Judgements;
using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Osu.Objects.Drawables;

1
osu.Game.Modes.Osu/UI/OsuPlayfield.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Modes.Osu.Objects.Drawables.Connections;
using osu.Game.Modes.UI;
using System.Linq;
using osu.Game.Graphics.Cursor;
using osu.Game.Modes.Judgements;
using OpenTK.Graphics;
namespace osu.Game.Modes.Osu.UI

11
osu.Game/Modes/Judgements/JudgementInfo.cs Normal file
View File

@ -0,0 +1,11 @@
using osu.Game.Modes.Objects.Drawables;
namespace osu.Game.Modes.Judgements
{
public class JudgementInfo
{
public ulong? ComboAtHit;
public HitResult? Result;
public double TimeOffset;
}
}

9
osu.Game/Modes/Objects/Drawables/ArmedState.cs Normal file
View File

@ -0,0 +1,9 @@
namespace osu.Game.Modes.Objects.Drawables
{
public enum ArmedState
{
Idle,
Hit,
Miss
}
}

28
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -3,12 +3,12 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Game.Beatmaps.Samples;
using osu.Game.Modes.Judgements;
using OpenTK;
using Container = osu.Framework.Graphics.Containers.Container;
@ -16,10 +16,6 @@ namespace osu.Game.Modes.Objects.Drawables
{
public abstract class DrawableHitObject : Container, IStateful<ArmedState>
{
public override bool HandleInput => Interactive;
public bool Interactive = true;
public JudgementInfo Judgement;
protected abstract JudgementInfo CreateJudgementInfo();
@ -152,30 +148,8 @@ namespace osu.Game.Modes.Objects.Drawables
}
}
public enum ArmedState
{
Idle,
Hit,
Miss
}
public class PositionalJudgementInfo : JudgementInfo
{
public Vector2 PositionOffset;
}
public class JudgementInfo
{
public ulong? ComboAtHit;
public HitResult? Result;
public double TimeOffset;
}
public enum HitResult
{
[Description(@"Miss")]
Miss,
[Description(@"Hit")]
Hit,
}
}

12
osu.Game/Modes/Objects/Drawables/HitResult.cs Normal file
View File

@ -0,0 +1,12 @@
using System.ComponentModel;
namespace osu.Game.Modes.Objects.Drawables
{
public enum HitResult
{
[Description(@"Miss")]
Miss,
[Description(@"Hit")]
Hit,
}
}

1
osu.Game/Modes/ScoreProcesssor.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Configuration;
using osu.Game.Modes.Objects.Drawables;
using System;
using System.Collections.Generic;
using osu.Game.Modes.Judgements;
namespace osu.Game.Modes
{

1
osu.Game/Modes/UI/HitRenderer.cs
View File

@ -12,6 +12,7 @@ using osu.Game.Screens.Play;
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Game.Modes.Judgements;
namespace osu.Game.Modes.UI
{

3
osu.Game/osu.Game.csproj
View File

@ -93,7 +93,10 @@
<Compile Include="Modes\LegacyReplay.cs" />
<Compile Include="Modes\Mods\IApplicableMod.cs" />
<Compile Include="Modes\Mods\ModType.cs" />
<Compile Include="Modes\Objects\Drawables\ArmedState.cs" />
<Compile Include="Modes\Objects\Drawables\HitResult.cs" />
<Compile Include="Modes\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
<Compile Include="Modes\Judgements\JudgementInfo.cs" />
<Compile Include="Modes\Objects\HitObjectParser.cs" />
<Compile Include="Modes\Objects\NullHitObjectParser.cs" />
<Compile Include="Modes\Replay.cs" />