Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

made code compile

Browse Source
This commit is contained in:
Nicole Dresselhaus 2013-12-29 01:23:02 +01:00
parent ae1ac08a6a
commit 8bca5a82df
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Pioneers.cabal
View File

@ -12,7 +12,8 @@ executable Pioneers
gtk, gtk,
OpenGL >=2.8.0 && <2.9, OpenGL >=2.8.0 && <2.9,
gtkglext >=0.12, gtkglext >=0.12,
containers >=0.5 && <0.6 containers >=0.5 && <0.6,
array >=0.4.0 && <0.5
ghc-options: -Wall ghc-options: -Wall
other-modules: Map.Coordinates other-modules: Map.Coordinates

25
src/Map/Coordinates.hs
View File

@ -7,10 +7,11 @@ module Map.Coordinates
where where
import Graphics.Rendering.OpenGL as GL import Graphics.Rendering.OpenGL as GL
import Data.Map as M import Data.Map as M hiding ((!))
import Data.IntMap import qualified Data.Map as M ((!))
import Data.Maybe import Data.Maybe
import Prelude as P import Prelude as P
import Data.Array.IArray as A
@ -65,15 +66,15 @@ data TileVertex =
--getGrid :: Coordinates -> Coordinates -> [] --getGrid :: Coordinates -> Coordinates -> []
getTileVertices :: MapHeights -> Tile -> [Vertex3 GLfloat] getTileVertices :: MapHeights -> Tile -> [Vertex3 GLfloat]
getTileVertices heights t@(x,y) = let p = P.map (+ tileToPos t) hexagon in getTileVertices heights t = let p = (listArray (0,5) $ P.map (+ tileToPos t) hexagon)::Array Int (Float,Float) in
P.map floatToVertex $ P.map floatToVertex $
[ [
(fst $ p !! 0, snd $ p !! 0,fromMaybe 0.0 $ getHeight heights VertexNW t), (fst $ p ! 0, snd $ p ! 0,fromMaybe 0.0 $ getHeight heights VertexNW t),
(fst $ p !! 1, snd $ p !! 1,fromMaybe 0.0 $ getHeight heights VertexNW t), (fst $ p ! 1, snd $ p ! 1,fromMaybe 0.0 $ getHeight heights VertexNW t),
(fst $ p !! 2, snd $ p !! 2,fromMaybe 0.0 $ getHeight heights VertexNW t), (fst $ p ! 2, snd $ p ! 2,fromMaybe 0.0 $ getHeight heights VertexNW t),
(fst $ p !! 3, snd $ p !! 3,fromMaybe 0.0 $ getHeight heights VertexNW t), (fst $ p ! 3, snd $ p ! 3,fromMaybe 0.0 $ getHeight heights VertexNW t),
(fst $ p !! 4, snd $ p !! 4,fromMaybe 0.0 $ getHeight heights VertexNW t), (fst $ p ! 4, snd $ p ! 4,fromMaybe 0.0 $ getHeight heights VertexNW t),
(fst $ p !! 5, snd $ p !! 5,fromMaybe 0.0 $ getHeight heights VertexNW t) (fst $ p ! 5, snd $ p ! 5,fromMaybe 0.0 $ getHeight heights VertexNW t)
] ]
getHeight :: MapHeights -> TileVertex -> Tile -> Maybe Float getHeight :: MapHeights -> TileVertex -> Tile -> Maybe Float
@ -115,15 +116,15 @@ getHeight h v t@(_,ty) =
return $ (fromIntegral $ sw+nw+c) / 3.0 return $ (fromIntegral $ sw+nw+c) / 3.0
hexagon :: IntMap (Float,Float) hexagon :: [(Float,Float)]
hexagon = undefined {- fromList [ hexagon = [
(0.2,0), (0.2,0),
(0.6,0), (0.6,0),
(0.5,1), (0.5,1),
(1,0.6), (1,0.6),
(1,0.2), (1,0.2),
(0.5,0) (0.5,0)
]-} ]
-- | convert triple of floats to GLfloat (== CFloat) -- | convert triple of floats to GLfloat (== CFloat)