sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.

Browse Source
This commit is contained in:
smoogipooo
2017-03-13 19:15:25 +09:00
parent c76a495d3d
commit f50e0bbf3c
58 changed files with 470 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics.Transforms;
using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
using OpenTK;
using osu.Game.Modes.Objects.Types;
namespace osu.Game.Modes.Osu.Objects.Drawables
{
@ -35,11 +36,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
{
glow = new GlowPiece
{
Colour = osuObject.Colour
Colour = osuObject.ComboColour
},
circle = new CirclePiece
{
Colour = osuObject.Colour,
Colour = osuObject.ComboColour,
Hit = () =>
{
if (Judgement.Result.HasValue) return false;
@ -57,11 +58,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
flash = new FlashPiece(),
explode = new ExplodePiece
{
Colour = osuObject.Colour,
Colour = osuObject.ComboColour,
},
ApproachCircle = new ApproachCircle
{
Colour = osuObject.Colour,
Colour = osuObject.ComboColour,
}
};
@ -118,13 +119,16 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
ApproachCircle.FadeOut();
glow.Delay(osuObject.Duration);
double endTime = (osuObject as IHasEndTime)?.EndTime ?? osuObject.StartTime;
double duration = endTime - osuObject.StartTime;
glow.Delay(duration);
glow.FadeOut(400);
switch (state)
{
case ArmedState.Idle:
Delay(osuObject.Duration + TIME_PREEMPT);
Delay(duration + TIME_PREEMPT);
FadeOut(TIME_FADEOUT);
break;
case ArmedState.Miss: