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

Determine SampleInfo defaults in DrawableHitObject

Browse Source
This commit is contained in:
smoogipoo
2017-12-21 16:02:33 +09:00
parent 58859f2ffb
commit cb7e192aff
9 changed files with 73 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -10,6 +10,7 @@ using System.Linq;
using osu.Game.Audio;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Framework.Extensions.IEnumerableExtensions;
namespace osu.Game.Rulesets.Osu.Objects
{
@ -74,10 +75,16 @@ namespace osu.Game.Rulesets.Osu.Objects
public double Velocity;
public double TickDistance;
private ControlPointInfo controlPointInfo;
private BeatmapDifficulty difficulty;
public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(controlPointInfo, difficulty);
this.controlPointInfo = controlPointInfo;
this.difficulty = difficulty;
TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(StartTime);
@ -124,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Objects
var distanceProgress = d / length;
var timeProgress = reversed ? 1 - distanceProgress : distanceProgress;
yield return new SliderTick
var ret = new SliderTick
{
RepeatIndex = repeat,
StartTime = repeatStartTime + timeProgress * repeatDuration,
@ -139,6 +146,10 @@ namespace osu.Game.Rulesets.Osu.Objects
Volume = s.Volume
}))
};
ret.ApplyDefaults(controlPointInfo, difficulty);
yield return ret;
}
}
}
@ -158,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Objects
var repeatStartTime = StartTime + repeat * repeatDuration;
var distanceProgress = d / length;
yield return new RepeatPoint
var ret = new RepeatPoint
{
RepeatIndex = repeat,
StartTime = repeatStartTime,
@ -167,6 +178,10 @@ namespace osu.Game.Rulesets.Osu.Objects
Scale = Scale,
ComboColour = ComboColour,
};
ret.ApplyDefaults(controlPointInfo, difficulty);
yield return ret;
}
}
}