added final changes, added proper fadeout to the slides

marekkirejczyk · Jul 18, 2024 · 0b1b3cd · 0b1b3cd
1 parent 1a884de
commit 0b1b3cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/zkmarek/video/slides/episode3/ceremony_verification.py b/zkmarek/video/slides/episode3/ceremony_verification.py
@@ -1,7 +1,6 @@
 from typing import List
 
-from manim import (DOWN, TAU, UP, CurvedArrow, FadeIn, FadeOut, MathTex,
-                   Text, Unwrite, Write)
+from manim import DOWN, TAU, UP, CurvedArrow, FadeIn, FadeOut, MathTex, Text, Write
 
 from zkmarek.video.constant import PRIMARY_COLOR, PRIMARY_FONT, SECONDARY_COLOR
 from zkmarek.video.mobjects.tex_array import TexArray
@@ -133,8 +132,6 @@ def animate_in(self, scene):
         for arrow in self.arrows_g2:
             scene.play(FadeOut(arrow))
 
-        scene.wait(2)
-
+    def animate_out(self, scene):
         scene.play(
-            FadeOut(self.vec_g1),
-            FadeOut(self.vec_g2))
+            FadeOut(self.vec_g1, self.vec_g2, self.title_label, self.subheader_label, self.header_label))
diff --git a/zkmarek/video/slides/episode3/ceremony_verification_2.py b/zkmarek/video/slides/episode3/ceremony_verification_2.py
@@ -1,5 +1,4 @@
-from manim import (DOWN, RIGHT, TAU, UP, CurvedArrow, FadeIn, FadeOut, MathTex,
-                   Text, Write)
+from manim import DOWN, RIGHT, TAU, UP, CurvedArrow, FadeIn, FadeOut, MathTex, Text, Write
 
 from zkmarek.video.constant import PRIMARY_COLOR, PRIMARY_FONT, SECONDARY_COLOR
 from zkmarek.video.mobjects.tex_array import TexArray
@@ -91,8 +90,7 @@ def animate_in(self, scene):
         self.new_subsection(scene, "verification", "data/sound/episode3/slide7-4.mp3")
         self.pairing.animate_out(scene)
 
-        scene.play(FadeOut(self.vec_g1_current),
-            FadeOut(self.vec_next),
-            FadeOut(self.arrow, self.tau_current, self.tau_next,  self.header_label, self.subheader_label, self.title_label))
+        scene.wait(4)
 
-        scene.wait(5)
+    def animate_out(self, scene):
+        scene.play(FadeOut(self.vec_g1_current), FadeOut(self.vec_next), FadeOut(self.arrow, self.tau_current, self.tau_next,  self.header_label, self.subheader_label, self.title_label))
diff --git a/zkmarek/video/slides/episode3/introduction.py b/zkmarek/video/slides/episode3/introduction.py
@@ -33,8 +33,8 @@ def animate_in(self, scene):
         scene.play(FadeIn(self.person1, self.person2, self.person3, self.person4))
         scene.play(FadeIn(self.tau))
         scene.play(FadeIn(self.thumb1))
-        scene.play(FadeIn(self.thumb2))
         scene.play(FadeIn(self.thumb3))
+        scene.play(FadeIn(self.thumb2))
         scene.play(FadeIn(self.thumb4))
 
         self.new_subsection(scene, "trusted setup Plonk, zk snarks", "data/sound/episode3/slide1-1.mp3")
@@ -60,7 +60,7 @@ def animate_in(self, scene):
         scene.wait(0.5)
 
     def animate_out(self, scene):
-        scene.play(FadeOut(self.person1, self.person2, self.person3, self.person4, self.polynomial2))
+        scene.play(FadeOut(self.person1, self.person2, self.person3, self.person4, self.polynomial2, self.thumb2, self.thumb3, self.thumb4, self.thumb1))
 
     def animate_tree(self, scene):
         tree = VerkleTree().scale(0.8).shift(UP*1.5)

diff --git a/zkmarek/video/slides/episode3/trusted_setup.py b/zkmarek/video/slides/episode3/trusted_setup.py
@@ -85,20 +85,19 @@ def animate_in(self, scene):
         scene.wait(1)
         scene.play(Write(self.tau))
         scene.play(FadeIn(self.person1))
-        scene.play(FadeIn(self.person2))
         scene.play(FadeIn(self.person3))
+        scene.play(FadeIn(self.person2))
         scene.play(FadeIn(self.person4))
-        scene.wait(2)
         scene.play(FadeIn(self.tau_number))
         scene.wait(1.5)
         scene.play(FadeIn(self.question4, self.question1, self.question3, self.question2))
 
         self.new_subsection(scene, "multiplying by G1", "data/sound/episode3/slide4-1.mp3")
         scene.play(FadeOut(self.question4, self.question1, self.question3, self.question2, self.person1, self.person2, self.person3, self.person4, self.tau_number),Write(self.vector_g1))
         self.vector_g1.animate_transform_matching_shapes(scene, SETUP_G1_2)
-        scene.wait(3.5)
+        scene.wait(2.5)
         scene.play(Indicate(self.vector_g1[0][1], color = HIGHLIGHT_COLOR))
-        scene.wait(2)
+        scene.wait(2.5)
         scene.play(Indicate(self.vector_g1[0][1], color = HIGHLIGHT_COLOR))
         scene.play(Indicate(self.vector_g1[1][1], color = HIGHLIGHT_COLOR))
         scene.play(Indicate(self.vector_g1[3][1], color = HIGHLIGHT_COLOR))