summaryrefslogtreecommitdiffstats
path: root/src/MainLoop.hs
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2010-04-12 02:47:09 +0200
committerMatthias Schiffer <matthias@gamezock.de>2010-04-12 02:47:09 +0200
commita4f2d991dacfb539a26e71002b6f244c44753b72 (patch)
treed156dc2dffdfe651c78c9c6d74285ee89d6ffe2d /src/MainLoop.hs
parent4ecea2f9dc5bbb4c5e32b2d845f29c0dc7783ac0 (diff)
downloadhtanks-a4f2d991dacfb539a26e71002b6f244c44753b72.tar
htanks-a4f2d991dacfb539a26e71002b6f244c44753b72.zip
Added 3D models
Diffstat (limited to 'src/MainLoop.hs')
-rw-r--r--src/MainLoop.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/MainLoop.hs b/src/MainLoop.hs
index a484435..de28499 100644
--- a/src/MainLoop.hs
+++ b/src/MainLoop.hs
@@ -9,6 +9,7 @@ import Game
import GLDriver
import Player
import Texture
+import Model
import Control.Monad.State
import Control.Monad.Trans
@@ -22,6 +23,7 @@ data MainState = MainState
, time :: !UTCTime
, players :: ![SomePlayer]
, textures :: !(M.Map Texture TextureObject)
+ , models :: !(M.Map Model InterleavedObj)
, gameState :: !GameState
}