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

tessallation-factor will now change max once every 5 sec

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-06-15 03:42:58 +02:00
parent e512149461
commit 5578bb401a
No known key found for this signature in database
GPG Key ID: BC16D887851A1A80
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Main.hs
View File

@ -137,6 +137,7 @@ main = do
, _io = IOState , _io = IOState
{ _clock = now { _clock = now
, _tessClockFactor = 0 , _tessClockFactor = 0
, _tessClockTime = now
} }
, _camera = cam' , _camera = cam'
, _camStack = camStack' , _camStack = camStack'
@ -234,32 +235,40 @@ run = do
} }
-} -}
(mt,tc,sleepAmount,frameTime) <- liftIO $ do (mt,tc,sleepAmount,frameTime,hC) <- liftIO $ do
let double = fromRational.toRational :: (Real a) => a -> Double let double = fromRational.toRational :: (Real a) => a -> Double
targetFramerate = 60.0 targetFramerate = 60.0
targetFrametime = 1.0/targetFramerate targetFrametime = 1.0/targetFramerate
--targetFrametimeμs = targetFrametime * 1000000.0 --targetFrametimeμs = targetFrametime * 1000000.0
now <- getCurrentTime now <- getCurrentTime
let diff = diffUTCTime now (state ^. io.clock) -- get time-diffs let diff = diffUTCTime now (state ^. io.clock) -- get time-diffs
title = unwords ["Pioneers @ ",show ((round . double $ 1.0/diff)::Int),"fps"] updatediff = diffUTCTime now (state ^. io.tessClockTime) -- get diff to last update
ddiff = double diff title = unwords ["Pioneers @ ",show ((round . double $ 1.0/diff)::Int),"fps"]
ddiff = double diff
SDL.setWindowTitle (env ^. windowObject) title SDL.setWindowTitle (env ^. windowObject) title
let sleepAmount = floor ((targetFrametime - double diff)*1000000) :: Int -- get time until next frame in microseconds let sleepAmount = floor ((targetFrametime - double diff)*1000000) :: Int -- get time until next frame in microseconds
clockFactor = (state ^. io.tessClockFactor) clockFactor = (state ^. io.tessClockFactor)
tessChange noChange = ((+)0 :: Int -> Int)
| (clockFactor < (75*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor < 5) = ((+)1 :: Int -> Int) (tessChange, hasChanged)
| updatediff < 5 = (noChange,False) -- at least 5 sec since last update
| (clockFactor < (75*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor < 5) = (((+)1 :: Int -> Int),True)
-- > last 100 frames had > 25% leftover (on avg.) -- > last 100 frames had > 25% leftover (on avg.)
| (clockFactor > (110*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor > 1) = (flip (-) 1 :: Int -> Int) | (clockFactor > (110*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor > 1) = ((flip (-) 1 :: Int -> Int),True)
-- > last 100 frames had < 90% of target-fps -- > last 100 frames had < 90% of target-fps
| otherwise = ((+)0 :: Int -> Int) -- 0ms > x > 10% -> keep settings | otherwise = (noChange,False) -- 0ms > x > 10% -> keep settings
when (sleepAmount > 0) $ threadDelay sleepAmount when (sleepAmount > 0) $ threadDelay sleepAmount
now' <- getCurrentTime now' <- getCurrentTime
return (now',tessChange,sleepAmount,ddiff) return (now',tessChange,sleepAmount,ddiff,hasChanged)
-- set state with new clock-time -- set state with new clock-time
--liftIO $ putStrLn $ unwords ["clockFactor:",show (state ^. io.tessClockFactor),"\ttc:", show (tc (state ^. gl.glMap.stateTessellationFactor)),"\tsleep ",show frameTime,"ms"] --liftIO $ putStrLn $ unwords ["clockFactor:",show (state ^. io.tessClockFactor),"\ttc:", show (tc (state ^. gl.glMap.stateTessellationFactor)),"\tsleep ",show frameTime,"ms"]
modify $ (io.clock .~ mt) if hC then
modify $ (io.clock .~ mt)
. (gl.glMap.stateTessellationFactor %~ tc) . (gl.glMap.stateTessellationFactor %~ tc)
. (io.tessClockFactor %~ (((+) frameTime).((*) 0.99))) . (io.tessClockFactor %~ (((+) frameTime).((*) 0.99)))
. (io.tessClockTime .~ mt)
else
modify $ (io.clock .~ mt)
-- liftIO $ putStrLn $ concat $ ["TessFactor at: ",show (state ^. gl.glMap.stateTessellationFactor), " - slept for ",show sleepAmount, "μs."] -- liftIO $ putStrLn $ concat $ ["TessFactor at: ",show (state ^. gl.glMap.stateTessellationFactor), " - slept for ",show sleepAmount, "μs."]
shouldClose' <- return $ state ^. window.shouldClose shouldClose' <- return $ state ^. window.shouldClose
unless shouldClose' run unless shouldClose' run

1
src/Types.hs
View File

@ -55,6 +55,7 @@ data CameraState = CameraState
data IOState = IOState data IOState = IOState
{ _clock :: !UTCTime { _clock :: !UTCTime
, _tessClockFactor :: !Double , _tessClockFactor :: !Double
, _tessClockTime :: !UTCTime
} }
data GameState = GameState data GameState = GameState