mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

let's try this resyncing again

Browse source
This commit is contained in:
minenice55 2024-04-08 21:54:55 -04:00
parent e4dd359de7
commit 1880c27213
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Assets/Scripts/Conductor.cs
View file

@ -96,9 +96,7 @@ namespace HeavenStudio
private float timelineVolume = 1f;
private float minigameVolume = 1f;
const bool doPitchResync = false;
public void SetTimelinePitch(float pitch, bool resync = false)
public void SetTimelinePitch(float pitch)
{
if (isPaused || deferTimeKeeping) return;
if (pitch != 0 && pitch != timelinePitch)
@ -111,17 +109,17 @@ namespace HeavenStudio
if (musicSource != null && musicSource.clip != null)
{
musicSource.pitch = SongPitch;
if (doPitchResync && isPlaying && resync && !deferTimeKeeping)
if (isPlaying && !(isPaused || deferTimeKeeping))
{
time = MapTimeToPitchChanges(absTime + absTimeAdjust);
songPos = startPos + time;
songPosBeat = GetBeatFromSongPos(songPos);
SeekMusicToTime(songPos, firstBeatOffset);
songPositionInBeatsAsDouble = GetSwungBeat(songPosBeat);
}
}
}
public void SetMinigamePitch(float pitch, bool resync = false)
public void SetMinigamePitch(float pitch)
{
if (isPaused || deferTimeKeeping || !isPlaying) return;
if (pitch != 0 && pitch != minigamePitch)
@ -134,12 +132,12 @@ namespace HeavenStudio
if (musicSource != null && musicSource.clip != null)
{
musicSource.pitch = SongPitch;
if (doPitchResync && isPlaying && resync && !deferTimeKeeping)
if (isPlaying && !(isPaused || deferTimeKeeping))
{
time = MapTimeToPitchChanges(absTime + absTimeAdjust);
songPos = startPos + time;
songPosBeat = GetBeatFromSongPos(songPos);
SeekMusicToTime(songPos, firstBeatOffset);
songPositionInBeatsAsDouble = GetSwungBeat(songPosBeat);
}
}
}

2
Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs
View file

@ -102,7 +102,7 @@ namespace HeavenStudio.Games
}
if (Conductor.instance.isPlaying)
{
Conductor.instance.SetMinigamePitch(1f, true);
Conductor.instance.SetMinigamePitch(1f);
}
}