Merge branch 'ui' into tessallation

This commit is contained in:
Stefan Dresselhaus
2014-05-16 07:57:03 +02:00
4 changed files with 163 additions and 35 deletions

View File

@ -162,7 +162,7 @@ main =
{ _uiHasChanged = True
, _uiMap = guiMap
, _uiRoots = guiRoots
, _uiButtonState = UI.UIButtonState 0 Nothing
, _uiButtonState = UI.UIButtonState 0 Nothing False
}
}
@ -234,7 +234,7 @@ run = do
let double = fromRational.toRational :: (Real a) => a -> Double
targetFramerate = 60.0
targetFrametime = 1.0/targetFramerate
targetFrametimeμs = targetFrametime * 1000000.0
--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"]