From c7ce2ca40bb6e88d0b9cf46d2a190205e44b7e2f Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Thu, 22 Jun 2023 22:20:49 +0200 Subject: [PATCH] commit #37 --- .../de/moritzruth/lampenfieber/act/Fourth.kt | 26 ++++++++----------- .../de/moritzruth/lampenfieber/act/Third.kt | 8 +++--- .../lampenfieber/device/CoemarProWash.kt | 1 + .../lampenfieber/device/FuturelightDmh160.kt | 2 +- .../lampenfieber/device/StairvilleClb4.kt | 2 +- .../de/moritzruth/lampenfieber/song/Richy.kt | 4 +-- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt index 023fb33..48267d2 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt @@ -140,8 +140,8 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { rightSpotTarget = "Tina" onRun { - FrontLights.all.forEach { it.brightness.fade(25.percent, 5.seconds) } - spotRight.brightness.fade(100.percent, 3.seconds) + FrontLights.all.forEach { it.brightness.fade(25.percent, 12.seconds) } + spotRight.brightness.fade(100.percent, 10.seconds) } } @@ -155,10 +155,6 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { onRun { FrontLights.all.forEach { it.brightness.off(3.seconds) } spotRight.brightness.off(3.seconds) - - // Vorhang ist hier noch zu - sideLight.brightness.static(100.percent) - sideLight.fadeColorsToClassroomFromDarkness(Duration.ZERO) } } } @@ -173,8 +169,11 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { curtainState = CurtainState.OPEN onRun { - bar.color.static(Color(50.degrees, 20.percent)) + bar.color.static(Color(50.degrees, saturation = 20.percent)) bar.brightness.sine(6.seconds) + + sideLight.brightness.fade(50.percent, 5.seconds) + sideLight.fadeColorsToClassroomFromDarkness(Duration.ZERO) } } @@ -202,6 +201,8 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { it.beamAngle.sine(10.seconds, 20.percent, 80.percent) } + bar.brightness.off(4.seconds) + spotLeft.brightness.fade(100.percent, 4.seconds) spotRight.brightness.fade(100.percent, 4.seconds) @@ -213,15 +214,10 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { } lightStep(StepCue.MusicStart("Wenn Du da bist (Duett)", 3.minutes + 45.seconds)) { - spotLeft.brightness.fade(25.percent, 10.seconds) - spotRight.brightness.fade(25.percent, 10.seconds) + spotLeft.brightness.fade(50.percent, 10.seconds) + spotRight.brightness.fade(50.percent, 10.seconds) Washs.both.forEach { it.brightness.fade(75.percent, 15.seconds) } - - launch { - delay(1.minutes) - Washs.both.forEach { it.brightness.fade(100.percent, 20.seconds) } - } } } @@ -360,7 +356,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { lightStep(StepCue.Custom("Keyboard-Einsatz")) { Tops.both.forEach { - it.startRoomMovement(6.0) + it.startRoomMovement(3.0) it.brightness.fade(100.percent, 10.seconds) it.colorWheelMode.static(FuturelightDmh160.ColorWheelMode.DarkBlue) it.prismRotationSpeed.static(20.percent) diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt index e77314c..44574b9 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt @@ -176,8 +176,8 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { step(StepCue.MusicEnd) { actors { - +"Maria / sitzt links" - +"Kathi / sitzt rechts" + +"Kathi / sitzt links" + +"Maria / sitzt rechts" } curtainState = CurtainState.OPEN @@ -265,7 +265,7 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { rightSpotTarget = "Maria" onRun { - spotRight.brightness.fade(100.percent, 20.seconds) + spotRight.brightness.fade(50.percent, 2.seconds) Tops.both.forEach { it.colorWheelMode.static(FuturelightDmh160.ColorWheelMode.DarkBlue) @@ -284,7 +284,7 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { leftSpotTarget = "Paula" onRun { - spotLeft.brightness.fade(100.percent, 2.seconds) + spotLeft.brightness.fade(50.percent, 2.seconds) Tops.both.forEach { it.brightness.fade(100.percent, 30.seconds) } sideLight.colors.forEach { it.fade(Color(185.degrees), 30.seconds) } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt b/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt index 5824c18..5b857c1 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt @@ -88,6 +88,7 @@ class CoemarProWash(override val firstChannel: DmxAddress, private val isRight: } fun pointAtCeiling(fadeDuration: Duration = Duration.ZERO) { + // TODO: Zu Proscenium zeigen tilt.fade(145.degrees, fadeDuration) pan.fade(0.degrees, fadeDuration) } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/device/FuturelightDmh160.kt b/src/main/kotlin/de/moritzruth/lampenfieber/device/FuturelightDmh160.kt index 6541127..eebea06 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/device/FuturelightDmh160.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/device/FuturelightDmh160.kt @@ -91,7 +91,7 @@ class FuturelightDmh160(override val firstChannel: DmxAddress, private val isRig val prismRotationSpeed = PercentageDV() fun startRoomMovement(rotationsPerMinute: Double) { - // TODO: Testen, alternativ spin statt sine + // TODO: Ersetzen durch spin pan.sine(1.minutes / rotationsPerMinute, 0.degrees, 360.degrees) tilt.fade(120.degrees, 3.seconds) } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/device/StairvilleClb4.kt b/src/main/kotlin/de/moritzruth/lampenfieber/device/StairvilleClb4.kt index 9f4ac91..e4bbc20 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/device/StairvilleClb4.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/device/StairvilleClb4.kt @@ -57,7 +57,7 @@ class StairvilleClb4(override val firstChannel: DmxAddress) : Device { sideLight.color1.fade(color1.getCurrentValue().copy(brightness = 0.percent), duration) sideLight.color2.fade(color1.getCurrentValue().copy(brightness = 0.percent), duration) - val color = Color(50.degrees, saturation = 80.percent, brightness = 80.percent) + val color = Color(45.degrees, saturation = 100.percent, brightness = 80.percent) // TODO: Testen sideLight.color3.fade(color, duration = duration) sideLight.color4.fade(color, duration = duration) diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/song/Richy.kt b/src/main/kotlin/de/moritzruth/lampenfieber/song/Richy.kt index ccba50a..704f6fc 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/song/Richy.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/song/Richy.kt @@ -62,7 +62,7 @@ fun SceneBuilderContext.songRichy() { lightStep(StepCue.Custom("+2 Takte")) { bar.brightness.sine(4.seconds, 20.percent, 50.percent) - bar.color.static(Color(40.degrees, 25.percent)) + bar.color.static(Color(40.degrees)) Washs.both { it.brightness.fade(100.percent, 200.milliseconds) @@ -122,7 +122,7 @@ fun SceneBuilderContext.songRichy() { bar.brightness.sine(2.seconds, 20.percent, 50.percent) } - lightStep(StepCue.Custom("Breakdown am Ende")) { + lightStep(StepCue.Custom("2. Breakdown am Ende")) { bar.brightness.fade(100.percent, 200.milliseconds) bar.color.fade(Color(0.degrees), 200.milliseconds)