Clean up unused Graphic related code

3 files changed, 42 insertions, 140 deletions

diff --git a/src/Input.elm b/src/Input.elm
index 9a88db6..0497107 100644
--- a/src/Input.elm
+++ b/src/Input.elm
@@ -17,7 +17,7 @@ type alias Input =
 
 getInput : Signal Input
 getInput =
-  let delta = fps 25
+  let delta = fps 24
       input =
         Input
           <~ map recordIntToVec2 arrows
diff --git a/src/View/Game.elm b/src/View/Game.elm
index 5af59bd..abe7a15 100644
--- a/src/View/Game.elm
+++ b/src/View/Game.elm
@@ -1,15 +1,12 @@
 module View.Game
-  ( gameView
-  , render
+  ( render
   ) where
 
+import Html exposing (Html)
+import Svg exposing (..)
+import Svg.Attributes exposing (..)
 import List
 
-import Graphics.Collage exposing (..)
-import Graphics.Element exposing (Element)
-import Color exposing (..)
-import Text exposing (..)
-import Text
 import Time exposing (Time)
 
 import Model.Vec2 exposing (Vec2)
@@ -21,124 +18,30 @@ import Model.Round exposing (..)
 
 import View.Round exposing (roundView)
 
-
-
-
-
-
-
-import Html exposing (Html)
-import Svg
-import Svg.Attributes
-
-gameView : Game -> Element
-gameView game =
-  let pointsForm color =
-        List.map (pointForm game.time (configColor color)) (game.cloud.points color)
-          |> group
-      forms =
-        [ boardForm game.boardSize
-        , playerForm game.player
-        , pointsForm White
-        , pointsForm Black
-        , scoreForm game.boardSize game.time game.rounds game.currentScore
-        ]
-  in  collage (truncate game.boardSize.x) (truncate game.boardSize.y) forms
-
-boardForm : Vec2 -> Form
-boardForm boardSize =
-  filled boardColor (rect boardSize.x boardSize.y)
-
-boardColor : Color
-boardColor = rgb 103 123 244
-
-playerForm : Player -> Form
-playerForm player =
-  let playerColor = configColor player.config
-  in  circleForm player.pos playerSize playerColor
-
-pointForm : Float -> Color -> Point -> Form
-pointForm time color point =
-  let pos = pointMove point time
-  in  circleForm pos pointSize color
-
-configColor : Config -> Color
-configColor config =
-  case config of
-    White -> rgb 240 240 240
-    Black -> rgb 14 17 33
-
-circleForm : Vec2 -> Float -> Color -> Form
-circleForm pos size color =
-  let outline = circle size
-        |> filled outlineColor
-      inside = circle (size - 1)
-        |> filled color
-  in  group [outline, inside]
-        |> move (pos.x, pos.y)
-
-outlineColor : Color
-outlineColor = rgb 34 34 34
-
-scoreForm : Vec2 -> Time -> List Round -> Int -> Form
-scoreForm boardSize currentRoundTime rounds score =
-  let scorePos =
-        { x = 0.0
-        , y = boardSize.y / 2 - 35
-        }
-  in  if currentRoundTime < 5000
-        then
-          case List.head rounds of
-            Just round ->
-              textForm scorePos (roundView round)
-            Nothing ->
-              textForm scorePos (toString score)
-        else
-          textForm scorePos (toString score)
-
-textForm : Vec2 -> String -> Form
-textForm pos content =
-  let textElement = fromString content
-        |> Text.height 24
-        |> typeface ["calibri", "arial"]
-        |> Text.color textColor
-        |> bold
-  in  textElement
-        |> text
-        |> move (pos.x, pos.y)
-
-textColor : Color
-textColor = rgb 14 17 33
-
-
-
-
-
 render : Game -> Html
 render game =
   let renderPoints config = List.map (renderPoint game.time config) (game.cloud.points config)
-  in  Svg.svg
-        [ Svg.Attributes.width ((toString game.boardSize.x) ++ "px")
-        , Svg.Attributes.height ((toString game.boardSize.y) ++ "px")
+  in  svg
+        [ width (toString game.boardSize.x)
+        , height (toString game.boardSize.y)
+        ]
+        [ renderBoard
+        , renderPlayer game.player
+        , g [] (renderPoints White)
+        , g [] (renderPoints Black)
+        , renderScore game.boardSize game.time game.rounds game.currentScore
         ]
-        (  [ renderBoard
-           , renderPlayer game.player
-           ]
-        ++ (renderPoints White)
-        ++ (renderPoints Black)
-        ++ [renderScore game.boardSize game.time game.rounds game.currentScore]
-        )
 
-renderBoard : Svg.Svg
+renderBoard : Svg
 renderBoard =
-  Svg.rect
-    [ Svg.Attributes.width "100%"
-    , Svg.Attributes.height "100%"
-    , Svg.Attributes.fill "#677BF4"
+  rect
+    [ width "100%"
+    , height "100%"
+    , fill "#677BF4"
     ]
     []
 
-renderPlayer : Player -> Svg.Svg
+renderPlayer : Player -> Svg
 renderPlayer player =
   renderCircle player.pos playerSize (playerColor player.config)
 
@@ -148,7 +51,7 @@ playerColor config =
     White -> "#F0F0F0"
     Black -> "#0E1121"
 
-renderPoint : Float -> Config -> Point -> Svg.Svg
+renderPoint : Float -> Config -> Point -> Svg
 renderPoint time config point =
   let pos = pointMove point time
   in  renderCircle pos pointSize (playerColor config)
@@ -159,19 +62,19 @@ pointColor config =
     White -> "white"
     Black -> "black"
 
-renderCircle : Vec2 -> Float -> String -> Svg.Svg
+renderCircle : Vec2 -> Float -> String -> Svg
 renderCircle pos size color =
-  Svg.circle
-    [ Svg.Attributes.cx (toString (pos.x + 250))
-    , Svg.Attributes.cy (toString (-1 * pos.y + 250))
-    , Svg.Attributes.r (toString size)
-    , Svg.Attributes.fill color
-    , Svg.Attributes.stroke "#222222"
-    , Svg.Attributes.strokeWidth "1"
+  circle
+    [ cx (toString (pos.x + 250))
+    , cy (toString (-1 * pos.y + 250))
+    , r (toString size)
+    , fill color
+    , stroke "#222222"
+    , strokeWidth "1"
     ]
     []
 
-renderScore : Vec2 -> Time -> List Round -> Int -> Svg.Svg
+renderScore : Vec2 -> Time -> List Round -> Int -> Svg
 renderScore boardSize currentRoundTime rounds score =
   let scorePos =
         { x = 0.0
@@ -187,17 +90,17 @@ renderScore boardSize currentRoundTime rounds score =
         else
           renderText scorePos (toString score)
 
-renderText : Vec2 -> String -> Svg.Svg
+renderText : Vec2 -> String -> Svg
 renderText pos content =
-  Svg.text'
-    [ Svg.Attributes.x (toString (250 + pos.x))
-    , Svg.Attributes.y (toString (-1 * pos.y + 250))
-    , Svg.Attributes.fontFamily "calibri"
-    , Svg.Attributes.fontSize "24"
-    , Svg.Attributes.color "#0E1121"
-    , Svg.Attributes.fontWeight "bold"
+  text'
+    [ x (toString (250 + pos.x))
+    , y (toString (-1 * pos.y + 250))
+    , fontFamily "calibri"
+    , fontSize "24"
+    , color "#0E1121"
+    , fontWeight "bold"
     ]
-    [ Svg.tspan
-        [ Svg.Attributes.textAnchor "middle" ]
-        [ Svg.text content ]
+    [ tspan
+        [ textAnchor "middle" ]
+        [ text content ]
     ]
diff --git a/src/View/Page.elm b/src/View/Page.elm
index 54f5925..a4e0ba0 100644
--- a/src/View/Page.elm
+++ b/src/View/Page.elm
@@ -13,7 +13,7 @@ import Json.Encode exposing (string)
 import Model.Game exposing (Game)
 import Model.Round exposing (..)
 
-import View.Game exposing (gameView, render)
+import View.Game exposing (render)
 import View.Round exposing (roundView)
 
 pageView : Game -> Html
@@ -23,7 +23,6 @@ pageView game =
     [ h1 [] [ text "cAtchVoid" ]
     , div
         [ id "game" ]
-        -- [ fromElement <| render game ]
         [ render game ]
     , p
         []