wip

Author: macrozone

elm-package.json

@@ -1,17 +1,21 @@
 {
-  "version": "1.0.0",
-  "summary": "A functional reactive implementation of Terry Cavanagh's game Hexagon in Elm",
-  "repository": "https://github.com/sbaechler/polygon.git",
-  "license": "BSD3",
-  "source-directories": [
-    "src",
-    "../elm-audio"
-  ],
-  "native-modules": true,
-  "exposed-modules": [],
-  "dependencies": {
-    "elm-lang/core": "3.0.0 <= v < 4.0.0",
-    "jwmerrill/elm-animation-frame": "1.0.5 <= v < 2.0.0"
-  },
-  "elm-version": "0.16.0 <= v < 0.17.0"
+    "version": "1.0.0",
+    "summary": "A functional reactive implementation of Terry Cavanagh's game Hexagon in Elm",
+    "repository": "https://github.com/sbaechler/polygon.git",
+    "license": "All rights reserved",
+    "source-directories": [
+        "src",
+        "lib/elm-audio/src"
+    ],
+    "exposed-modules": [],
+    "native-modules": true,
+    "dependencies": {
+        "elm-lang/animation-frame": "1.0.0 <= v < 2.0.0",
+        "elm-lang/core": "4.0.0 <= v < 5.0.0",
+        "elm-lang/html": "1.0.0 <= v < 2.0.0",
+        "elm-lang/window": "1.0.0 <= v < 2.0.0",
+        "evancz/elm-graphics": "1.0.0 <= v < 2.0.0",
+        "ohanhi/keyboard-extra": "1.0.1 <= v < 2.0.0"
+    },
+    "elm-version": "0.17.0 <= v < 0.18.0"
 }

package.json

@@ -1,11 +1,11 @@
 {
   "private": true,
   "scripts": {
-    "build": "elm-make --yes src/Game.elm --output=./elm.js && cp index.template.html index.html",
-    "watch": "node watch.js",
-    "server": "python -m SimpleHTTPServer 5000"
+    "build": "elm-make src/Hexagon.elm --output=public/index.html",
+    "server": "elm-reactor",
+    "setup": "elm-package install && git submodule update --init"
   },
   "dependencies": {
-    "watch": "^0.16.0"
+    "elm": "^0.17.0"
   }
 }

src/Hexagon.elm

@@ -1,25 +1,30 @@
-module Game where
-import Time exposing ( .. )
+import Time exposing (..)
+import List exposing (..)
 import AnimationFrame
-import Keyboard
+import Keyboard.Extra as Keyboard
 import Window
-import Graphics.Collage exposing (..)
-import Graphics.Element exposing (..)
+import Collage exposing (..)
+import Element exposing (..)
 import Color exposing (..)
-
+import Html.App as App
+import Html
 -- MODEL
 
+
+
+type Msg
+  = Step Time
+  | KeyboardExtraMsg Keyboard.Msg
+  | Noop
+
 type alias Player =
   { angle: Float }
 
-type alias Input =
-  { space : Bool
-  , dir : Int
-  }
-
 type alias Game =
   { 
     player : Player
+  , direction : Int
+  , keyboardModel : Keyboard.Model
   }
 
 (gameWidth, gameHeight) = (1024, 576) -- 16:9
@@ -29,13 +34,6 @@ type alias Game =
 playerRadius : Float
 playerRadius = gameWidth / 10.0
 
--- The global game state
-
-defaultGame : Game
-defaultGame =
-  { 
-    player = Player (degrees 30)
-  }
 
 -- UPDATE
 
@@ -51,20 +49,45 @@ updatePlayerAngle angle dir =
     else
       newAngle
 
-updatePlayer: Input -> Game -> Player
-updatePlayer {dir} {player} =
+updatePlayer: Int -> Game -> Player
+updatePlayer dir {player} =
   let
     newAngle = updatePlayerAngle player.angle dir
   in
     { player | angle = newAngle }
 
--- Game loop: Transition from one state to the next.
-update : (Time, Input) -> Game -> Game
-update (timestamp, input) game =
- 
-  { game |
-      player = updatePlayer input game
-  }
+
+{-| Updates the game state on a keyboard command -}
+onUserInput : Keyboard.Msg -> Game -> (Game, Cmd Msg)
+onUserInput keyMsg game =
+  let
+    ( keyboardModel, keyboardCmd ) =
+      Keyboard.update keyMsg game.keyboardModel
+  in
+    ( { game | keyboardModel = keyboardModel
+             , direction = (Keyboard.arrows keyboardModel).x
+      }
+    , Cmd.map KeyboardExtraMsg keyboardCmd )
+
+{-| Updates the game state on every frame -}
+onFrame : Time -> Game -> (Game, Cmd Msg)
+onFrame time game =
+  let
+    nextCmd = Cmd.none
+  in
+    ( { game |
+        player = updatePlayer game.direction game
+    }, nextCmd )
+
+
+{-| Game loop: Transition from one state to the next. -}
+update : Msg -> Game -> (Game, Cmd Msg)
+update msg game =
+  case msg of
+    KeyboardExtraMsg keyMsg -> onUserInput keyMsg game
+    Step time -> onFrame time game
+    _ -> (game, Cmd.none)
+
 
 -- VIEW
 
@@ -86,33 +109,50 @@ makePlayer player =
       |> moveRadial angle (playerRadius - 10)
       |> rotate angle
 
-view : (Int,Int) -> Game -> Element
-view (w, h) game =
-  container w h middle <|
-  collage gameWidth gameHeight
-    [ rect gameWidth gameHeight
-        |> filled bgBlack
-    , makePlayer game.player
-    ]
+view : Game -> Html.Html Msg
+view game =
+  let
+    bg = rect gameWidth gameHeight |> filled bgBlack
+    field = makePlayer game.player
+  in
+    toHtml <|
+    container gameWidth gameHeight middle <|
+    collage gameWidth gameHeight
+      [ bg
+      , field
+      ]
+
+-- SUBSCRIPTIONS
+
+subscriptions : Game -> Sub Msg
+subscriptions game =
+  Sub.batch [
+    AnimationFrame.times (\time -> Step time),
+    Sub.map KeyboardExtraMsg Keyboard.subscriptions
+  ]
+
+
+--INIT
+
+init : (Game, Cmd Msg)
+init =
+  let
+    ( keyboardModel, keyboardCmd ) = Keyboard.init
+  in
+    ( { player = Player (degrees 30)
+      , keyboardModel = keyboardModel
+      , direction = 0
+      }
+    , Cmd.batch
+      [ Cmd.map KeyboardExtraMsg keyboardCmd
+      ]
+    )
 
--- SIGNALS
 
-main : Signal Element
 main =
-  Signal.map2 view Window.dimensions gameState
-
-gameState : Signal Game
-gameState =
-  Signal.foldp update defaultGame input
-
--- Creates an event stream from the keyboard inputs and is
--- updated by AnimationFrame.
-input : Signal (Time, Input)
-input =
-  Signal.map2 Input
-    Keyboard.space
-    (Signal.map .x Keyboard.arrows)
-  -- only update on a new frame
-  |> Signal.sampleOn AnimationFrame.frame
-  |> Time.timestamp
+  App.program
+  { init = init
+  , update = update
+  , view = view
+  , subscriptions = subscriptions }