Reworked Transform as a type class
This commit is contained in:
parent
8f1fd98cd6
commit
cc53496bab
11 changed files with 115 additions and 75 deletions
|
@ -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
|
||||
|
|
Reference in a new issue