diff --git a/package-lock.json b/package-lock.json index 4ccc7ba..2193e00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,13 +8,13 @@ "name": "compilinglambda", "version": "0.0.0", "dependencies": { - "@motion-canvas/2d": "^3.14.0", - "@motion-canvas/core": "^3.14.0", - "@motion-canvas/ffmpeg": "^1.1.0" + "@motion-canvas/2d": "^3.14.1", + "@motion-canvas/core": "^3.14.1", + "@motion-canvas/ffmpeg": "^1.1.1" }, "devDependencies": { - "@motion-canvas/ui": "^3.14.0", - "@motion-canvas/vite-plugin": "^3.14.0", + "@motion-canvas/ui": "^3.14.1", + "@motion-canvas/vite-plugin": "^3.14.1", "typescript": "^5.2.2", "vite": "^4.0.0" } @@ -587,9 +587,9 @@ ] }, "node_modules/@motion-canvas/2d": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/@motion-canvas/2d/-/2d-3.14.1.tgz", - "integrity": "sha512-9bwpp/3bbaXycK4yGY2pD1qyZuHmVcf+cgMAhw9Xu/QSMbElh68u5bguN6AXLpaRxAWWLu9lGtf6Pws7tRgv4g==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/@motion-canvas/2d/-/2d-3.14.2.tgz", + "integrity": "sha512-SaOU0gL9RjUsIRCwNwPo/DLvcLKNPfVylfUcynSocOE6bSjsHrd8ZVNumf4X9Bedf9dxajrWf44eMBNCLQpJyg==", "dependencies": { "@motion-canvas/core": "^3.14.1", "code-fns": "^0.8.2", @@ -622,9 +622,9 @@ } }, "node_modules/@motion-canvas/ui": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/@motion-canvas/ui/-/ui-3.14.1.tgz", - "integrity": "sha512-6HLqzDnLUVyURGVl8hFvq6AOirlxz0ROnQlEgBiryRmdmJ/eSrZ3nVpxVCP2fp8AJ2f2KwHBNtwXyLv+xq1Uyw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/@motion-canvas/ui/-/ui-3.14.2.tgz", + "integrity": "sha512-5KujeAd+cE88ZTLlnAzvSkKvRx87z/NhBYZo5PLIls2+Z/LdllEvhiEaZfGJuXz8ZZ0f93osDrQmlpB4LI+V7Q==", "dev": true, "dependencies": { "@motion-canvas/core": "^3.14.1", @@ -705,9 +705,9 @@ } }, "node_modules/@types/chroma-js": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-2.4.3.tgz", - "integrity": "sha512-1ly5ly/7S/YF8aD7MxUQnFOZxdegimuOunJl0xDsLlguu5JrwuSTVGVH3UpIUlh6YauI0RMNT4cqjBonhgbdIQ==" + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-2.4.4.tgz", + "integrity": "sha512-/DTccpHTaKomqussrn+ciEvfW4k6NAHzNzs/sts1TCqg333qNxOhy8TNIoQCmbGG3Tl8KdEhkGAssb1n3mTXiQ==" }, "node_modules/@types/hast": { "version": "2.3.10", @@ -834,9 +834,9 @@ } }, "node_modules/fastq": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz", - "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dependencies": { "reusify": "^1.0.4" } @@ -1047,9 +1047,9 @@ } }, "node_modules/postcss": { - "version": "8.4.33", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", - "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", + "version": "8.4.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", + "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", "funding": [ { "type": "opencollective", @@ -1074,9 +1074,9 @@ } }, "node_modules/preact": { - "version": "10.19.3", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz", - "integrity": "sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==", + "version": "10.19.4", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.4.tgz", + "integrity": "sha512-dwaX5jAh0Ga8uENBX1hSOujmKWgx9RtL80KaKUFLc6jb4vCEAc3EeZ0rnQO/FO4VgjfPMfoLFWnNG8bHuZ9VLw==", "dev": true, "funding": { "type": "opencollective", diff --git a/package.json b/package.json index 8b20ec9..06fd628 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,13 @@ "build": "tsc && vite build" }, "dependencies": { - "@motion-canvas/core": "^3.14.0", - "@motion-canvas/2d": "^3.14.0", - "@motion-canvas/ffmpeg": "^1.1.0" + "@motion-canvas/core": "^3.14.1", + "@motion-canvas/2d": "^3.14.1", + "@motion-canvas/ffmpeg": "^1.1.1" }, "devDependencies": { - "@motion-canvas/ui": "^3.14.0", - "@motion-canvas/vite-plugin": "^3.14.0", + "@motion-canvas/ui": "^3.14.1", + "@motion-canvas/vite-plugin": "^3.14.1", "typescript": "^5.2.2", "vite": "^4.0.0" } 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(