summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2010-04-16 09:20:01 +0200
committerMatthias Schiffer <matthias@gamezock.de>2010-04-16 09:20:01 +0200
commit0c03d67f55e11631aa341089d9a3cc35010c0941 (patch)
treea7ed67044c05b5b53673e0e4d1aa9f6816e2d948
parenta19dc0d6aa982d138f46305cdea6443cb45a5fd3 (diff)
downloadhtanks-0c03d67f55e11631aa341089d9a3cc35010c0941.tar
htanks-0c03d67f55e11631aa341089d9a3cc35010c0941.zip
Adapted to obj-model-opengl rename
-rw-r--r--htanks.cabal2
-rw-r--r--src/HTanks.hs3
-rw-r--r--src/Model.hs2
-rw-r--r--src/Render.hs2
4 files changed, 3 insertions, 6 deletions
diff --git a/htanks.cabal b/htanks.cabal
index 38c443d..7785026 100644
--- a/htanks.cabal
+++ b/htanks.cabal
@@ -7,7 +7,7 @@ license: GPL-3
license-file: LICENSE
author: Matthias Schiffer
maintainer: matthias@gamezock.de
-build-depends: base >= 4, syb, containers, mtl, time, X11, OpenGL, hwiid, obj-model, obj-model-gl
+build-depends: base >= 4, syb, containers, mtl, time, X11, OpenGL, hwiid, obj-model, obj-model-opengl
build-type: Simple
data-files: tex/*.png model/*.obj
diff --git a/src/HTanks.hs b/src/HTanks.hs
index 2fd2148..110a2b1 100644
--- a/src/HTanks.hs
+++ b/src/HTanks.hs
@@ -20,9 +20,6 @@ import qualified Data.Map as M
import qualified Data.Set as S
import Data.Time
-import Data.Obj3D
-import Data.Obj3D.GL
-
main :: IO ()
main = do
diff --git a/src/Model.hs b/src/Model.hs
index e2c045a..3c88ec7 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -4,7 +4,7 @@ module Model ( Model(..)
) where
import Paths_htanks
-import Data.Obj3D.GL (InterleavedObj)
+import Data.Obj3D.OpenGL (InterleavedObj)
data Model = ModelTank | ModelBullet | ModelBlock
deriving (Eq, Ord, Show)
diff --git a/src/Render.hs b/src/Render.hs
index aa084d8..5c961db 100644
--- a/src/Render.hs
+++ b/src/Render.hs
@@ -16,7 +16,7 @@ import Control.Monad.State
import Data.Fixed
import Data.Maybe
import Data.Obj3D
-import Data.Obj3D.GL
+import Data.Obj3D.OpenGL
import Data.Ratio
import qualified Data.Map as M