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

Pass through method instead of instantiating object.

Browse Source
This commit is contained in:
smoogipooo
2017-03-16 17:24:41 +09:00
parent 0c47638820
commit 9f6f581b64
6 changed files with 17 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Modes.Osu/Objects/Slider.cs
View File

@ -8,6 +8,7 @@ using osu.Game.Modes.Objects.Types;
using System;
using System.Collections.Generic;
using osu.Game.Modes.Objects;
using osu.Game.Database;
namespace osu.Game.Modes.Osu.Objects
{
@ -46,17 +47,17 @@ namespace osu.Game.Modes.Osu.Objects
public double Velocity;
public double TickDistance;
public override void ApplyDefaults(HitObjectDefaults defaults)
public override void ApplyDefaults(TimingInfo timing, BaseDifficulty difficulty)
{
base.ApplyDefaults(defaults);
base.ApplyDefaults(timing, difficulty);
ControlPoint overridePoint;
ControlPoint timingPoint = defaults.Timing.TimingPointAt(StartTime, out overridePoint);
ControlPoint timingPoint = timing.TimingPointAt(StartTime, out overridePoint);
var velocityAdjustment = overridePoint?.VelocityAdjustment ?? 1;
var baseVelocity = 100 * defaults.Difficulty.SliderMultiplier / velocityAdjustment;
var baseVelocity = 100 * difficulty.SliderMultiplier / velocityAdjustment;
Velocity = baseVelocity / timingPoint.BeatLength;
TickDistance = baseVelocity / defaults.Difficulty.SliderTickRate;
TickDistance = baseVelocity / difficulty.SliderTickRate;
}
public IEnumerable<SliderTick> Ticks