Merge pull request #60 from ShingenPizza/shuffle_fix

MerlinVR · web-flow · commit e1238e8ad0e1 · 2023-10-01T19:48:26.000-07:00
Playlist shuffling fix
diff --git a/Assets/USharpVideo/Scripts/USharpVideoPlayer.cs b/Assets/USharpVideo/Scripts/USharpVideoPlayer.cs
@@ -985,10 +985,10 @@ public void PlayNextVideoFromPlaylist()
             {
                 Random.InitState(_shuffleSeed);
 
-                int n = playlist.Length - 1;
-                for (int i = 0; i < n; ++i)
+                for (int i = 0; i < playlist.Length - 1; ++i)
                 {
-                    int r = Random.Range(i + 1, n);
+                    int r = Random.Range(i, playlist.Length);
+                    if (i == r) { continue; }
                     VRCUrl flipVal = playlist[r];
                     playlist[r] = playlist[i];
                     playlist[i] = flipVal;

Original file line number	Diff line number	Diff line change
`@@ -985,10 +985,10 @@ public void PlayNextVideoFromPlaylist()`
`985`	`985`	`{`
`986`	`986`	`Random.InitState(_shuffleSeed);`
`987`	`987`
`988`		`- int n = playlist.Length - 1;`
`989`		`- for (int i = 0; i < n; ++i)`
	`988`	`+ for (int i = 0; i < playlist.Length - 1; ++i)`
`990`	`989`	`{`
`991`		`- int r = Random.Range(i + 1, n);`
	`990`	`+ int r = Random.Range(i, playlist.Length);`
	`991`	`+ if (i == r) { continue; }`
`992`	`992`	`VRCUrl flipVal = playlist[r];`
`993`	`993`	`playlist[r] = playlist[i];`
`994`	`994`	`playlist[i] = flipVal;`