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

Standardise some naming and make hitcircles feel better.

Browse Source
This commit is contained in:
Dean Herbert
2016-11-19 19:07:57 +09:00
parent d359057db6
commit 3ac89216bd
18 changed files with 112 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Modes/HitJudgementResolver.cs
View File

@ -8,6 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using osu.Game.Modes.Objects;
using OpenTK;
namespace osu.Game.Modes
{
@ -20,6 +21,8 @@ namespace osu.Game.Modes
{
public ComboJudgement Combo;
public Judgement Judgement;
public float TimeOffset;
public Vector2 PositionOffset;
}
public enum ComboJudgement

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

@ -15,6 +15,10 @@ namespace osu.Game.Modes.Objects.Drawables
public Func<DrawableHitObject, bool> AllowHit;
public Container<DrawableHitObject> ChildObjects;
public JudgementResult Result;
public HitObject HitObject;
public DrawableHitObject(HitObject hitObject)

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

@ -19,7 +19,7 @@ namespace osu.Game.Modes.UI
protected Playfield Playfield;
public IEnumerable<DrawableHitObject> DrawableObjects => Playfield.Children.Cast<DrawableHitObject>();
public IEnumerable<DrawableHitObject> DrawableObjects => Playfield.HitObjects.Children;
}
public abstract class HitRenderer<T> : HitRenderer

21
osu.Game/Modes/UI/Playfield.cs
View File

@ -1,11 +1,30 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Modes.Objects.Drawables;
using OpenTK;
namespace osu.Game.Modes.UI
{
public class Playfield : Container
public abstract class Playfield : Container
{
public HitObjectContainer HitObjects;
public virtual void Add(DrawableHitObject h) => HitObjects.Add(h);
public Playfield()
{
AddInternal(HitObjects = new HitObjectContainer
{
RelativeSizeAxes = Axes.Both,
});
}
public class HitObjectContainer : Container<DrawableHitObject>
{
protected override Vector2 DrawScale => new Vector2(DrawSize.X / 512);
}
}
}