Merge wasd, arrows and new numpad library to signals

chendrix · Jun 22, 2015 · b7ed83d · b7ed83d
1 parent c3148e6
commit b7ed83d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/elm-package.json b/elm-package.json
@@ -12,7 +12,8 @@
     "dependencies": {
         "elm-lang/core": "2.0.1 <= v < 3.0.0",
         "deadfoxygrandpa/Elm-Test" : "1.0.4 <= v < 2.0.0",
-        "maxsnew/IO" : "0.1.5 <= v < 2.0.0"
+        "maxsnew/IO" : "0.1.5 <= v < 2.0.0",
+        "chendrix/elm-numpad" : "1.0.1 <= v < 2.0.0"
     },
     "elm-version": "0.15.0 <= v < 0.16.0"
 }
diff --git a/src/Rogue.elm b/src/Rogue.elm
@@ -1,7 +1,7 @@
 module Rogue where
 
 import Keyboard
-import Time exposing (..)
+import Numpad
 
 import Rogue.Model exposing (..)
 import Rogue.Update exposing (..)
@@ -12,16 +12,14 @@ import Rogue.View exposing (..)
 main =
   Signal.map view gameState
 
-
 gameState : Signal Game
 gameState =
   Signal.foldp update defaultGame input
 
-
-delta =
-  Signal.map inSeconds (fps 35)
-
-
 input : Signal Input
 input =
-  Signal.map Input Keyboard.wasd
+  Signal.map Input <| Signal.mergeMany
+    [ Keyboard.wasd
+    , Keyboard.arrows
+    , Numpad.numpad
+    ]