From a4f2d991dacfb539a26e71002b6f244c44753b72 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Mon, 12 Apr 2010 02:47:09 +0200
Subject: Added 3D models

---
 src/HTanks.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/HTanks.hs')

diff --git a/src/HTanks.hs b/src/HTanks.hs
index 5a8bdec..c9525b9 100644
--- a/src/HTanks.hs
+++ b/src/HTanks.hs
@@ -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
-- 
cgit v1.2.3