summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElizabeth Hunt <elizabeth.hunt@simponic.xyz>2024-02-08 15:43:45 -0700
committerElizabeth Hunt <elizabeth.hunt@simponic.xyz>2024-02-08 15:43:45 -0700
commitc18b81b2f26123481558cb3fffc794c2c13f74ad (patch)
tree0e459406338ce835294989865b50e989fcf9c30c /src
parent93dd6c53f14979ec92144ffb55606ad83eac5af6 (diff)
downloadcompiling-the-lambda-calculus-c18b81b2f26123481558cb3fffc794c2c13f74ad.tar.gz
compiling-the-lambda-calculus-c18b81b2f26123481558cb3fffc794c2c13f74ad.zip
maintenance
Diffstat (limited to 'src')
-rw-r--r--src/components/function_box.tsx9
-rw-r--r--src/scenes/doctor.meta5
-rw-r--r--src/scenes/doctor.tsx5
-rw-r--r--src/scenes/first_box.meta5
-rw-r--r--src/scenes/first_box.tsx5
-rw-r--r--src/scenes/flirtingwithfunctions.meta2
-rw-r--r--src/scenes/flirtingwithfunctions.tsx15
-rw-r--r--src/scenes/index.ts4
-rw-r--r--src/scenes/me.meta2
-rw-r--r--src/scenes/partone.meta2
-rw-r--r--src/scenes/title.meta2
11 files changed, 37 insertions, 19 deletions
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(
<FunctionBox
opacity={0}
isChild={true}
@@ -266,15 +264,16 @@ export class FunctionBox extends Node {
></FunctionBox>,
);
} else {
- yield this.output().add(
+ this.output().add(
<Txt fontFamily={theme.font} fontSize={30} fill={theme.text.hex}>
{output.toString()}
</Txt>,
);
}
+ 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<CodeBlock>();
+ let currentConversation = conversation[0] + "\n";
- yield view.add(
+ view.add(
<CodeBlock
fontFamily={theme.font}
language="markdown"
ref={block}
fontSize={20}
+ code={currentConversation}
></CodeBlock>,
);
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(<Video width={300} ref={vid} src={sad} x={0} />);
- yield view.add(<Img width={200} ref={img} src={emacsmac} x={startX} />);
+ view.add(<Video width={300} ref={vid} src={sad} x={0} />);
+ view.add(<Img width={200} ref={img} src={emacsmac} x={startX} />);
+
+ yield* slideTransition(Direction.Right);
yield vid().play();
yield vid().loop(true);
diff --git a/src/scenes/index.ts b/src/scenes/index.ts
index ffce8a4..56fda2b 100644
--- a/src/scenes/index.ts
+++ b/src/scenes/index.ts
@@ -2,8 +2,8 @@ import title from "./title?scene";
import me from "./me?scene";
import partone from "./partone?scene";
import flirtingwithfunctions from "./flirtingwithfunctions?scene";
-import doctor from "./doctor";
-import first_box from "./first_box";
+import doctor from "./doctor?scene";
+import first_box from "./first_box?scene";
export const scenes = [
title,
diff --git a/src/scenes/me.meta b/src/scenes/me.meta
index 9dba6ec..97f973d 100644
--- a/src/scenes/me.meta
+++ b/src/scenes/me.meta
@@ -1,5 +1,5 @@
{
"version": 0,
"timeEvents": [],
- "seed": 3928486110
+ "seed": 1659460094
} \ No newline at end of file
diff --git a/src/scenes/partone.meta b/src/scenes/partone.meta
index 5cfc098..ffebcea 100644
--- a/src/scenes/partone.meta
+++ b/src/scenes/partone.meta
@@ -1,5 +1,5 @@
{
"version": 0,
"timeEvents": [],
- "seed": 2742200033
+ "seed": 2918980577
} \ No newline at end of file
diff --git a/src/scenes/title.meta b/src/scenes/title.meta
index 011b988..32aa709 100644
--- a/src/scenes/title.meta
+++ b/src/scenes/title.meta
@@ -1,5 +1,5 @@
{
"version": 0,
"timeEvents": [],
- "seed": 3229939754
+ "seed": 294700475
} \ No newline at end of file