From 3db6d6f9eb6db21dca1671411523af1d73053591 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Fri, 30 May 2014 15:28:09 +0200 Subject: [PATCH] live-Coding --- src/Main.hs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index 3d4f3a6..8b34b8f 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -242,25 +242,25 @@ run = do -} (mt,tc,sleepAmount,frameTime) <- liftIO $ do - let double = fromRational.toRational :: (Real a) => a -> Double - targetFramerate = 60.0 - targetFrametime = 1.0/targetFramerate - --targetFrametimeμs = targetFrametime * 1000000.0 + let double = fromRational.toRational :: (Real a) => a -> Double + targetFramerate = 60.0 + targetFrametime = 1.0/targetFramerate + --targetFrametimeμs = targetFrametime * 1000000.0 now <- getCurrentTime let diff = diffUTCTime now (state ^. io.clock) -- get time-diffs title = unwords ["Pioneers @ ",show ((round . double $ 1.0/diff)::Int),"fps"] ddiff = double diff 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) - tessChange - | (clockFactor < (75*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor < 5) = ((+)1 :: Int -> Int) - -- > last 100 frames had > 25% leftover (on avg.) - | (clockFactor > (110*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor > 1) = (flip (-) 1 :: Int -> Int) - -- > last 100 frames had < 90% of target-fps - | otherwise = ((+)0 :: Int -> Int) -- 0ms > x > 10% -> keep settings + tessChange + | (clockFactor < (75*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor < 5) = ((+)1 :: Int -> Int) + -- > last 100 frames had > 25% leftover (on avg.) + | (clockFactor > (110*targetFrametime)) && (state ^. gl.glMap.stateTessellationFactor > 1) = (flip (-) 1 :: Int -> Int) + -- > last 100 frames had < 90% of target-fps + | otherwise = ((+)0 :: Int -> Int) -- 0ms > x > 10% -> keep settings when (sleepAmount > 0) $ threadDelay sleepAmount - now' <- getCurrentTime + now' <- getCurrentTime return (now',tessChange,sleepAmount,ddiff) -- 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"]