fix: animation and sound, locally

patreeceeo · Aug 8, 2022 · ccbfd7b · ccbfd7b
1 parent 6393d5d
commit ccbfd7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/assets/elm/Main.elm b/assets/elm/Main.elm
@@ -45,6 +45,7 @@ main =
 
 
 -- MODEL
+-- Wrap parameters to init in abstract types so that init itself is testable
 
 
 wrapInit : (firstArg -> Maybe Url -> Utils.TestableNavKey -> ( Model, Cmd Message )) -> firstArg -> Url -> Browser.Navigation.Key -> ( Model, Cmd Message )
@@ -152,7 +153,7 @@ contextualize msg model =
                     Router.currentRoute model.router
 
                 millisSinceKeyDown =
-                    OS.milisSinceKeyDown KbdEvent.KeySpace model.os
+                    OS.milisSinceKeyDown event.key model.os
 
                 volume =
                     User.Interface.intensityOfKeyPress millisSinceKeyDown
@@ -215,8 +216,8 @@ interpret msg context =
                 _ ->
                     [ msg ]
 
-        ( Message.KeyUp _, WithRouteVolumeVoiceIndexAndPitch MainRoute volume voiceIndex intensityOfPress ) ->
-            [ msg, Message.PlayNote volume voiceIndex intensityOfPress ]
+        ( Message.KeyUp _, WithRouteVolumeVoiceIndexAndPitch MainRoute volume voiceIndex pitch ) ->
+            [ msg, Message.PlayNote volume voiceIndex pitch ]
 
         ( Message.KeyDown _, WithRouteAndSequenceItem SelectChordRoute chord ) ->
             [ msg, Message.SelectChord chord ]
@@ -479,8 +480,8 @@ mapUIInstrument update_ msg taggedModel selectors =
 subscriptions : Model -> Sub Message
 subscriptions model =
     Sub.batch
-        -- [ Browser.Events.onAnimationFrame Message.AnimationFrame
-        [ Browser.Events.onResize (\w _ -> Message.WindowResize w)
+        [ Browser.Events.onAnimationFrame Message.AnimationFrame
+        , Browser.Events.onResize (\w _ -> Message.WindowResize w)
         , Browser.Events.onVisibilityChange Message.VisibilityChange
         , Browser.Events.onKeyDown (KbdEvent.decode |> D.map Message.KeyDown)
         , Browser.Events.onKeyUp (KbdEvent.decode |> D.map Message.KeyUp)

diff --git a/assets/elm/UserInterfaces.elm b/assets/elm/UserInterfaces.elm
@@ -315,16 +315,16 @@ viewString voice index time msgForMouseOver =
         , Sattr.stroke "rgba(255, 255, 255, 0.5)"
         , Sattr.fill "none"
         , onMouseOver msgForMouseOver
+        , Sattr.class "string"
         , Sattr.id ("instrument-voice-" ++ String.fromInt index)
         ]
         [ viewStringAnimation voice index time ]
 
 
 viewStrings : Instrument.Model -> OS.Model -> (Int -> MouseEvent.Model -> msg) -> List (Svg.Svg msg)
 viewStrings instrumentModel osModel msgForMouseOver =
-    List.indexedMap
-        (\index voice -> viewString voice index osModel.timeInMillis (msgForMouseOver index))
-        (Array.toList instrumentModel.voices)
+    Array.toList instrumentModel.voices
+        |> List.indexedMap (\index voice -> viewString voice index osModel.timeInMillis (msgForMouseOver index))
 
 
 viewDebugVoiceNote : Int -> ( Int, Float ) -> Svg.Svg msg