mirror of
https://github.com/osukey/osukey.git
synced 2025-07-01 16:29:58 +09:00
Move classes to separate files
This commit is contained in:
18
osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs
Normal file
18
osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using osu.Game.Rulesets.Catch.Skinning.Default;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents a <see cref="Banana"/> caught by the catcher.
|
||||||
|
/// </summary>
|
||||||
|
public class CaughtBanana : CaughtObject
|
||||||
|
{
|
||||||
|
public CaughtBanana()
|
||||||
|
: base(CatchSkinComponents.Banana, _ => new BananaPiece())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
20
osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs
Normal file
20
osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using osu.Game.Rulesets.Catch.Skinning.Default;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents a <see cref="Droplet"/> caught by the catcher.
|
||||||
|
/// </summary>
|
||||||
|
public class CaughtDroplet : CaughtObject
|
||||||
|
{
|
||||||
|
public override bool StaysOnPlate => false;
|
||||||
|
|
||||||
|
public CaughtDroplet()
|
||||||
|
: base(CatchSkinComponents.Droplet, _ => new DropletPiece())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
29
osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs
Normal file
29
osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Game.Rulesets.Catch.Skinning.Default;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents a <see cref="Fruit"/> caught by the catcher.
|
||||||
|
/// </summary>
|
||||||
|
public class CaughtFruit : CaughtObject, IHasFruitState
|
||||||
|
{
|
||||||
|
public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
|
||||||
|
|
||||||
|
public CaughtFruit()
|
||||||
|
: base(CatchSkinComponents.Fruit, _ => new FruitPiece())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void CopyStateFrom(IHasCatchObjectState objectState)
|
||||||
|
{
|
||||||
|
base.CopyStateFrom(objectState);
|
||||||
|
|
||||||
|
var fruitState = (IHasFruitState)objectState;
|
||||||
|
VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -5,7 +5,6 @@ using System;
|
|||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Rulesets.Catch.Skinning.Default;
|
|
||||||
using osu.Game.Skinning;
|
using osu.Game.Skinning;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
@ -61,40 +60,4 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
|||||||
base.FreeAfterUse();
|
base.FreeAfterUse();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class CaughtFruit : CaughtObject, IHasFruitState
|
|
||||||
{
|
|
||||||
public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
|
|
||||||
|
|
||||||
public CaughtFruit()
|
|
||||||
: base(CatchSkinComponents.Fruit, _ => new FruitPiece())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void CopyStateFrom(IHasCatchObjectState objectState)
|
|
||||||
{
|
|
||||||
base.CopyStateFrom(objectState);
|
|
||||||
|
|
||||||
var fruitState = (IHasFruitState)objectState;
|
|
||||||
VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class CaughtBanana : CaughtObject
|
|
||||||
{
|
|
||||||
public CaughtBanana()
|
|
||||||
: base(CatchSkinComponents.Banana, _ => new BananaPiece())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class CaughtDroplet : CaughtObject
|
|
||||||
{
|
|
||||||
public override bool StaysOnPlate => false;
|
|
||||||
|
|
||||||
public CaughtDroplet()
|
|
||||||
: base(CatchSkinComponents.Droplet, _ => new DropletPiece())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -19,12 +19,4 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
|||||||
float Rotation { get; }
|
float Rotation { get; }
|
||||||
Vector2 Scale { get; }
|
Vector2 Scale { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Provides a visual state of a <see cref="Fruit"/>.
|
|
||||||
/// </summary>
|
|
||||||
public interface IHasFruitState : IHasCatchObjectState
|
|
||||||
{
|
|
||||||
Bindable<FruitVisualRepresentation> VisualRepresentation { get; }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
15
osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs
Normal file
15
osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using osu.Framework.Bindables;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Provides a visual state of a <see cref="Fruit"/>.
|
||||||
|
/// </summary>
|
||||||
|
public interface IHasFruitState : IHasCatchObjectState
|
||||||
|
{
|
||||||
|
Bindable<FruitVisualRepresentation> VisualRepresentation { get; }
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user