From c18b81b2f26123481558cb3fffc794c2c13f74ad Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Thu, 8 Feb 2024 15:43:45 -0700 Subject: maintenance --- src/components/function_box.tsx | 9 ++++----- src/scenes/doctor.meta | 5 +++++ src/scenes/doctor.tsx | 5 +++-- src/scenes/first_box.meta | 5 +++++ src/scenes/first_box.tsx | 5 ++--- src/scenes/flirtingwithfunctions.meta | 2 +- src/scenes/flirtingwithfunctions.tsx | 15 ++++++++++++--- src/scenes/index.ts | 4 ++-- src/scenes/me.meta | 2 +- src/scenes/partone.meta | 2 +- src/scenes/title.meta | 2 +- 11 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 src/scenes/doctor.meta create mode 100644 src/scenes/first_box.meta (limited to 'src') diff --git a/src/components/function_box.tsx b/src/components/function_box.tsx index 3c65062..e046d63 100644 --- a/src/components/function_box.tsx +++ b/src/components/function_box.tsx @@ -253,11 +253,9 @@ export class FunctionBox extends Node { } public *propogateOutput(duration: number) { - const opacityChangeDuration = 0.1; - const output = this.function(...this.currentArgs.map((input) => input.val)); if (typeof output === "function") { - yield this.output().add( + this.output().add( , ); } else { - yield this.output().add( + this.output().add( {output.toString()} , ); } + yield* this.boxMoji().text(this.idlingText, duration); + yield* all( - this.boxMoji().text(this.idlingText, duration), this.outputSegment().points( [ { x: -this.delta, y: 0 }, diff --git a/src/scenes/doctor.meta b/src/scenes/doctor.meta new file mode 100644 index 0000000..40b6546 --- /dev/null +++ b/src/scenes/doctor.meta @@ -0,0 +1,5 @@ +{ + "version": 0, + "timeEvents": [], + "seed": 3717956216 +} \ No newline at end of file diff --git a/src/scenes/doctor.tsx b/src/scenes/doctor.tsx index 4b6c483..ded1617 100644 --- a/src/scenes/doctor.tsx +++ b/src/scenes/doctor.tsx @@ -30,19 +30,20 @@ Yes, hmmm... so, do you really think this is so? export default makeScene2D(function* (view) { const block = createRef(); + let currentConversation = conversation[0] + "\n"; - yield view.add( + view.add( , ); yield* slideTransition(Direction.Right); - let currentConversation = conversation[0] + "\n"; let id = 0; for (const line of conversation.slice(1)) { yield* block().edit(1.2, false)`${currentConversation}${insert( diff --git a/src/scenes/first_box.meta b/src/scenes/first_box.meta new file mode 100644 index 0000000..60a646a --- /dev/null +++ b/src/scenes/first_box.meta @@ -0,0 +1,5 @@ +{ + "version": 0, + "timeEvents": [], + "seed": 2023703521 +} \ No newline at end of file diff --git a/src/scenes/first_box.tsx b/src/scenes/first_box.tsx index 5508a41..b3957af 100644 --- a/src/scenes/first_box.tsx +++ b/src/scenes/first_box.tsx @@ -36,10 +36,9 @@ export default makeScene2D(function* (view) { yield* beginSlide("Add Inputs " + inputId); yield* functionBox().propogateInput(0.5); - yield* waitFor(0.3); - yield* functionBox().propogateOutput(0.5); + yield* beginSlide("Propogate Inputs " + inputId); + yield* functionBox().propogateOutput(0.5); yield* beginSlide("Propogate Outputs of " + inputId); - yield* beginSlide("Propogate Outputs of 1" + inputId); } }); diff --git a/src/scenes/flirtingwithfunctions.meta b/src/scenes/flirtingwithfunctions.meta index 8c541b0..a22f292 100644 --- a/src/scenes/flirtingwithfunctions.meta +++ b/src/scenes/flirtingwithfunctions.meta @@ -1,5 +1,5 @@ { "version": 0, "timeEvents": [], - "seed": 487503470 + "seed": 1241573774 } \ No newline at end of file diff --git a/src/scenes/flirtingwithfunctions.tsx b/src/scenes/flirtingwithfunctions.tsx index 7f5f9da..603ffc4 100644 --- a/src/scenes/flirtingwithfunctions.tsx +++ b/src/scenes/flirtingwithfunctions.tsx @@ -1,5 +1,12 @@ import { Img, Video, makeScene2D } from "@motion-canvas/2d"; -import { beginSlide, createRef, map, tween } from "@motion-canvas/core"; +import { + Direction, + beginSlide, + createRef, + map, + slideTransition, + tween, +} from "@motion-canvas/core"; import sad from "../../public/img/sad.mp4"; import emacsmac from "../../public/img/emacsmac.jpg"; @@ -9,8 +16,10 @@ export default makeScene2D(function* (view) { const startX = 1200; const endX = 300; - yield view.add(