add animation

7 files changed, 60 insertions, 24 deletions

diff --git a/src/scenes/flirtingwithfunctions.meta b/src/scenes/flirtingwithfunctions.meta
new file mode 100644
index 0000000..8c541b0
--- /dev/null
+++ b/src/scenes/flirtingwithfunctions.meta
@@ -0,0 +1,5 @@
+{
+  "version": 0,
+  "timeEvents": [],
+  "seed": 487503470
+}
\ No newline at end of file
diff --git a/src/scenes/flirtingwithfunctions.tsx b/src/scenes/flirtingwithfunctions.tsx
new file mode 100644
index 0000000..ede0df9
--- /dev/null
+++ b/src/scenes/flirtingwithfunctions.tsx
@@ -0,0 +1,33 @@
+import { Img, Layout, Txt, Video, makeScene2D } from "@motion-canvas/2d";
+import {
+  Direction,
+  beginSlide,
+  createRef,
+  map,
+  slideTransition,
+  tween,
+} from "@motion-canvas/core";
+import { theme } from "../theme";
+import sad from "../../public/img/sad.mp4";
+import emacsmac from "../../public/img/emacsmac.jpg";
+
+export default makeScene2D(function* (view) {
+  const vid = createRef<Video>();
+  const img = createRef<Img>();
+  const startX = 1200;
+  const endX = 300;
+
+  view.add(<Video width={300} ref={vid} src={sad} x={0} />);
+  view.add(<Img width={200} ref={img} src={emacsmac} x={startX} />);
+
+  vid().loop(true);
+  vid().play();
+
+  yield* beginSlide("No Valentine");
+
+  yield* tween(4.2, (val) => {
+    img().position.x(map(startX, endX, val));
+  });
+
+  yield* beginSlide("Going To The Doctor");
+});
diff --git a/src/scenes/index.ts b/src/scenes/index.ts
index 935fb95..098563b 100644
--- a/src/scenes/index.ts
+++ b/src/scenes/index.ts
@@ -1,5 +1,6 @@
 import title from "./title?scene";
 import me from "./me?scene";
-import itinerary from "./itinerary?scene";
+import partone from "./partone?scene";
+import flirtingwithfunctions from "./flirtingwithfunctions?scene";
 
-export const scenes = [title, me, itinerary];
+export const scenes = [flirtingwithfunctions, title, me, partone];
diff --git a/src/scenes/itinerary.meta b/src/scenes/itinerary.meta
index 5cfc098..0e33e3f 100644
--- a/src/scenes/itinerary.meta
+++ b/src/scenes/itinerary.meta
@@ -1,5 +1,3 @@
 {
-  "version": 0,
-  "timeEvents": [],
-  "seed": 2742200033
+  "version": 0
 }
\ No newline at end of file
diff --git a/src/scenes/me.tsx b/src/scenes/me.tsx
index 6c47860..00f3914 100644
--- a/src/scenes/me.tsx
+++ b/src/scenes/me.tsx
@@ -39,16 +39,16 @@ export default makeScene2D(function* (view) {
             .
           </Txt>
           <Txt fontFamily={theme.font} fill={theme.text.hex}>
-            I love 😍
+            {"=>"} I {"<3"} Functional Programming λ.
           </Txt>
           <Txt fontFamily={theme.font} fill={theme.text.hex}>
-            {"=>"} Common LISP
+            {"=>"} I've been a student networking{"\n"}software engineer here at
+            USU
+            {"\n"}
+            for over 1.5 years.
           </Txt>
           <Txt fontFamily={theme.font} fill={theme.text.hex}>
-            {"=>"} Elixir
-          </Txt>
-          <Txt fontFamily={theme.font} fill={theme.text.hex}>
-            {"=>"} Functional Programming
+            {"=>"} I'm an SDE at AWS starting{"\n"}soon in Seattle.
           </Txt>
         </Node>
       </Layout>
@@ -56,12 +56,12 @@ export default makeScene2D(function* (view) {
       <Txt opacity={0} ref={src} fontFamily={theme.font} fill={theme.green.hex}>
         git.simponic.xyz/simponic/compiling-the-lambda-calculus
       </Txt>
-    </>
+    </>,
   );
 
   yield img().fill(img().getColorAtPoint(0));
 
-  const diff = 370;
+  const diff = 380;
   yield* all(
     img().size([450, 450], 1),
     img().radius(50, 1),
@@ -70,7 +70,7 @@ export default makeScene2D(function* (view) {
     node().opacity(1, 1),
     layout().position.x(diff, 1),
     src().opacity(1, 1),
-    src().position.y(275, 1)
+    src().position.y(290, 1),
   );
 
   yield* beginSlide("About Me");
diff --git a/src/scenes/partone.meta b/src/scenes/partone.meta
new file mode 100644
index 0000000..5cfc098
--- /dev/null
+++ b/src/scenes/partone.meta
@@ -0,0 +1,5 @@
+{
+  "version": 0,
+  "timeEvents": [],
+  "seed": 2742200033
+}
\ No newline at end of file
diff --git a/src/scenes/itinerary.tsx b/src/scenes/partone.tsx
index c480b7f..aaf0187 100644
--- a/src/scenes/itinerary.tsx
+++ b/src/scenes/partone.tsx
@@ -1,11 +1,5 @@
 import { Layout, Txt, makeScene2D } from "@motion-canvas/2d";
-import {
-  Direction,
-  beginSlide,
-  fadeTransition,
-  slideTransition,
-  waitFor,
-} from "@motion-canvas/core";
+import { Direction, beginSlide, slideTransition } from "@motion-canvas/core";
 import { theme } from "../theme";
 
 export default makeScene2D(function* (view) {
@@ -15,11 +9,11 @@ export default makeScene2D(function* (view) {
         Part One
       </Txt>
       <Txt fontFamily={theme.font} fill={theme.text.hex}>
-        Exploring the Functional Programming World
+        Flirting With Functions
       </Txt>
-    </Layout>
+    </Layout>,
   );
 
   yield* slideTransition(Direction.Right);
-  yield* beginSlide("hi");
+  yield* beginSlide("Part One");
 });