etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 11:45:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

BTSDS: Piano notes will now stop properly even if the game switches during them.

Browse source
This commit is contained in:
Jenny Crowe 2022-03-09 20:50:19 -07:00
parent 5a56ecf261
commit 84c4e8fc9f
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs
View file

@ -190,10 +190,7 @@ namespace RhythmHeavenMania.Games.BuiltToScaleDS
var pianoPitch = Mathf.Pow(2f, (1f / 12f) * semiTones) *Conductor.instance.musicSource.pitch;
var pianoSource = Jukebox.PlayOneShotGame("builtToScaleDS/Piano", -1, pianoPitch, 0.8f, true);
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + length, delegate { Jukebox.KillLoop(pianoSource, 0.1f); })
});
Jukebox.SetLoopParams(pianoSource, beat + length, 0.1f);
}
}
}

11
Assets/Scripts/Util/Jukebox.cs
View file

@ -107,6 +107,17 @@ namespace RhythmHeavenMania.Util
return null;
}
// Loops play forever by default unless you set their params via this method.
public static void SetLoopParams(AudioSource source, float endBeat, float fadeTime)
{
if (source == null)
return;
var snd = source.GetComponent<Sound>();
snd.loopEndBeat = endBeat;
snd.fadeTime = fadeTime;
}
public static void KillLoop(AudioSource source, float fadeTime)
{
// Safeguard against previously-destroyed sounds.

15
Assets/Scripts/Util/Sound.cs
View file

@ -15,6 +15,9 @@ namespace RhythmHeavenMania.Util
public double scheduledTime;
public bool looping;
public float loopEndBeat = -1;
public float fadeTime;
int loopIndex = 0;
private AudioSource audioSource;
@ -73,6 +76,18 @@ namespace RhythmHeavenMania.Util
}
}
}
if (loopIndex < 1)
{
if (looping && loopEndBeat != -1)
{
if (Conductor.instance.songPositionInBeats > loopEndBeat)
{
KillLoop(fadeTime);
loopIndex++;
}
}
}
}
IEnumerator NotRelyOnBeatSound()