From 2b8dc7b057a5ae4dbccc3889250ba5a49a8d4f5f Mon Sep 17 00:00:00 2001
From: Jonathan Roitgrund <jroitgrund@gmail.com>
Date: Wed, 11 Aug 2021 12:54:52 +0300
Subject: [PATCH] some fixes

---
 biosphere.scd |  10 +++--
 main.scd      |   9 +++--
 osc.scd       | 106 ++++++++++++++++----------------------------------
 ritual.scd    |   2 +-
 trame.md      |   4 ++
 5 files changed, 51 insertions(+), 80 deletions(-)

diff --git a/biosphere.scd b/biosphere.scd
index 21b14df..000cbfc 100644
--- a/biosphere.scd
+++ b/biosphere.scd
@@ -186,6 +186,7 @@ var mosquitoAmpOutBus = Bus.control(s, 1);
 			\loop, 1,
 			\panBus, gouttesPanBus,
 			\ampBus, gouttesAmpBus,
+			\ampOutBus, gouttesAmpOutBus,
 			\loopAtk, 16 / TempoClock.default.tempo,
 			\loopSus, 0,
 			\loopRel, 16 / TempoClock.default.tempo
@@ -661,9 +662,12 @@ var mosquitoAmpOutBus = Bus.control(s, 1);
 		Pseq([Event.silent(laterClip), ~singleActionPattern.value(~launchBiospherePart1LaterClip)]),
 		Pseq([Event.silent(sireneIn), ~sirens.value(firstPhaseDuration - sireneIn)]),
 		Pseq([Event.silent(gouttesIn), ~gouttes.value(firstPhaseDuration + secondPhaseDuration + 16 - gouttesIn)]),
+		Pseq([Event.silent(gouttesIn), ~pollActionPattern.value({
+			gouttesAmpOutBus.get(~setGouttesClipOpacity)
+		}, firstPhaseDuration - gouttesIn)]),
 		Pseq([Event.silent(gouttesIn), ~singleActionPattern.value(~launchBiospherePart1Gouttes)]),
 		Pseq([Event.silent(owlsIn), ~owls.value(firstPhaseDuration - owlsIn, part1: true)]),
-		Pseq([Event.silent(firstPhaseDuration), ~singleActionPattern.value(~clearBiospherePart1)])
+		Pseq([Event.silent(firstPhaseDuration), ~singleActionPattern.value(~clearAllLayers)])
 	]);
 };
 
@@ -678,7 +682,7 @@ var mosquitoAmpOutBus = Bus.control(s, 1);
 		~owls.value(secondPhaseDuration + 32, part2: true),
 		Pseq([Event.silent(0), ~melodie.value(secondPhaseDuration + 16)]),
 		Pseq([Event.silent(halfwaymark), ~singleActionPattern.value(~launchBiospherePart2HalfwayClips)]),
-		Pseq([Event.silent(secondPhaseDuration), ~singleActionPattern.value(~clearBiospherePart2)])
+		Pseq([Event.silent(secondPhaseDuration), ~singleActionPattern.value(~clearAllLayers)])
 	]);
 };
 
@@ -699,7 +703,7 @@ var mosquitoAmpOutBus = Bus.control(s, 1);
 		}, thirdPhaseDuration - birdsIn)]),
 		Pseq([Event.silent(frogsIn), ~frog.value(thirdPhaseDuration - frogsIn)]),
 		Pseq([Event.silent(uduIn), ~udu.value(thirdPhaseDuration - uduIn)]),
-		Pseq([Event.silent(thirdPhaseDuration), ~singleActionPattern.value(~clearBiospherePart3)]),
+		Pseq([Event.silent(thirdPhaseDuration), ~singleActionPattern.value(~clearAllLayers)]),
 		Pseq([Event.silent(thirdPhaseDuration + 8), ~finalTouch.value])
 	]);
 };
diff --git a/main.scd b/main.scd
index 1a33385..fdb97cf 100644
--- a/main.scd
+++ b/main.scd
@@ -40,10 +40,11 @@ TempoClock.default.tempo = 90/60;
 "./osc.scd".load;
 "./biosphere.scd".load;
 "./ritual.scd".load;
-//~clearBiospherePart1.value;
-//~clearBiospherePart2.value;
-//~clearBiospherePart3.value;
-~biospherePart3.value(128).play;
+Pseq[(
+	~singleActionPattern.value(~clearAllLayers),
+	Rest(1),
+	~rituelPart1.value(128)
+]).play;
 )
 
 // Runs everything! Adjust durations and comment stuff out to run individual parts.
diff --git a/osc.scd b/osc.scd
index 3fde3ab..8b35294 100644
--- a/osc.scd
+++ b/osc.scd
@@ -63,22 +63,22 @@
 
 ~setGrillonsTopLeftOpacity = {
     | amp |
-    ~sendMsg.value("/composition/layers/3/video/opacity", (amp * 1000));
+    ~sendMsg.value("/composition/layers/3/video/opacity", 0.5 + (amp * 100));
 };
 
 ~setGrillonsTopRightOpacity = {
     | amp |
-    ~sendMsg.value("/composition/layers/4/video/opaciity", amp);
+    ~sendMsg.value("/composition/layers/4/video/opacity", 0.5 + (amp * 100));
 };
 
 ~setGrillonsBottomLeftOpacity = {
     | amp |
-    ~sendMsg.value("/composition/layers/5/video/opaciity", amp);
+    ~sendMsg.value("/composition/layers/5/video/opacity", 0.5 + (amp * 100));
 };
 
 ~setGrillonsBottomRightOpacity = {
     | amp |
-    ~sendMsg.value("/composition/layers/11/video/opaciity", amp);
+    ~sendMsg.value("/composition/layers/11/video/opacity", 0.5 + (amp * 100));
 };
 
 ~clearGrillonsClips = {
@@ -98,7 +98,7 @@
 ~launchBassOndeRouge = {
     Routine {
         ~sendMsg.value("/composition/layers/9/clips/1/connect", 1);
-        ((3/16) / TempoClock.default.tempo).wait;
+        ((3/2) / TempoClock.default.tempo).wait;
         ~sendMsg.value("/composition/layers/10/clips/1/connect", 1);
     }.play;
 };
@@ -109,7 +109,7 @@
 
 ~setParticulesOpacity = {
     | amp |
-    ~sendMsg.value("/composition/layers/12/video/opacity", amp);
+    ~sendMsg.value("/composition/layers/12/video/opacity", 0.5 + (amp * 50));
 };
 
 ~clearMurmuresParticles = {
@@ -126,7 +126,7 @@
 
 ~setTotemLayerOpacity = {
     | amp |
-    ~sendMsg.value("/composition/layers/8/video/opacity", amp);
+    ~sendMsg.value("/composition/layers/8/video/opacity", 0.5 + (0.5 * amp));
 };
 
 ~clearTotemClip = {
@@ -149,10 +149,11 @@
 ~launchHibouxTribalClip = {
     | ev |
     var hardPan = ev[\hardPan];
-    if (hardPan == 0, { ~sendMsg.value("/composition/layers/3/clips/7/connect", 1) }, 1);
-    if (hardPan == 0.5, { ~sendMsg.value("/composition/layers/4/clips/7/connect", 1) }, 1);
-    if (hardPan == 1, { ~sendMsg.value("/composition/layers/5/clips/7/connect", 1) }, 1);
-    if (hardPan == 1.5, { ~sendMsg.value("/composition/layers/6/clips/7/connect", 1) }, 1);
+    hardPan.postln;
+    if (hardPan == 0, { ~sendMsg.value("/composition/layers/10/clips/7/connect", 1) }, 1);
+    if (hardPan == 0.5, { ~sendMsg.value("/composition/layers/7/clips/7/connect", 1) }, 1);
+    if (hardPan == 1, { ~sendMsg.value("/composition/layers/6/clips/7/connect", 1) }, 1);
+    if (hardPan == 1.5, { ~sendMsg.value("/composition/layers/5/clips/7/connect", 1) }, 1);
 };
 
 ~launchHibouxRandomClip1 = {
@@ -347,19 +348,9 @@
     ~sendMsg.value("/composition/layers/9/clips/5/connect", 1);
 };
 
-~clearBiospherePart1 = {
-    ~sendMsg.value("/composition/layers/5/clear", 1);
-    ~sendMsg.value("/composition/layers/6/clear", 1);
-    ~sendMsg.value("/composition/layers/7/clear", 1);
-    ~sendMsg.value("/composition/layers/8/clear", 1);
-    ~sendMsg.value("/composition/layers/9/clear", 1);
-    ~sendMsg.value("/composition/layers/10/clear", 1);
-
-    ~sendMsg.value("/composition/layers/10/video/opacity", 1);
-
-    ~sendMsg.value("/composition/layers/5/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/6/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/8/video/effects/transform/rotationz", 0.5);
+~setGouttesClipOpacity = {
+    | amp |
+    ~sendMsg.value("/composition/layers/9/video/opacity", 0.5 + (amp * 50));
 };
 
 ~launchBiospherePart2InitialClips = {
@@ -389,22 +380,6 @@
     }.play;
 };
 
-~clearBiospherePart2 = {
-    ~sendMsg.value("/composition/layers/3/clear", 1);
-    ~sendMsg.value("/composition/layers/4/clear", 1);
-    ~sendMsg.value("/composition/layers/5/clear", 1);
-    ~sendMsg.value("/composition/layers/6/clear", 1);
-    ~sendMsg.value("/composition/layers/7/clear", 1);
-    ~sendMsg.value("/composition/layers/8/clear", 1);
-    ~sendMsg.value("/composition/layers/9/clear", 1);
-
-    ~sendMsg.value("/composition/layers/3/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/4/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/5/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/6/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/7/video/opacity", 1);
-};
-
 ~launchBiospherePart3InitialClips = {
     ~sendMsg.value("/composition/layers/8/clips/19/connect", 1);
 };
@@ -436,44 +411,31 @@
         var angle = ((pan * pi) + (3/4 * pi));
         var x = 0.5 + (cos(angle) * 0.5 * (600 / 16384) * distance);
         var y = 0.5 + (sin(angle) * 0.5 * (600 / 16384) * distance);
+        var time = 0;
         if (layer == 4, {layer = 10}, 1);
         ~sendMsg.value("/composition/layers/" ++ layer ++ "/clips/23/connect", 1);
         ~sendMsg.value("/composition/layers/" ++ layer ++ "/video/effects/transform/positionx", x);
         ~sendMsg.value("/composition/layers/" ++ layer ++ "/video/effects/transform/positiony", y);
-        ((1/2) / TempoClock.default.tempo).wait;
+        while ({time < (1/2)}, {
+            ~sendMsg.value("/composition/layers/" ++ layer ++ "/video/opacity", 0.6 + time);
+            ((1/10) / TempoClock.default.tempo).wait;
+            time = time + (1/10);
+        });
         ~sendMsg.value("/composition/layers/" ++ layer ++ "/clear", 1);
     }.play;
 };
 
-~clearBiospherePart3 = {
-    ~sendMsg.value("/composition/layers/1/clear", 1);
-    ~sendMsg.value("/composition/layers/2/clear", 1);
-    ~sendMsg.value("/composition/layers/3/clear", 1);
-    ~sendMsg.value("/composition/layers/4/clear", 1);
-    ~sendMsg.value("/composition/layers/5/clear", 1);
-    ~sendMsg.value("/composition/layers/6/clear", 1);
-    ~sendMsg.value("/composition/layers/7/clear", 1);
-    ~sendMsg.value("/composition/layers/8/clear", 1);
-    ~sendMsg.value("/composition/layers/9/clear", 1);
-    ~sendMsg.value("/composition/layers/10/clear", 1);
-
-    ~sendMsg.value("/composition/layers/1/video/effects/transform/positionx", 0.5);
-    ~sendMsg.value("/composition/layers/1/video/effects/transform/positiony", 0.5);
-
-    ~sendMsg.value("/composition/layers/2/video/effects/transform/positionx", 0.5);
-    ~sendMsg.value("/composition/layers/2/video/effects/transform/positiony", 0.5);
-
-    ~sendMsg.value("/composition/layers/3/video/effects/transform/positionx", 0.5);
-    ~sendMsg.value("/composition/layers/3/video/effects/transform/positiony", 0.5);
-
-    ~sendMsg.value("/composition/layers/10/video/effects/transform/positionx", 0.5);
-    ~sendMsg.value("/composition/layers/10/video/effects/transform/positiony", 0.5);
-
-    ~sendMsg.value("/composition/layers/9/video/opacity", 1);
+~clearAllLayers = {
+    ~clearLayers.value([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
+};
 
-    ~sendMsg.value("/composition/layers/4/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/5/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/6/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/7/video/effects/transform/rotationz", 0.5);
-    ~sendMsg.value("/composition/layers/8/video/effects/transform/rotationz", 0.5);
-}
\ No newline at end of file
+~clearLayers = {
+    | layers |
+    layers.do { | layer |
+        ~sendMsg.value("/composition/layers/" ++ layer ++ "/clear", 1);
+        ~sendMsg.value("/composition/layers/" ++ layer ++ "/video/effects/transform/positionx", 0.5);
+        ~sendMsg.value("/composition/layers/" ++ layer ++ "/video/effects/transform/positiony", 0.5);
+        ~sendMsg.value("/composition/layers/" ++ layer ++ "/video/effects/transform/rotationz", 0.5);
+        ~sendMsg.value("/composition/layers/" ++ layer ++ "/video/opacity", 1);
+    };
+};
\ No newline at end of file
diff --git a/ritual.scd b/ritual.scd
index 3b5f6da..84bfcff 100644
--- a/ritual.scd
+++ b/ritual.scd
@@ -517,7 +517,7 @@ var windChimesAmpOutBus = Bus.control(s, 1);
 					Pfunc(~launchHibouxRandomClip3),
 					Pfunc(~launchHibouxRandomClip4)]),
 				1],
-				[0.25, 0.75]), 1),
+				[0.01, 0.99]), 1),
 		),
 		Pbind(
 			\dur, Pseq([duration]),
diff --git a/trame.md b/trame.md
index 00e2ee0..dd6c2cc 100644
--- a/trame.md
+++ b/trame.md
@@ -4,6 +4,10 @@ OPACITE LAYER 9 CLIP 5 AVEC AMPLI GOUTTES
 TODO BIOSPHERE PART 3:
 UDU DOTS LAST LESS LONG (1/2 TEMPS), fade in opacity
 
+TODO RITUAL PART 1:
+OPACITE GRILLONS COIN NE MARCHE PAS TROP
+CHECKER RHYTHE BASS
+
 BIOSPHERE PART 1
 /composition/decks/2/select 1 biosphere
 lancer layer 9 et 10 clip 1. layer 10 apparait seulement pendant les bruits de baleine.