fixed issue with random playback order in leda scene player

bildspur · Dec 1, 2023 · ca59d39 · ca59d39
1 parent 8a55431
commit ca59d39
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/kotlin/ch/bildspur/ledforest/scene/LedaScenePlayer.kt b/src/main/kotlin/ch/bildspur/ledforest/scene/LedaScenePlayer.kt
@@ -60,17 +60,21 @@ class LedaScenePlayer(project: Project, tubes: List<Tube>) :
     private fun playNextScene(keepSceneIndex: Boolean = false) {
         if (project.ledaScenePlayer.scenes.isEmpty()) return
 
-        val nextIndex = if (keepSceneIndex) {
+        var nextIndex = if (keepSceneIndex) {
             project.ledaScenePlayer.sceneIndex.value
         } else if (project.ledaScenePlayer.randomOrder.value) {
-            random.randomInt(0, project.ledaScenePlayer.scenes.count())
+            // randomInt returns a value including lower and upper bound
+            random.randomInt(0, project.ledaScenePlayer.scenes.count() - 1)
         } else {
             (project.ledaScenePlayer.sceneIndex.value + 1) % project.ledaScenePlayer.scenes.count()
         }
 
+        // always limit next index to not run into errors
+        nextIndex %= project.ledaScenePlayer.scenes.value.size
+
         val nextScene = project.ledaScenePlayer.scenes.value[nextIndex].resolve() ?: return
 
-        println("Switching to scene: ${nextScene.name}")
+        println("Switching to scene: ${nextScene.name} ($nextIndex)")
         project.ledaScenePlayer.sceneIndex.value = nextIndex
         switchScene(nextScene)
 

diff --git a/src/test/kotlin/RandomTest.kt b/src/test/kotlin/RandomTest.kt
@@ -0,0 +1,12 @@
+import ch.bildspur.ledforest.util.ExtendedRandom
+
+fun main() {
+    val rnd = ExtendedRandom()
+    for (i in 0 until 1000000) {
+        val result = rnd.randomInt(0, 3)
+        if(result >= 3) {
+            throw Exception("Random value generate is higher.")
+        }
+    }
+    println("done!")
+}