Adapted to obj-model-opengl rename
This commit is contained in:
parent
a19dc0d6aa
commit
0c03d67f55
4 changed files with 3 additions and 6 deletions
|
@ -7,7 +7,7 @@ license: GPL-3
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Matthias Schiffer
|
author: Matthias Schiffer
|
||||||
maintainer: matthias@gamezock.de
|
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
|
build-type: Simple
|
||||||
data-files: tex/*.png model/*.obj
|
data-files: tex/*.png model/*.obj
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,6 @@ import qualified Data.Map as M
|
||||||
import qualified Data.Set as S
|
import qualified Data.Set as S
|
||||||
import Data.Time
|
import Data.Time
|
||||||
|
|
||||||
import Data.Obj3D
|
|
||||||
import Data.Obj3D.GL
|
|
||||||
|
|
||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = do
|
main = do
|
||||||
|
|
|
@ -4,7 +4,7 @@ module Model ( Model(..)
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Paths_htanks
|
import Paths_htanks
|
||||||
import Data.Obj3D.GL (InterleavedObj)
|
import Data.Obj3D.OpenGL (InterleavedObj)
|
||||||
|
|
||||||
data Model = ModelTank | ModelBullet | ModelBlock
|
data Model = ModelTank | ModelBullet | ModelBlock
|
||||||
deriving (Eq, Ord, Show)
|
deriving (Eq, Ord, Show)
|
||||||
|
|
|
@ -16,7 +16,7 @@ import Control.Monad.State
|
||||||
import Data.Fixed
|
import Data.Fixed
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import Data.Obj3D
|
import Data.Obj3D
|
||||||
import Data.Obj3D.GL
|
import Data.Obj3D.OpenGL
|
||||||
import Data.Ratio
|
import Data.Ratio
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
|
|
||||||
|
|
Reference in a new issue