Skip to content

Commit

Permalink
added sound to ceremony verification, added animations to ceremony
Browse files Browse the repository at this point in the history
  • Loading branch information
martawleklinska committed Jul 17, 2024
1 parent 12ab09d commit bed5458
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 12 deletions.
Binary file modified data/sound/episode3/slide1-3.mp3
Binary file not shown.
Binary file modified data/sound/episode3/slide6-0.mp3
Binary file not shown.
Binary file modified data/sound/episode3/slide6-1.mp3
Binary file not shown.
Binary file modified data/sound/episode3/slide6-2.mp3
Binary file not shown.
Binary file added data/sound/episode3/slide6-3.mp3
Binary file not shown.
Binary file added data/sound/episode3/slide6-4.mp3
Binary file not shown.
Binary file added data/sound/episode3/slide7-0.mp3
Binary file not shown.
Binary file added data/sound/episode3/slide7-1.mp3
Binary file not shown.
Binary file added data/sound/episode3/slide7-2.mp3
Binary file not shown.
Binary file added data/sound/episode3/slide7-3.mp3
Binary file not shown.
Binary file added data/sound/episode3/slide7-4.mp3
Binary file not shown.
2 changes: 1 addition & 1 deletion zkmarek/video/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
# Intro(sound="data/sound/teaser2/slide0-0.mp3"),
Sponsored(),
Introduction(),
TitleSlide("Pairing", sound="data/sound/episode3/slide1-3.mp3", wait_time=3),
TitleSlide("Pairing", sound="data/sound/episode3/slide1-4.mp3", wait_time=3),
Pairing(),
TitleSlide("Trusted setup", sound="data/sound/episode3/slide3-0.mp3", wait_time=1.5),
TrustedSetup(),
Expand Down
2 changes: 1 addition & 1 deletion zkmarek/video/slides/episode3/ceremony.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def animate_in(self, scene):
self.new_subsection(scene, "beginning of ceremony", "data/sound/episode3/slide5-2.mp3")
scene.play(Write(self.tau_1), FadeIn(self.person2))
scene.play(Write(self.vector_1))
scene.wait(3)
scene.wait(3.5)
scene.play(Indicate(self.tau_0, color = PRIMARY_COLOR))
scene.play(Indicate(self.tau_1, color = PRIMARY_COLOR))
self.new_subsection(scene, "next participant", "data/sound/episode3/slide5-3.mp3")
Expand Down
15 changes: 12 additions & 3 deletions zkmarek/video/slides/episode3/ceremony_verification.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@
r"..." ,
r"{{ \tau^n }} {{ G_2 }}"]


PARTICIPANT_N = [
r"\tau_0^1 \tau_1^1 ... \tau_k^1 G_1",
r"\tau_0^2\tau_1^2 ... \tau_k^2 G_1",
r". . .",
r"\tau_0^n \tau_1^n ... \tau_k^n G_1"
]

class CeremonyVerification(SlideBase):
title_label: Text
Expand Down Expand Up @@ -75,6 +80,7 @@ def construct(self):
r"e({{P_0}}, {{Q_0}}) = e({{P_1}}, {{G_2}})"
])
self.pairing2 = MathTex(r"e({{P_1}}, {{Q_0}}) = e({{P_2}}, {{G_2}})", font_size=40, color=SECONDARY_COLOR)
self.vector_k = TexArray(PARTICIPANT_N, 3)
self.title_label.to_edge(UP)
self.header_label.next_to(self.title_label, DOWN, buff=0.6)
self.subheader_label.next_to(self.header_label, DOWN, buff=0.3)
Expand All @@ -84,17 +90,20 @@ def construct(self):
self.arrows_g2 = self.generate_arrows(self.vec_g2)
self.pairing1.next_to(self.vec_g2, DOWN, buff=0.5)
self.pairing2.next_to(self.vec_g2, DOWN, buff=0.5)
self.vector_k.next_to(self.title, DOWN, buff=0.8)

def animate_in(self, scene):
self.new_subsection(scene, "intro to verification", "data/sound/episode3/slide6-0.mp3")
scene.play(Write(self.title_label))
self.new_subsection(scene, "not the powers of tau", "data/sound/episode3/slide6-1.mp3")
scene.play(Write(self.vector_k))
self.new_subsection(scene, "not powers of tau", "data/sound/episode3/slide6-2.mp3")
scene.play(Write(self.header_label))
scene.play(Write(self.subheader_label))
scene.play(FadeIn(self.vec_g1))
scene.play(FadeIn(self.vec_g2))
scene.play(FadeIn(self.arrows_g1[0]))
self.new_subsection(scene, "pairing", "data/sound/episode3/slide6-2.mp3")
self.new_subsection(scene, "pairing", "data/sound/episode3/slide6-3.mp3")
self.pairing1.animate_first(scene)
self.vec_g1.animate_transform_matching_shapes(scene, SETUP_WITH_TAU_G1)
self.vec_g2.animate_transform_matching_shapes(scene, SETUP_WITH_TAU_G2)
Expand All @@ -105,7 +114,7 @@ def animate_in(self, scene):

scene.play(FadeOut(self.arrows_g1[0]))
self.pairing1.animate_out(scene)

self.new_subsection(scene, "calculations correct", "data/sound/episode3/slide6-4.mp3")
scene.play(Write(self.arrows_g1[1]))
scene.play(Write(self.pairing2))
scene.play(Unwrite(self.pairing2))
Expand Down
5 changes: 5 additions & 0 deletions zkmarek/video/slides/episode3/ceremony_verification_2.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,25 @@ def construct(self):
self.pairing.next_to(self.vec_next, DOWN, buff=0.5)

def animate_in(self, scene):
self.new_subsection(scene, "another array", "data/sound/episode3/slide7-0.mp3")
scene.play(Write(self.title_label))
scene.play(Write(self.header_label))
scene.play(Write(self.subheader_label))


scene.play(FadeIn(self.vec_g1_current))
scene.play(FadeIn(self.tau_current))
self.new_subsection(scene, "P i+1", "data/sound/episode3/slide7-1.mp3")
self.vec_g1_current.animate_transform_matching_shapes(scene, SETUP_CURRENT_2)

scene.play(FadeIn(self.vec_next))
scene.play(FadeIn(self.tau_next))
scene.play(FadeIn(self.arrow))
self.new_subsection(scene, "verify", "data/sound/episode3/slide7-2.mp3")
self.pairing.animate_first(scene)
self.new_subsection(scene, "pairings", "data/sound/episode3/slide7-3.mp3")
self.pairing.animate_rest(scene)
self.new_subsection(scene, "verification", "data/sound/episode3/slide7-4.mp3")
self.pairing.animate_out(scene)

scene.play(FadeOut(self.vec_g1_current),
Expand Down
4 changes: 2 additions & 2 deletions zkmarek/video/slides/episode3/introduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ def animate_in(self, scene):

self.new_subsection(scene, "no one knows", "data/sound/episode3/slide1-2.mp3")
scene.play(FadeIn(self.question))
scene.wait(3)
scene.wait(2)
scene.play(FadeOut(self.question))
self.new_subsection(scene, "calculate polynomial", "data/sound/episode3/slide1-3.mp3")
self.person_wthumb.generate_target()
self.person_wthumb.target.shift(RIGHT*4+DOWN).scale(2)
scene.play(MoveToTarget(self.person_wthumb))

scene.play(FadeIn(self.polynomial))
scene.wait(0.5)
scene.wait(0.7)
scene.play(TransformMatchingShapes(VGroup(self.tau, self.polynomial), self.polynomial2))

scene.wait(0.5)
Expand Down
2 changes: 1 addition & 1 deletion zkmarek/video/slides/episode3/pairing.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def animate_in(self, scene):
scene.play(FadeOut(self.brace1, self.brace2), FadeOut(self.brace1_label))

scene.play(FadeIn(self.brace3))
scene.play(FadeIn(self.brace3_label))
scene.play(FadeIn(self.brace3_label), Indicate(self.definition[6], color = HIGHLIGHT_COLOR))
scene.play(FadeOut(self.brace3), FadeOut(self.brace3_label))
scene.wait(3.3)
scene.play(Indicate(self.definition[0], color = HIGHLIGHT_COLOR, scale_factor=2))
Expand Down
8 changes: 4 additions & 4 deletions zkmarek/video/slides/episode3/trusted_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def construct(self):

self.person1 = person.copy().shift(2*LEFT)
self.person2 = person.copy().shift(2*RIGHT)
self.person3 = person.copy().shift(UP)
self.person4 = person.copy().shift(DOWN)
self.person3 = person.copy().shift(1.5*UP)
self.person4 = person.copy().shift(1.5*DOWN)

self.tau_number = MathTex(r"\tau", font_size=80, color = SECONDARY_COLOR).shift(DOWN)

Expand Down Expand Up @@ -104,9 +104,9 @@ def animate_in(self, scene):
scene.wait(3)
scene.play(Indicate(self.vector_g2[0][1], color = HIGHLIGHT_COLOR), Indicate(self.vector_g1[0][1], color = HIGHLIGHT_COLOR))
self.vector_g1.animate_transform_matching_shapes(scene, SETUP_G1_3)
self.vector_g2.animate_transform_matching_shapes(scene, SETUP_G2_2)
self.new_subsection(scene, "there are ec points", "data/sound/episode3/slide4-3.mp3")

self.new_subsection(scene, "there are ec points", "data/sound/episode3/slide4-3.mp3")
self.vector_g2.animate_transform_matching_shapes(scene, SETUP_G2_2)
scene.wait(4.5)


0 comments on commit bed5458

Please sign in to comment.