feat(effect): Implement map function (#56)

tommy-xr · Oct 4, 2024 · 0abfe6e · 0abfe6e
1 parent 03f115a
commit 0abfe6e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/examples/hello/hello.fs b/examples/hello/hello.fs
@@ -38,8 +38,8 @@ module Model =
     }
 
 type Msg =
-    | MovePaddle1 of float
-    | MovePaddle2 of float
+    | MovePaddle1
+    | MovePaddle2
 
 let game: Game<Model, Msg> = GameBuilder.local Model.initial
 
@@ -74,7 +74,7 @@ let tick model (tick: Time.FrameTime) =
         |> handleCollisionWithPaddle model.paddle1 
         |> handleCollisionWithPaddle model.paddle2)
 
-    ( { model with ball = newBall; counter = model.counter + 3 }, Effect.none () ) 
+    ( { model with ball = newBall; counter = model.counter + 3 }, Effect.wrapped (MovePaddle2) |> Effect.map(fun _a -> MovePaddle1)  ) 
 
 open Fable.Core.Rust
 
@@ -85,6 +85,7 @@ let init (_args: array<string>) =
     game
     |> GameBuilder.draw3d (fun world frameTime -> 
 
+        let eff = Effect.wrapped (MovePaddle2) |> Effect.map (fun _a -> MovePaddle1);
         let colorMaterial = Material.color(0.0f, 1.0f, 0.0f, 1.0f);
         let textureMaterial = Material.texture( Texture.file("vr_glove_color.jpg"));
         // let barrelModel = Model.file("ExplodingBarrel.glb");

diff --git a/runtime/functor-runtime-common/src/effect.rs b/runtime/functor-runtime-common/src/effect.rs
@@ -1,3 +1,5 @@
+use fable_library_rust::Native_::Func1;
+
 #[derive(Clone)]
 pub enum Effect<T: Clone + 'static> {
     None,
@@ -12,4 +14,11 @@ impl<T: Clone + 'static> Effect<T> {
     pub fn wrapped(data: T) -> Effect<T> {
         Effect::Wrapped(data)
     }
+
+    pub fn map<U: Clone + 'static>(mapping: Func1<T, U>, source: Effect<T>) -> Effect<U> {
+        match source {
+            Effect::None => Effect::None,
+            Effect::Wrapped(v) => Effect::Wrapped(mapping(v)),
+        }
+    }
 }
diff --git a/src/Functor.Game/Effect.fs b/src/Functor.Game/Effect.fs
@@ -3,9 +3,14 @@ open Fable.Core
 
 [<Erase; Emit("functor_runtime_common::Effect<$0>")>] type effect<'msg> = | Noop
 
+
 module Effect = 
+
     [<Emit("functor_runtime_common::Effect::none()")>]
     let none (): effect<_> = nativeOnly
 
     [<Emit("functor_runtime_common::Effect::wrapped($0)")>]
-    let wrapped a: 'a -> effect<'a> = nativeOnly
+    let wrapped (a: 'a) :  effect<'a> = nativeOnly
+
+    [<Emit("functor_runtime_common::Effect::map($0, $1)")>]
+    let map (fn: 'a -> 'b)  (eff: effect<'a>) : effect<'b> = nativeOnly
diff --git a/src/Functor.Game/Runtime.fs b/src/Functor.Game/Runtime.fs
@@ -95,7 +95,15 @@ module Runtime
             member this.setState(incomingState) =
                 state <- OpaqueState.unsafe_coerce incomingState
             member this.tick(frameTime: Time.FrameTime) = 
+
+                // Todo: If first frame, run 'init'
+
+                // Todo: Run any pending effects
+
                 let (newState, effects) = GameRunner.tick myGame state frameTime
+
+                // Todo: Run tick effects
+
                 state <- newState
                 ()
             member this.render(frameTime: Time.FrameTime) =