Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-13 13:57:43 +02:00
Code Issues Packages Projects Releases 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 8cb08ea8ec
commit 3fb4db34cb
1 changed files with 45 additions and 3 deletions
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) public void Play(float beat)
{ {
bool negativeOffset = firstBeatOffset < 0f;
bool negativeStartTime = false;
var startPos = GetSongPosFromBeat(beat); 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; songPosBeat = time / secPerBeat;
isPlaying = true; isPlaying = true;
@ -88,8 +104,34 @@ namespace RhythmHeavenMania
if (SongPosLessThanClipLength(startPos)) if (SongPosLessThanClipLength(startPos))
{ {
musicSource.time = startPos; if (negativeOffset)
musicSource.PlayScheduled(AudioSettings.dspTime); {
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); // GameManager.instance.SetCurrentEventToClosest(songPositionInBeats);