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

Better timeline handling for song offset

Browse source
This commit is contained in:
Jenny Crowe 2022-02-24 17:09:14 -07:00
parent e5e25fa2ab
commit 47a9c807bb
1 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Assets/Scripts/Conductor.cs
View file

@ -79,8 +79,24 @@ namespace RhythmHeavenMania
public void Play(float beat)
{
bool negativeOffset = firstBeatOffset < 0f;
bool negativeStartTime = false;
var startPos = GetSongPosFromBeat(beat);
this.time = startPos - firstBeatOffset;
if (negativeOffset)
{
time = startPos;
}
else
{
negativeStartTime = startPos - firstBeatOffset < 0f;
if (negativeStartTime)
time = startPos - firstBeatOffset;
else
time = startPos;
}
songPosBeat = time / secPerBeat;
isPlaying = true;
@ -88,8 +104,34 @@ namespace RhythmHeavenMania
if (SongPosLessThanClipLength(startPos))
{
musicSource.time = startPos;
musicSource.PlayScheduled(AudioSettings.dspTime);
if (negativeOffset)
{
var musicStartTime = startPos + firstBeatOffset;
if (musicStartTime < 0f)
{
musicSource.time = startPos;
musicSource.PlayScheduled(AudioSettings.dspTime - firstBeatOffset);
}
else
{
musicSource.time = musicStartTime;
musicSource.PlayScheduled(AudioSettings.dspTime);
}
}
else
{
if (negativeStartTime)
{
musicSource.time = startPos;
}
else
{
musicSource.time = startPos + firstBeatOffset;
}
musicSource.PlayScheduled(AudioSettings.dspTime);
}
}
// GameManager.instance.SetCurrentEventToClosest(songPositionInBeats);