From 6ceed8690b89526fb5b62ece33c3b121e2aeb6b1 Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Wed, 28 Jun 2023 21:51:49 +0200 Subject: [PATCH] commit #44 --- .../de/moritzruth/lampenfieber/act/First.kt | 3 - .../de/moritzruth/lampenfieber/act/Fourth.kt | 67 ++++++++----------- .../de/moritzruth/lampenfieber/act/Third.kt | 9 +++ .../lampenfieber/device/CoemarProWash.kt | 5 ++ .../lampenfieber/song/SchauMichMit.kt | 4 +- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt index f44b1ab..6f64aa9 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt @@ -199,7 +199,6 @@ fun ShowBuilderContext.firstAct() = act("Erster Akt") { step(StepCue.Light(StepCue.Light.State.OFF, false)) { actors { -"Tina" - -"Richy" +"David / sitzt am Klavier" +"Klavierlehrer / steht neben David" } @@ -213,7 +212,6 @@ fun ShowBuilderContext.firstAct() = act("Erster Akt") { step(StepCue.Text("David", "Ach nicht?")) { actors { - +"Paula / von rechts" -"Klavierlehrer / nach links" } @@ -233,7 +231,6 @@ fun ShowBuilderContext.firstAct() = act("Erster Akt") { +"Sven / durch den Mittelgang" +"Sandra / durch den Mittelgang" +"Eva / durch den Mittelgang" - +"David / von der Bühne" +"Kathi / von der Bühne" +"Paula / steht rechts" } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt index 5709f3a..8e384c6 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt @@ -21,9 +21,11 @@ import kotlin.time.Duration.Companion.seconds fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { scene("Szene 1") { step(StepCue.MusicStart("Ende der Pause", 10.minutes)) { - val sideColor = Color(60.degrees, saturation = 10.percent) + val sideColor = Color(60.degrees, saturation = 20.percent) sideLight.color1.static(sideColor) sideLight.color2.static(sideColor) + sideLight.color3.static(Color.BLACK) + sideLight.color4.static(Color.BLACK) sideLight.brightness.static(40.percent) // für später @@ -35,7 +37,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { } Washs.both { - it.pointAtStageCenter() + it.pointAtBathroomObjects() it.colorWheelMode.static(CoemarProWash.ColorWheelMode.White) it.beamAngle.static(100.percent) } @@ -50,23 +52,13 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { +"Tina / sitzt rechts" } - leftSpotTarget = "Sandra / links" - rightSpotTarget = "Tina / rechts" - curtainState = CurtainState.OPEN onRun { - spotLeft.brightness.fade(100.percent, 8.seconds) - spotRight.brightness.fade(100.percent, 8.seconds) - sideLight.brightness.fade(100.percent, 8.seconds) } } - lightStep(StepCue.Text("Sandra", "Das reicht nicht.")) { - spotLeft.brightness.fade(20.percent, 5.seconds) - } - step(StepCue.Text("Tina", "was ich anziehen soll.")) { actors { +"Manuel / von rechts" @@ -78,11 +70,6 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { -"Manuel / nach rechts" +"Bianca / von links" } - - onRun { - spotRight.brightness.fade(20.percent, 5.seconds) - spotLeft.brightness.fade(100.percent, 5.seconds) - } } step(StepCue.Text("Bianca", "Ich verzieh mich ja schon.")) { @@ -177,7 +164,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { } lightStep(StepCue.Custom("Schlagzeug spielt schneller")) { - bar.color.fadeRandomAround(245.degrees, 180.degrees, 5.seconds) + bar.color.fadeRandomAround(245.degrees, 15.degrees, 5.seconds) } } @@ -188,11 +175,10 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { +"Paula / durch Mittelgang auf Fahrrad" } - leftSpotTarget = "Paula / im Mittelgang" - rightSpotTarget = "David" + rightSpotTarget = "Paula / im Mittelgang" onRun { - FrontLights.all.forEach { it.brightness.fade(0.percent, 8.seconds) } + FrontLights.all.forEach { it.brightness.fade(20.percent, 8.seconds) } Washs.both.forEach { it.pointAtCeiling() it.colorWheelMode.static(CoemarProWash.ColorWheelMode.White) @@ -202,45 +188,48 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { bar.brightness.off(4.seconds) - spotLeft.brightness.fade(100.percent, 4.seconds) spotRight.brightness.fade(100.percent, 4.seconds) sideLight.color1.fade(Color(190.degrees, 75.percent), 45.seconds) sideLight.color3.fade(Color(320.degrees, 75.percent), 45.seconds) - - sideLight.color4.fade(Color(320.degrees, 100.percent, 0.percent), 20.seconds) // off + sideLight.brightness.fade(100.percent, 4.seconds) } } lightStep(StepCue.MusicStart("Wenn Du da bist (Duett)", 3.minutes + 45.seconds)) { - spotLeft.brightness.fade(50.percent, 10.seconds) spotRight.brightness.fade(50.percent, 10.seconds) - sideLight.brightness.off(8.seconds) - Washs.both.forEach { it.brightness.fade(75.percent, 15.seconds) } } + + step(StepCue.MusicEnd) { + rightSpotTarget = null + + onRun { + spotRight.brightness.off(3.seconds) + sideLight.brightness.off(8.seconds) + + FrontLights.all { it.brightness.off(3.seconds) } + Washs.both { it.brightness.off(3.seconds) } + } + } } scene("Szene 5") { - step(StepCue.MusicEnd) { + step(StepCue.Text("Richy", "Starke Frau!", "beim ersten Laut")) { actors { - +"Richy" - +"Sandra" - +"Maria" - +"Eva" + +"Richy / sitzt links" + +"Eva / sitzt links" + +"Maria / sitzt rechts" + +"Sandra / sitzt rechts" } - rightSpotTarget = null - leftSpotTarget = null - onRun { - sideLight.brightness.static(100.percent) sideLight.fadeColorsToClassroomFromDarkness(5.seconds) - FrontLights.all.forEach { it.brightness.fade(75.percent, 5.seconds) } + sideLight.brightness.static(100.percent) + + FrontLights.all.forEach { it.brightness.fade(75.percent, 2.seconds) } Washs.both.forEach { it.brightness.off(5.seconds) } - spotLeft.brightness.off(5.seconds) - spotRight.brightness.off(5.seconds) } } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt index d332af8..115e54d 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt @@ -62,6 +62,8 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { step(StepCue.Text("Richy", "Aber ich kann ja nicht überall sein.")) { actors { -"Richy / nach rechts" + -"Maria / nach rechts" + -"Sandra / nach rechts" +"David / am Klavier" } @@ -135,6 +137,10 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { actors { +"David" +"Paula" + +"Kathi" + +"Maria" + +"Sandra" + // mehr } curtainState = CurtainState.OPEN @@ -153,6 +159,9 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { step(StepCue.Text("Gerda", "Ich glaub, wir ziehen ab.")) { actors { + -"Maria" + -"Sandra" + // mehr } } } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt b/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt index b44fb52..8541ea1 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/device/CoemarProWash.kt @@ -87,6 +87,11 @@ class CoemarProWash(override val firstChannel: DmxAddress, private val isRight: pan.static(if (isRight) 280.degrees else 80.degrees) } + fun pointAtBathroomObjects() { // TODO: Testen + tilt.static(55.degrees) + pan.static(if (isRight) 280.degrees else 80.degrees) + } + fun pointAtCeiling(fadeDuration: Duration = Duration.ZERO) { pan.fade(if (isRight) 300.degrees else 60.degrees, fadeDuration) tilt.fade(120.degrees, fadeDuration) diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt b/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt index 98a0e29..2fcf097 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt @@ -78,8 +78,8 @@ fun SceneBuilderContext.songSchauMichMit() { // 3:06 lightStep(StepCue.Custom("Pause nach »rotiere«")) { - bar.brightness.off(500.milliseconds) - sideLight.brightness.off(500.milliseconds) + bar.brightness.off(2.seconds) + sideLight.brightness.off(2.seconds) } lightStep(StepCue.Custom("Refrain")) {