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

finish my work and be thankful! rotation works in special angles so u cant look under the map

Browse Source
This commit is contained in:
jbrinkro 2014-01-05 03:38:31 +01:00
parent ee9a8c455a
commit df1fdc60d3
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Main.hs
View File

@ -246,12 +246,14 @@ run = do
(x, y) <- liftIO $ GLFW.getCursorPos win (x, y) <- liftIO $ GLFW.getCursorPos win
let myrot = (x - sodx) / 2 let myrot = (x - sodx) / 2
mxrot = (y - sody) / 2 mxrot = (y - sody) / 2
newXAngle = if newXAngle' > 2*pi then 2*pi else -- newXAngle = if newXAngle' > 2*pi then 2*pi else
if newXAngle' < -2*pi then -2*pi else newXAngle = if newXAngle' > 0.45*pi then 0.45*pi else
-- if newXAngle' < -2*pi then -2*pi else
if newXAngle' < 0 then 0 else
newXAngle' newXAngle'
newXAngle' = sodxa + mxrot/100 newXAngle' = sodxa + mxrot/100
newYAngle = if newYAngle' > 2*pi then newYAngle'-2*pi else newYAngle = if newYAngle' > pi then newYAngle'-2*pi else
if newYAngle' < 0 then newYAngle'+2*pi else if newYAngle' < -pi then newYAngle'+2*pi else
newYAngle' newYAngle'
newYAngle' = sodya + myrot/100 newYAngle' = sodya + myrot/100
put $ state put $ state
@ -442,9 +444,8 @@ draw = do
--V.unsafeWith perspective $ \ptr -> GL.glUniformMatrix4fv proj 1 0 ptr --V.unsafeWith perspective $ \ptr -> GL.glUniformMatrix4fv proj 1 0 ptr
let cam = lookAt (cpos ^+^ at') at' up let cam = lookAt (cpos ^+^ at') at' up
--cdist !*! crot !*! camat --cdist !*! crot !*! camat
cpos = -10 *^ normalize (V3 (sin ya) ((cos ya) * (sin xa)) ((cos ya) * (cos xa))) -- cpos = -10 *^ normalize (V3 (sin ya) ((cos ya) * (sin xa)) ((cos ya) * (cos xa)))
camat = (eye4 & translation .~ V3 (-0.5) (0) (-0.5)) :: M44 CFloat
cdist = (eye4 & translation .~ V3 (0) (0) (-10)) :: M44 CFloat
crot = (m33_to_m44 $ crot = (m33_to_m44 $
(fromQuaternion $ (fromQuaternion $
axisAngle (V3 1 0 0) (xa::CFloat)) axisAngle (V3 1 0 0) (xa::CFloat))
@ -452,18 +453,23 @@ draw = do
(fromQuaternion $ (fromQuaternion $
axisAngle (V3 0 1 0) ((ya::CFloat) - pi/2)) axisAngle (V3 0 1 0) ((ya::CFloat) - pi/2))
) :: M44 CFloat ) :: M44 CFloat
at' = V3 5 0 5 at' = V3 5 0 5
cdist' = V3 (0) (0) (-10)
upmap = (fromQuaternion $
axisAngle (V3 0 1 0) (ya::CFloat) :: M33 CFloat)
!* (V3 1 0 0)
crot' = ( crot' = (
(fromQuaternion $ (fromQuaternion $
axisAngle (V3 0 1 0) (ya::CFloat)) axisAngle upmap (xa::CFloat))
!*! !*!
(fromQuaternion $ (fromQuaternion $
axisAngle (V3 1 0 0) (xa::CFloat)) axisAngle (V3 0 1 0) (ya::CFloat))
) :: M33 CFloat ) :: M33 CFloat
cpos = crot' !* (V3 0 0 (-10))
--V.unsafeWith model $ \ptr -> GL.glUniformMatrix4fv mmat 1 0 ptr -} --V.unsafeWith model $ \ptr -> GL.glUniformMatrix4fv mmat 1 0 ptr -}
putStrLn $ unwords $ "Cam direction:":map show [cpos] --putStrLn $ unwords $ "Cam direction:":map show [cpos]
putStrLn $ unwords $ "Cam at:":map show [cpos ^+^ at'] --putStrLn $ unwords $ "Cam at:":map show [cpos ^+^ at']
with (distribute $ cam) $ \ptr -> with (distribute $ cam) $ \ptr ->
GL.glUniformMatrix4fv mmat 1 0 (castPtr (ptr :: Ptr (M44 CFloat))) GL.glUniformMatrix4fv mmat 1 0 (castPtr (ptr :: Ptr (M44 CFloat)))
GL.bindBuffer GL.ArrayBuffer GL.$= Just map' GL.bindBuffer GL.ArrayBuffer GL.$= Just map'