Skip to content

Clean up music player #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clean up music player #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions Assets/Scripts/Game/Audio/Music.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System.Linq;

public class Music : MonoBehaviour
{
Expand Down Expand Up @@ -33,27 +33,36 @@ void Awake()

void Init()
{
playOrder = Seb.ArrayHelper.CreateIndexArray(tracks.Length);
tracks = tracks.Where(track => track != null).ToArray();
if (shuffleTracksOnStart)
{
Seb.ArrayHelper.ShuffleArray(playOrder, new System.Random());
Seb.ArrayHelper.ShuffleArray(tracks, new System.Random());
}
nextTrackIndex = 0;
if (tracks.Length == 0) {
Destroy(gameObject);
}
}

void Update()
{
if (Time.time > nextTrackStartTime)
{
if (tracks[nextTrackIndex] != null)
{
source.Stop();
source.clip = tracks[nextTrackIndex];
source.Play();
nextTrackStartTime = Time.time + source.clip.length;
nextTrackIndex = (nextTrackIndex + 1) % tracks.Length;
}
StartCoroutine(PlayNextTrack());
}
}

IEnumerator PlayNextTrack()
{
if (tracks[nextTrackIndex] != null)
{
source.Stop();
source.clip = tracks[nextTrackIndex];
source.Play();
nextTrackStartTime = Time.time + source.clip.length;
nextTrackIndex = (nextTrackIndex + 1) % tracks.Length;
}
yield return null;
}

[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
Expand Down