Merge remote-tracking branch 'origin/master' into Mapping

2014-04-23 14:00:17 +02:00
parent fa9bda5e7a 48082c87d9
commit ca831692d2
5 changed files with 82 additions and 3 deletions
--- a/src/Types.hs
+++ b/src/Types.hs
@ -89,6 +89,7 @@ data GLMapState = GLMapState
    , _mapVert              :: !GL.NumArrayIndices
    , _mapProgram           :: !GL.Program
    , _mapTexture           :: !TextureObject
+    , _overviewTexture      :: !TextureObject
    }

 data GLHud = GLHud