h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-11 23:13:06 +08:00
Code Issues Releases Wiki Activity

Merge branch 'nodal-hit-sounds' into fix-drumroll-conversion

Browse Source
This commit is contained in:
smoogipooo 2017-04-21 20:06:01 +09:00
commit cf0fdbcfb3
9 changed files with 23 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,6 @@ namespace osu.Game.Rulesets.Osu.Objects
public int RepeatAt(double progress) => CurveObject.RepeatAt(progress);
public List<List<SampleInfo>> RepeatSamples => CurveObject.RepeatSamples;
public List<SampleInfo> HeadSamples => CurveObject.HeadSamples;
public List<SampleInfo> TailSamples => CurveObject.TailSamples;
public List<Vector2> ControlPoints => CurveObject.ControlPoints;
public CurveType CurveType => CurveObject.CurveType;

4
osu.Game/Rulesets/Objects/CurvedHitObject.cs
View File

@ -5,7 +5,6 @@ using OpenTK;
using osu.Game.Rulesets.Objects.Types;
using System.Collections.Generic;
using osu.Game.Audio;
using System;
namespace osu.Game.Rulesets.Objects
{
@ -38,9 +37,6 @@ namespace osu.Game.Rulesets.Objects
public List<List<SampleInfo>> RepeatSamples { get; set; } = new List<List<SampleInfo>>();
public List<SampleInfo> HeadSamples { get; set; } = new List<SampleInfo>();
public List<SampleInfo> TailSamples { get; set; } = new List<SampleInfo>();
public Vector2 PositionAt(double progress) => Curve.PositionAt(ProgressAt(progress));
public double ProgressAt(double progress)

5
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -49,11 +49,6 @@ namespace osu.Game.Rulesets.Objects
// Initialize any repeat samples
var repeatData = this as IHasRepeats;
repeatData?.RepeatSamples?.ForEach(r => r.ForEach(s => initializeSampleInfo(s, samplePoint)));
// Initialize any curved object samples
var curvedObject = this as CurvedHitObject;
curvedObject?.HeadSamples.ForEach(s => initializeSampleInfo(s, samplePoint));
curvedObject?.TailSamples.ForEach(s => initializeSampleInfo(s, samplePoint));
}
private void initializeSampleInfo(SampleInfo sample, ControlPoint controlPoint)

5
osu.Game/Rulesets/Objects/Legacy/Catch/HitObjectParser.cs
View File

@ -22,8 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
};
}
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType,
int repeatCount, List<SampleInfo> headSamples, List<SampleInfo> tailSamples, List<List<SampleInfo>> repeatSamples)
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{
return new Slider
{
@ -33,8 +32,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
HeadSamples = headSamples,
TailSamples = tailSamples,
RepeatSamples = repeatSamples
};
}

45
osu.Game/Rulesets/Objects/Legacy/HitObjectParser.cs
View File

@ -8,7 +8,6 @@ using System.Collections.Generic;
using System.Globalization;
using osu.Game.Beatmaps.Formats;
using osu.Game.Audio;
using System.Linq;
namespace osu.Game.Rulesets.Objects.Legacy
{
@ -76,7 +75,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
if (split.Length > 7)
length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);
if (split.Length > 10)
readCustomSampleBanks(split[10], bankInfo);
@ -108,10 +107,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
nodeSoundTypes.Add(soundType);
// Read any per-node sound types
string[] adds = null;
if (split.Length > 8 && split[8].Length > 0)
{
adds = split[8].Split('|');
string[] adds = split[8].Split('|');
for (int i = 0; i < nodes; i++)
{
if (i >= adds.Length)
@ -128,14 +126,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
for (int i = 0; i <= repeatCount; i++)
nodeSamples.Add(convertSoundType(nodeSoundTypes[i], nodeBankInfos[i]));
// Extract the first and last samples for the head and tail respectively
List<SampleInfo> headSamples = nodeSamples.First();
List<SampleInfo> tailSamples = nodeSamples.Last();
// Repeat samples are all the samples between head and tail
var repeatSamples = nodeSamples.Skip(1).TakeWhile(s => s != tailSamples).ToList();
result = CreateSlider(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, points, length, curveType, repeatCount, headSamples, tailSamples, repeatSamples);
result = CreateSlider(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, points, length, curveType, repeatCount, nodeSamples);
}
else if ((type & HitObjectType.Spinner) > 0)
{
@ -210,10 +201,11 @@ namespace osu.Game.Rulesets.Objects.Legacy
/// <param name="length">The slider length.</param>
/// <param name="curveType">The slider curve type.</param>
/// <param name="repeatCount">The slider repeat count.</param>
/// <param name="repeatSamples">The slider repeat sounds (this includes the end node, but NOT the start node).</param>
/// <param name="headSamples">The samples to be played when the head of the slider is hit.</param>
/// <param name="tailSamples">The samples to be played when the tail of the slider is hit.</param>
/// <param name="repeatSamples">The samples to be played when the repeat nodes are hit.</param>
/// <returns>The hit object.</returns>
protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType,
int repeatCount, List<SampleInfo> headSamples, List<SampleInfo> tailSamples, List<List<SampleInfo>> repeatSamples);
protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples);
/// <summary>
/// Creates a legacy Spinner-type hit object.
@ -225,15 +217,16 @@ namespace osu.Game.Rulesets.Objects.Legacy
private List<SampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
{
var soundTypes = new List<SampleInfo>();
soundTypes.Add(new SampleInfo
var soundTypes = new List<SampleInfo>
{
Bank = bankInfo.Normal,
Name = SampleInfo.HIT_NORMAL,
Volume = bankInfo.Volume
});
new SampleInfo
{
Bank = bankInfo.Normal,
Name = SampleInfo.HIT_NORMAL,
Volume = bankInfo.Volume
}
};
if ((type & LegacySoundType.Finish) > 0)
{
soundTypes.Add(new SampleInfo
@ -269,9 +262,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
private class SampleBankInfo
{
public string Normal = null;
public string Add = null;
public int Volume = 0;
public string Normal;
public string Add;
public int Volume;
public SampleBankInfo Clone()
{

5
osu.Game/Rulesets/Objects/Legacy/Mania/HitObjectParser.cs
View File

@ -22,8 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
};
}
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType,
int repeatCount, List<SampleInfo> headSamples, List<SampleInfo> tailSamples, List<List<SampleInfo>> repeatSamples)
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{
return new Slider
{
@ -33,8 +32,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
HeadSamples = headSamples,
TailSamples = tailSamples,
RepeatSamples = repeatSamples
};
}

5
osu.Game/Rulesets/Objects/Legacy/Osu/HitObjectParser.cs
View File

@ -22,8 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
};
}
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType,
int repeatCount, List<SampleInfo> headSamples, List<SampleInfo> tailSamples, List<List<SampleInfo>> repeatSamples)
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{
return new Slider
{
@ -33,8 +32,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
HeadSamples = headSamples,
TailSamples = tailSamples,
RepeatSamples = repeatSamples
};
}

5
osu.Game/Rulesets/Objects/Legacy/Taiko/HitObjectParser.cs
View File

@ -21,8 +21,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
};
}
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType,
int repeatCount, List<SampleInfo> headSamples, List<SampleInfo> tailSamples, List<List<SampleInfo>> repeatSamples)
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{
return new Slider
{
@ -31,8 +30,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
HeadSamples = headSamples,
TailSamples = tailSamples,
RepeatSamples = repeatSamples
};
}

11
osu.Game/Rulesets/Objects/Types/IHasCurve.cs
View File

@ -3,7 +3,6 @@
using System.Collections.Generic;
using OpenTK;
using osu.Game.Audio;
namespace osu.Game.Rulesets.Objects.Types
{
@ -27,16 +26,6 @@ namespace osu.Game.Rulesets.Objects.Types
/// </summary>
CurveType CurveType { get; }
/// <summary>
/// The samples to be played when the head of the hit object is hit.
/// </summary>
List<SampleInfo> HeadSamples { get; }
/// <summary>
/// The samples to be played when the tail of the hit object is hit.
/// </summary>
List<SampleInfo> TailSamples { get; }
/// <summary>
/// Computes the position on the curve at a given progress, accounting for repeat logic.
/// <para>