implemented support for show transition

bildspur · Jun 5, 2023 · 8a55431 · 8a55431
1 parent d27ee20
commit 8a55431
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 4 deletions.
diff --git a/src/main/kotlin/ch/bildspur/ledforest/model/leda/LedaShowConfig.kt b/src/main/kotlin/ch/bildspur/ledforest/model/leda/LedaShowConfig.kt
@@ -1,26 +1,42 @@
 package ch.bildspur.ledforest.model.leda
 
+import ch.bildspur.color.RGB
+import ch.bildspur.ledforest.ui.properties.SeparatorParameter
 import ch.bildspur.model.DataModel
 import ch.bildspur.ui.properties.BooleanParameter
+import ch.bildspur.ui.properties.ColorParameter
 import ch.bildspur.ui.properties.StringParameter
 import com.google.gson.annotations.Expose
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
+import kotlin.math.max
 
 class LedaShowConfig {
 
     @Expose
     @BooleanParameter("Show Enabled")
     var enabled = DataModel(false)
 
+    @Expose
+    @ColorParameter("Transition Color")
+    var transitionColor = DataModel(RGB(255, 255, 255))
+
+    @SeparatorParameter("Trigger")
+    private val triggerSep = Any()
+
     @BooleanParameter("Show Requested")
     var showTrigger = DataModel(false)
 
     @StringParameter("Video Name", isEditable = false)
     var videoName = DataModel("-")
 
+    @StringParameter("Triggered Time", isEditable = false)
+    private var triggeredTimeStampPreview = DataModel("-")
+
+    var triggeredTimeStamp = DataModel(Clock.System.now())
+
     @StringParameter("Start Time", isEditable = false)
     private var startTimeStampPreview = DataModel("-")
 
@@ -34,11 +50,22 @@ class LedaShowConfig {
             startTimeStampPreview.value = it.toLocalDateTime(TimeZone.currentSystemDefault())
                 .toInstant(TimeZone.UTC).toString()
         }
+
+        triggeredTimeStamp.onChanged += {
+            triggeredTimeStampPreview.value = it.toLocalDateTime(TimeZone.currentSystemDefault())
+                .toInstant(TimeZone.UTC).toString()
+        }
     }
 
     val showRequested: Boolean
         get() = enabled.value && showTrigger.value
 
     val isShowRunning: Boolean
         get() = enabled.value && !hasShowEnded.value
+
+    val timeUntilPlayback: Long
+        get() = startTimeStamp.value.toEpochMilliseconds() - System.currentTimeMillis()
+
+    val totalWaitTime: Long
+        get() = max(0, startTimeStamp.value.toEpochMilliseconds() - triggeredTimeStamp.value.toEpochMilliseconds())
 }
diff --git a/src/main/kotlin/ch/bildspur/ledforest/scene/LedaShowScene.kt b/src/main/kotlin/ch/bildspur/ledforest/scene/LedaShowScene.kt
@@ -1,8 +1,11 @@
 package ch.bildspur.ledforest.scene
 
+import ch.bildspur.color.HSV
 import ch.bildspur.ledforest.controller.timer.TimerTask
 import ch.bildspur.ledforest.model.Project
 import ch.bildspur.ledforest.model.light.Tube
+import ch.bildspur.ledforest.util.forEachLED
+import kotlin.math.roundToInt
 
 class LedaShowScene(project: Project, tubes: List<Tube>) : BaseScene("Leda Show", project, tubes) {
     private val task = TimerTask(1, { update() })
@@ -30,8 +33,7 @@ class LedaShowScene(project: Project, tubes: List<Tube>) : BaseScene("Leda Show"
         // find relevant video scene and play it back
         val act = SceneRegistry.listOfActs().firstOrNull { it.name.endsWith(config.videoName.value) }
 
-        if (act == null)
-        {
+        if (act == null) {
             println("Could not find show scene ${config.videoName.value}.")
             config.hasShowEnded.value = true
         } else {
@@ -44,12 +46,22 @@ class LedaShowScene(project: Project, tubes: List<Tube>) : BaseScene("Leda Show"
         val currentTime = System.currentTimeMillis()
         println("Current: ${currentTime}")
         println("Current: ${config.startTimeStamp.value.toEpochMilliseconds()}")
-        println("Time Miss: ${config.startTimeStamp.value.toEpochMilliseconds() - currentTime} ms")
+        println("Time Miss: ${config.timeUntilPlayback} ms")
         project.videoScene.videoStartTime.value = config.startTimeStamp.value.toEpochMilliseconds()
     }
 
     override fun update() {
-        // todo: while not start time - display transition (white to black fade)
+        val config = project.leda.ledaShow
+
+        if (config.timeUntilPlayback > 0) {
+            val brightnessFactor = config.timeUntilPlayback / config.totalWaitTime.toFloat()
+
+            val hsv = project.leda.ledaShow.transitionColor.value.toHSV()
+            val color = HSV(hsv.h, hsv.s, (hsv.v * brightnessFactor).roundToInt()).toRGB().toPackedInt()
+
+            tubes.forEachLED { it.color.set(color) }
+            return
+        }
 
         showScene.update()
     }

diff --git a/src/main/kotlin/ch/bildspur/ledforest/ui/PrimaryView.kt b/src/main/kotlin/ch/bildspur/ledforest/ui/PrimaryView.kt
@@ -45,6 +45,7 @@ import javafx.scene.shape.Rectangle
 import javafx.stage.*
 import jfxtras.styles.jmetro.JMetro
 import jfxtras.styles.jmetro.Style
+import kotlinx.datetime.Clock
 import org.kordamp.ikonli.javafx.FontIcon
 import processing.core.PApplet
 import processing.core.PVector
@@ -315,6 +316,7 @@ class PrimaryView {
                     show.showTrigger.value = true
                     show.videoName.value = it.videoName
                     show.startTimeStamp.value = it.videoStartTimeStamp
+                    show.triggeredTimeStamp.value = Clock.System.now()
                 }
             }
             synchronizer.start()