diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-26 20:55:51 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-26 20:55:51 +0200 |
commit | cc53496bab9ad2bbfc3fb2868cd10fa46f612e69 (patch) | |
tree | f974028160c90e5a373c3ac38d8d7229c419aaa7 /src/HTanks.hs | |
parent | 8f1fd98cd69659446b9fdd11c0f3d2b860d779f7 (diff) | |
download | htanks-cc53496bab9ad2bbfc3fb2868cd10fa46f612e69.tar htanks-cc53496bab9ad2bbfc3fb2868cd10fa46f612e69.zip |
Reworked Transform as a type class
Diffstat (limited to 'src/HTanks.hs')
-rw-r--r-- | src/HTanks.hs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/HTanks.hs b/src/HTanks.hs index 0974ffd..dd60903 100644 --- a/src/HTanks.hs +++ b/src/HTanks.hs @@ -10,6 +10,8 @@ import DefaultPlayer import HWiidPlayer import Simulation import Tank +import Vector + import GLDriver import GLX @@ -20,7 +22,6 @@ import qualified Data.Map as M import qualified Data.Set as S import Data.Time -import Vector main :: IO () main = do @@ -31,14 +32,14 @@ main = do when (initialized gl) $ do currentTime <- getCurrentTime - let gamestate = GameState {level = theLevel, tanks = [ Tank (Vertex 7.0 4.0) (Vector 1 0) (Vector 1 0) 1.5 (270*pi/180) False 3 1 5 1 - , Tank (Vertex 4.0 4.0) (Vector 1 0) (Vector 1 0) 1.5 (270*pi/180) False 3 1 5 1 - , Tank (Vertex 10.0 4.0) (Vector 1 0) (Vector 1 0) 1.5 (270*pi/180) False 3 1 5 1 + let gamestate = GameState {level = theLevel, tanks = [ Tank (Vertex 7.0 4.0) zeroV zeroV 1.5 (270*pi/180) False 3 1 5 1 + , Tank (Vertex 4.0 4.0) zeroV zeroV 1.5 (270*pi/180) False 3 1 5 1 + , Tank (Vertex 10.0 4.0) zeroV zeroV 1.5 (270*pi/180) False 3 1 5 1 ], bullets = []} mainstate = MainState {run = True, driver = SomeDriver gl, time = currentTime, players = [ SomePlayer humanPlayer - , SomePlayer $ CPUPlayer $ Vector 0 (-1) - , SomePlayer $ CPUPlayer $ Vector 0 1 + , SomePlayer $ CPUPlayer $ fromAngle $ -pi/2 + , SomePlayer $ CPUPlayer $ fromAngle $ pi/2 ], textures = M.empty, models = M.empty, gameState = gamestate} runMain mainstate $ do |