diff --git a/fcore/game-update.sml b/fcore/game-update.sml index e0cffd0..22c9936 100644 --- a/fcore/game-update.sml +++ b/fcore/game-update.sml @@ -2,13 +2,13 @@ structure GameUpdate = struct open GameType - fun update (game: GameType.game_type, input) = + fun update (game: GameType.game_type, input, time) = let val {mode, userKeys} = game in case mode of - LEVEL level => LevelUpdate.update (level, input, userKeys) - | TITLE title => TitleUpdate.update (title, input, userKeys) - | OPTIONS options => OptionsUpdate.update (options, input, userKeys) + LEVEL level => LevelUpdate.update (level, input, userKeys, time) + | TITLE title => TitleUpdate.update (title, input, userKeys, time) + | OPTIONS options => OptionsUpdate.update (options, input, userKeys, time) end end diff --git a/fcore/level/level-update.sml b/fcore/level/level-update.sml index a728db0..d8f2370 100644 --- a/fcore/level/level-update.sml +++ b/fcore/level/level-update.sml @@ -1,6 +1,6 @@ structure LevelUpdate = struct - fun update (level, input, userKeys) = + fun update (level, input, userKeys, time) = let val { player diff --git a/fcore/options/options-update.sml b/fcore/options/options-update.sml index e8b612e..9e9d177 100644 --- a/fcore/options/options-update.sml +++ b/fcore/options/options-update.sml @@ -8,7 +8,7 @@ struct fun withFocus (newFocus, userKeys) = {mode = GameType.OPTIONS {focus = newFocus}, userKeys = userKeys} - fun update (options, input: FrameInputType.t, userKeys) = + fun update (options, input: FrameInputType.t, userKeys, time) = case #focus options of LEFT_KEY => if #downHeld input then withFocus (RIGHT_KEY, userKeys) diff --git a/fcore/title/title-update.sml b/fcore/title/title-update.sml index 445d9dc..eab0150 100644 --- a/fcore/title/title-update.sml +++ b/fcore/title/title-update.sml @@ -2,7 +2,7 @@ structure TitleUpdate = struct open TitleType - fun update (titleState, input: FrameInputType.t, userKeys) = + fun update (titleState, input: FrameInputType.t, userKeys, time) = case #focus titleState of START_BUTTON => let diff --git a/shell/gl-draw.sml b/shell/gl-draw.sml index dcf9fa8..02a7eb3 100644 --- a/shell/gl-draw.sml +++ b/shell/gl-draw.sml @@ -293,8 +293,9 @@ struct val _ = Gles3.clearColor (1.0, 1.0, 1.0, 1.0) val _ = Gles3.clear () + val time = Glfw.getTime () val input = InputState.getSnapshot () - val game = GameUpdate.update (game, input) + val game = GameUpdate.update (game, input, time) val shellState = drawMode (shellState, game)