removed SDL-ttf as it breaks for now
This commit is contained in:
parent
99f7e1593a
commit
517f2eb0b6
@ -31,6 +31,5 @@ executable Pioneers
|
|||||||
linear >=1.3.1 && <1.4,
|
linear >=1.3.1 && <1.4,
|
||||||
lens >=3.10.1 && <3.11,
|
lens >=3.10.1 && <3.11,
|
||||||
SDL2 >= 0.1.0,
|
SDL2 >= 0.1.0,
|
||||||
time >=1.4.0 && <1.5,
|
time >=1.4.0 && <1.5
|
||||||
SDL2-ttf >=0.1.0 && <0.2
|
|
||||||
|
|
||||||
|
@ -25,8 +25,6 @@ import Linear as L
|
|||||||
|
|
||||||
-- GUI
|
-- GUI
|
||||||
import Graphics.UI.SDL as SDL
|
import Graphics.UI.SDL as SDL
|
||||||
import Graphics.UI.SDL.TTF as TTF
|
|
||||||
import Graphics.UI.SDL.TTF.Types
|
|
||||||
|
|
||||||
-- Render
|
-- Render
|
||||||
import qualified Graphics.Rendering.OpenGL.GL as GL
|
import qualified Graphics.Rendering.OpenGL.GL as GL
|
||||||
@ -58,7 +56,6 @@ main = do
|
|||||||
,WindowInputGrabbed-- never let go of input (KB/Mouse)
|
,WindowInputGrabbed-- never let go of input (KB/Mouse)
|
||||||
] $ \window -> do
|
] $ \window -> do
|
||||||
withOpenGL window $ do
|
withOpenGL window $ do
|
||||||
TTF.withInit $ do
|
|
||||||
(Size fbWidth fbHeight) <- glGetDrawableSize window
|
(Size fbWidth fbHeight) <- glGetDrawableSize window
|
||||||
initRendering
|
initRendering
|
||||||
--generate map vertices
|
--generate map vertices
|
||||||
@ -69,9 +66,6 @@ main = do
|
|||||||
putStrLn "foo"
|
putStrLn "foo"
|
||||||
now <- getCurrentTime
|
now <- getCurrentTime
|
||||||
putStrLn "foo"
|
putStrLn "foo"
|
||||||
font <- TTF.openFont "fonts/ttf-04B_03B_/04B_03B_.TTF" 10
|
|
||||||
TTF.setFontStyle font TTFNormal
|
|
||||||
TTF.setFontHinting font TTFHNormal
|
|
||||||
|
|
||||||
let zDistClosest = 1
|
let zDistClosest = 1
|
||||||
zDistFarthest = zDistClosest + 30
|
zDistFarthest = zDistClosest + 30
|
||||||
@ -92,7 +86,6 @@ main = do
|
|||||||
, envWindow = window
|
, envWindow = window
|
||||||
, envZDistClosest = zDistClosest
|
, envZDistClosest = zDistClosest
|
||||||
, envZDistFarthest = zDistFarthest
|
, envZDistFarthest = zDistFarthest
|
||||||
, envFont = font
|
|
||||||
}
|
}
|
||||||
state = State
|
state = State
|
||||||
{ stateWindowWidth = fbWidth
|
{ stateWindowWidth = fbWidth
|
||||||
|
@ -7,7 +7,6 @@ import Foreign.C (CFloat)
|
|||||||
import Data.Time (UTCTime)
|
import Data.Time (UTCTime)
|
||||||
import Linear.Matrix (M44)
|
import Linear.Matrix (M44)
|
||||||
import Control.Monad.RWS.Strict (RWST)
|
import Control.Monad.RWS.Strict (RWST)
|
||||||
import Graphics.UI.SDL.TTF.Types as TTF
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -26,7 +25,7 @@ data Env = Env
|
|||||||
, envZDistClosest :: !Double
|
, envZDistClosest :: !Double
|
||||||
, envZDistFarthest :: !Double
|
, envZDistFarthest :: !Double
|
||||||
--, envGLContext :: !GLContext
|
--, envGLContext :: !GLContext
|
||||||
, envFont :: TTF.TTFFont
|
--, envFont :: TTF.TTFFont
|
||||||
}
|
}
|
||||||
|
|
||||||
--Mutable State
|
--Mutable State
|
||||||
|
Loading…
Reference in New Issue
Block a user