sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +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

7
osu.Game/Modes/Objects/HitObject.cs
View File

@ -2,6 +2,8 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps.Samples;
using osu.Game.Beatmaps.Timing;
using osu.Game.Database;
namespace osu.Game.Modes.Objects
{
@ -26,7 +28,8 @@ namespace osu.Game.Modes.Objects
/// <summary>
/// Applies default values to this HitObject.
/// </summary>
/// <param name="defaults">The default values to apply.</param>
public virtual void ApplyDefaults(HitObjectDefaults defaults) { }
/// <param name="difficulty">The difficulty settings to use.</param>
/// <param name="timing">The timing settings to use.</param>
public virtual void ApplyDefaults(TimingInfo timing, BaseDifficulty difficulty) { }
}
}

25
osu.Game/Modes/Objects/HitObjectDefaults.cs
View File

@ -1,25 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Timing;
using osu.Game.Database;
namespace osu.Game.Modes.Objects
{
/// <summary>
/// A set of default Beatmap values for HitObjects to consume.
/// </summary>
public class HitObjectDefaults
{
/// <summary>
/// The Beatmap timing.
/// </summary>
public TimingInfo Timing;
/// <summary>
/// The Beatmap difficulty.
/// </summary>
public BaseDifficulty Difficulty;
}
}

9
osu.Game/Modes/UI/HitRenderer.cs
View File

@ -9,7 +9,6 @@ using osu.Game.Modes.Judgements;
using osu.Game.Modes.Mods;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Objects.Types;
using osu.Game.Screens.Play;
using System;
using System.Collections.Generic;
@ -96,14 +95,8 @@ namespace osu.Game.Modes.UI
Beatmap = converter.Convert(beatmap.Beatmap);
// Apply defaults
HitObjectDefaults defaults = new HitObjectDefaults
{
Timing = Beatmap.TimingInfo,
Difficulty = Beatmap.BeatmapInfo.BaseDifficulty
};
foreach (var h in Beatmap.HitObjects)
h.ApplyDefaults(defaults);
h.ApplyDefaults(Beatmap.TimingInfo, Beatmap.BeatmapInfo.BaseDifficulty);
// Post-process the beatmap
processor.PostProcess(Beatmap);