Added 3D models
This commit is contained in:
parent
4ecea2f9dc
commit
a4f2d991da
7 changed files with 2062 additions and 18 deletions
|
@ -14,20 +14,20 @@ import Tank
|
|||
import GLDriver
|
||||
import GLX
|
||||
|
||||
import Control.Concurrent (threadDelay)
|
||||
import Control.Monad.State
|
||||
import Data.Maybe
|
||||
import qualified Data.Map as M
|
||||
import qualified Data.Set as S
|
||||
import Data.Time
|
||||
|
||||
import Foreign.C.Types
|
||||
import Data.Obj3D
|
||||
import Data.Obj3D.GL
|
||||
|
||||
|
||||
main :: IO ()
|
||||
main = do
|
||||
let theLevel = testLevel
|
||||
hwiidPlayer <- newHWiidPlayer
|
||||
--hwiidPlayer <- newHWiidPlayer
|
||||
gl <- initGL $ glxDriver (levelWidth theLevel) (levelHeight theLevel)
|
||||
|
||||
when (initialized gl) $ do
|
||||
|
@ -36,10 +36,10 @@ main = do
|
|||
, Tank 5.0 3.5 0 0 1.5 270 False 3 1 5 1
|
||||
], bullets = []}
|
||||
mainstate = MainState {run = True, driver = SomeDriver gl, time = currentTime, players =
|
||||
[ --SomePlayer $ DefaultPlayer S.empty 0 0 False
|
||||
SomePlayer $ hwiidPlayer
|
||||
[ SomePlayer $ DefaultPlayer S.empty 0 0 False
|
||||
--SomePlayer $ hwiidPlayer
|
||||
, SomePlayer $ CPUPlayer 0
|
||||
], textures = M.empty, gameState = gamestate}
|
||||
], textures = M.empty, models = M.empty, gameState = gamestate}
|
||||
|
||||
runMain mainstate $ do
|
||||
setup
|
||||
|
|
Reference in a new issue