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

Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state.

Browse Source
This commit is contained in:
smoogipooo 2017-05-29 12:10:29 +09:00
parent 0fd053707d
commit 6101fe98e1
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -428,6 +428,9 @@ namespace osu.Game.Beatmaps.Formats
break; break;
} }
} }
foreach (var hitObject in beatmap.HitObjects)
hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.BeatmapInfo.Difficulty);
} }
internal enum LegacySampleBank internal enum LegacySampleBank

34
osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
View File

@ -6,20 +6,36 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenTK; using OpenTK;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Database;
namespace osu.Game.Rulesets.Objects.Legacy namespace osu.Game.Rulesets.Objects.Legacy
{ {
internal abstract class ConvertSlider : HitObject, IHasCurve internal abstract class ConvertSlider : HitObject, IHasCurve
{ {
/// <summary>
/// Scoring distance with a speed-adjusted beat length of 1 second.
/// </summary>
private const float base_scoring_distance = 100;
public readonly SliderCurve Curve = new SliderCurve();
public List<Vector2> ControlPoints { get; set; } public List<Vector2> ControlPoints { get; set; }
public CurveType CurveType { get; set; } public CurveType CurveType { get; set; }
public double Distance { get; set; }
public double Distance
{
get { return Curve.Distance; }
set { Curve.Distance = value; }
}
public List<SampleInfoList> RepeatSamples { get; set; } public List<SampleInfoList> RepeatSamples { get; set; }
public int RepeatCount { get; set; } = 1; public int RepeatCount { get; set; } = 1;
public double EndTime { get; set; } public double EndTime => StartTime + RepeatCount * Curve.Distance / Velocity;
public double Duration { get; set; } public double Duration => EndTime - StartTime;
public double Velocity;
public Vector2 PositionAt(double progress) public Vector2 PositionAt(double progress)
{ {
@ -35,5 +51,17 @@ namespace osu.Game.Rulesets.Objects.Legacy
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(controlPointInfo, difficulty);
TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(StartTime);
double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier / difficultyPoint.SpeedMultiplier;
Velocity = scoringDistance / timingPoint.BeatLength;
}
} }
} }