h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 02:32:59 +08:00
Code Issues Releases Wiki Activity

Use the old naming style for now.

Browse Source
This commit is contained in:
Dean Herbert 2016-09-26 15:07:29 +09:00
parent ae100e3137
commit f0284ce57c
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ namespace osu.Desktop.Tests
///create a new clock offset to 0.
localClock = new FramedOffsetClock(base.Clock) { Offset = -base.Clock.CurrentTime };
List<BaseHit> objects = new List<BaseHit>();
List<HitObject> objects = new List<HitObject>();
int time = 500;
for (int i = 0; i < 100; i++)

2
osu.Game/Beatmaps/Beatmap.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Beatmaps
{
public class Beatmap
{
public List<BaseHit> HitObjects;
public List<HitObject> HitObjects;
public List<ControlPoint> ControlPoints;

2
osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs
View File

@ -3,7 +3,7 @@
namespace osu.Game.Beatmaps.Objects.Catch
{
public abstract class CatchBaseHit : BaseHit
public abstract class CatchBaseHit : HitObject
{
public float Position;
}

2
osu.Game/Beatmaps/Objects/BaseHit.cs → osu.Game/Beatmaps/Objects/HitObject.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Beatmaps.Objects
/// <summary>
/// A hitobject describes a point in a beatmap
/// </summary>
public abstract class BaseHit
public abstract class HitObject
{
public double StartTime;
public double? EndTime;

2
osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs
View File

@ -3,7 +3,7 @@
namespace osu.Game.Beatmaps.Objects.Mania
{
public abstract class ManiaBaseHit : BaseHit
public abstract class ManiaBaseHit : HitObject
{
public int Column;
}

2
osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
View File

@ -5,7 +5,7 @@ using OpenTK;
namespace osu.Game.Beatmaps.Objects.Osu
{
public abstract class OsuBaseHit : BaseHit
public abstract class OsuBaseHit : HitObject
{
public Vector2 Position;
}

2
osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs
View File

@ -3,7 +3,7 @@
namespace osu.Game.Beatmaps.Objects.Taiko
{
class TaikoBaseHit : BaseHit
class TaikoBaseHit : HitObject
{
public float Scale = 1;

6
osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs
View File

@ -18,11 +18,11 @@ namespace osu.Game.GameModes.Play.Catch
List<CatchBaseHit> objects;
private CatchPlayfield playfield;
public override List<BaseHit> Objects
public override List<HitObject> Objects
{
get
{
return objects.ConvertAll(o => (BaseHit)o);
return objects.ConvertAll(o => (HitObject)o);
}
set
@ -35,7 +35,7 @@ namespace osu.Game.GameModes.Play.Catch
}
}
private CatchBaseHit convertForCatch(BaseHit input)
private CatchBaseHit convertForCatch(HitObject input)
{
CatchBaseHit h = input as CatchBaseHit;

2
osu.Game/GameModes/Play/HitRenderer.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.GameModes.Play
{
public abstract class HitRenderer : LargeContainer
{
public abstract List<BaseHit> Objects { get; set; }
public abstract List<HitObject> Objects { get; set; }
public override void Load()
{

6
osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs
View File

@ -24,11 +24,11 @@ namespace osu.Game.GameModes.Play.Mania
this.columns = columns;
}
public override List<BaseHit> Objects
public override List<HitObject> Objects
{
get
{
return objects.ConvertAll(o => (BaseHit)o);
return objects.ConvertAll(o => (HitObject)o);
}
set
@ -41,7 +41,7 @@ namespace osu.Game.GameModes.Play.Mania
}
}
private ManiaBaseHit convertForMania(BaseHit input)
private ManiaBaseHit convertForMania(HitObject input)
{
ManiaBaseHit h = input as ManiaBaseHit;

4
osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs
View File

@ -16,11 +16,11 @@ namespace osu.Game.GameModes.Play.Osu
List<OsuBaseHit> objects;
private OsuPlayfield playfield;
public override List<BaseHit> Objects
public override List<HitObject> Objects
{
get
{
return objects.ConvertAll(o => (BaseHit)o);
return objects.ConvertAll(o => (HitObject)o);
}
set

6
osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs
View File

@ -18,11 +18,11 @@ namespace osu.Game.GameModes.Play.Taiko
List<TaikoBaseHit> objects;
private TaikoPlayfield playfield;
public override List<BaseHit> Objects
public override List<HitObject> Objects
{
get
{
return objects.ConvertAll(o => (BaseHit)o);
return objects.ConvertAll(o => (HitObject)o);
}
set
@ -35,7 +35,7 @@ namespace osu.Game.GameModes.Play.Taiko
}
}
private TaikoBaseHit convertForTaiko(BaseHit input)
private TaikoBaseHit convertForTaiko(HitObject input)
{
TaikoBaseHit h = input as TaikoBaseHit;

2
osu.Game/osu.Game.csproj
View File

@ -48,7 +48,7 @@
<Compile Include="Beatmaps\Beatmap.cs" />
<Compile Include="Beatmaps\BeatmapSet.cs" />
<Compile Include="Beatmaps\Metadata.cs" />
<Compile Include="Beatmaps\Objects\BaseHit.cs" />
<Compile Include="Beatmaps\Objects\HitObject.cs" />
<Compile Include="Beatmaps\Objects\Catch\CatchBaseHit.cs" />
<Compile Include="Beatmaps\Objects\Catch\Droplet.cs" />
<Compile Include="Beatmaps\Objects\Catch\Fruit.cs" />