From 0c03d67f55e11631aa341089d9a3cc35010c0941 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 16 Apr 2010 09:20:01 +0200 Subject: Adapted to obj-model-opengl rename --- htanks.cabal | 2 +- src/HTanks.hs | 3 --- src/Model.hs | 2 +- src/Render.hs | 2 +- 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 -- cgit v1.2.3