changed camera to new model

2014-04-21 19:46:24 +02:00
parent e2da50b6d9
commit 06bd9c4214
3 changed files with 10 additions and 13 deletions
--- a/src/Types.hs
+++ b/src/Types.hs
@ -10,6 +10,7 @@ import Linear.Matrix (M44)
 import Control.Monad.RWS.Strict (RWST)
 import Control.Lens
 import Graphics.Rendering.OpenGL.GL.Texturing.Objects (TextureObject)
+import Render.Types


 --Static Read-Only-State
@ -41,7 +42,7 @@ data CameraState = CameraState
    , _yAngle              :: !Double
    , _zDist               :: !Double
    , _frustum             :: !(M44 CFloat)
-    , _camPosition         :: !Position --TODO: Get rid of cam-prefix
+    , _camObject           :: !Camera
    }

 data IOState = IOState