Added Transformable class to simplify collision calculation

1 files changed, 18 insertions, 8 deletions

diff --git a/src/Game.hs b/src/Game.hs
index 5af2ad2..16b04d8 100644
--- a/src/Game.hs
+++ b/src/Game.hs
@@ -1,26 +1,36 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
 module Game ( Bullet(..)
+            , bulletX
+            , bulletY
             , GameState(..)
             ) where
 
 import Level
 import Tank
-
-import Control.Monad
-import Control.Monad.State
-import Data.Fixed
+import Transformable
+import Vector
 
 
 data Bullet = Bullet
-    { bulletX      :: !Micro
-    , bulletY      :: !Micro
-    , bulletDir    :: !Micro
-    , bulletSpeed  :: !Micro
+    { bulletPos    :: !Vertex
+    , bulletDir    :: !Vector
+    , bulletSpeed  :: !Coord
     , bulletBouncesLeft :: !Int
     , bulletTank   :: !Int
     } deriving (Eq, Show)
 
+bulletX :: Bullet -> Coord
+bulletX = vertexX . bulletPos
+
+bulletY :: Bullet -> Coord
+bulletY = vertexY . bulletPos
+
+instance Transformable Bullet where
+  t >< b = b { bulletPos = pos, bulletDir = dir } where
+    pos = t >< bulletPos b
+    dir = t >< bulletDir b
+
 data GameState = GameState
     { level    :: !Level
     , tanks    :: ![Tank]