From 6a2fe3ed186135cf5e6341f66c4e23269baf5fd2 Mon Sep 17 00:00:00 2001 From: Humza Shahid Date: Wed, 31 Jul 2024 12:30:12 +0100 Subject: [PATCH] a bit of formatting (no other changes in this commit) --- functional-core/app-update.sml | 8 ++++---- imperative-shell/app-draw.sml | 1 - imperative-shell/event-loop.sml | 28 ++++++++++++++++++---------- imperative-shell/input-callbacks.sml | 21 ++++++++++----------- imperative-shell/shell.sml | 7 +++++-- message-types/draw-msg.sml | 8 +++----- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/functional-core/app-update.sml b/functional-core/app-update.sml index 5f7cd5a..297f398 100644 --- a/functional-core/app-update.sml +++ b/functional-core/app-update.sml @@ -86,16 +86,16 @@ struct MOUSE_MOVE {x = mouseX, y = mouseY} => let val _ = print "mouse moved\n" - val drawMsg = - DRAW_BUTTON (getClickPos (mouseX, mouseY, 1.0, 0.0, 0.0)) + val drawMsg = + DRAW_BUTTON (getClickPos (mouseX, mouseY, 1.0, 0.0, 0.0)) in (model, drawMsg, mouseX, mouseY) end | MOUSE_LEFT_RELEASE => let val _ = print "mouse released\n" - val drawMsg = DRAW_BUTTON - (getClickPos (mouseX, mouseY, 1.0, 0.0, 0.0)) + val drawMsg = + DRAW_BUTTON (getClickPos (mouseX, mouseY, 1.0, 0.0, 0.0)) in (model, drawMsg, mouseX, mouseY) end diff --git a/imperative-shell/app-draw.sml b/imperative-shell/app-draw.sml index c6c07b7..54019da 100644 --- a/imperative-shell/app-draw.sml +++ b/imperative-shell/app-draw.sml @@ -106,5 +106,4 @@ struct in () end - end diff --git a/imperative-shell/event-loop.sml b/imperative-shell/event-loop.sml index 43c6913..b194004 100644 --- a/imperative-shell/event-loop.sml +++ b/imperative-shell/event-loop.sml @@ -4,20 +4,22 @@ struct open InputMessage local - fun loop (inputMailbox, drawMailbox, mouseX, mouseY, model) = - let - val inputMsg = Mailbox.recv inputMailbox - val (model, drawMsg, mouseX, mouseY) = AppUpdate.update (model, mouseX, mouseY, inputMsg) - val _ = Mailbox.send (drawMailbox, drawMsg) - in - loop (inputMailbox, drawMailbox, mouseX, mouseY, model) - end + fun loop (inputMailbox, drawMailbox, mouseX, mouseY, model) = + let + val inputMsg = Mailbox.recv inputMailbox + val (model, drawMsg, mouseX, mouseY) = + AppUpdate.update (model, mouseX, mouseY, inputMsg) + val _ = Mailbox.send (drawMailbox, drawMsg) + in + loop (inputMailbox, drawMailbox, mouseX, mouseY, model) + end in fun update (inputMailbox, drawMailbox) = loop (inputMailbox, drawMailbox, 0, 0, AppType.initial) end - fun draw (drawMailbox, window, graphDrawObject, buttonDrawObject, buttonDrawLength) = + fun draw + (drawMailbox, window, graphDrawObject, buttonDrawObject, buttonDrawLength) = if not (Glfw.windowShouldClose window) then let val _ = Gles3.clearColor (1.0, 1.0, 1.0, 1.0) @@ -29,7 +31,13 @@ struct val _ = Glfw.pollEvents () val _ = Glfw.swapBuffers window in - draw (drawMailbox, window, graphDrawObject, buttonDrawObject, buttonDrawLength) + draw + ( drawMailbox + , window + , graphDrawObject + , buttonDrawObject + , buttonDrawLength + ) end else Glfw.terminate () diff --git a/imperative-shell/input-callbacks.sml b/imperative-shell/input-callbacks.sml index ca66251..d1bfbb5 100644 --- a/imperative-shell/input-callbacks.sml +++ b/imperative-shell/input-callbacks.sml @@ -16,16 +16,15 @@ struct () fun registerCallbacks (window, inputMailbox) = - let - val mouseMoveCallback = mouseMoveCallback inputMailbox - val _ = Input.exportMouseMoveCallback mouseMoveCallback - val _ = Input.setMouseMoveCallback window + let + val mouseMoveCallback = mouseMoveCallback inputMailbox + val _ = Input.exportMouseMoveCallback mouseMoveCallback + val _ = Input.setMouseMoveCallback window - val mouseClickCallback = - mouseClickCallback inputMailbox - val _ = Input.exportMouseClickCallback mouseClickCallback - val _ = Input.setMouseClickCallback window - in - () - end + val mouseClickCallback = mouseClickCallback inputMailbox + val _ = Input.exportMouseClickCallback mouseClickCallback + val _ = Input.setMouseClickCallback window + in + () + end end diff --git a/imperative-shell/shell.sml b/imperative-shell/shell.sml index a5e8bb1..9bb9907 100644 --- a/imperative-shell/shell.sml +++ b/imperative-shell/shell.sml @@ -19,9 +19,12 @@ struct val inputMailbox = Mailbox.mailbox () val drawMailbox = Mailbox.mailbox () - val _ = CML.spawn (fn () => InputCallbacks.registerCallbacks (window, inputMailbox)) + val _ = CML.spawn (fn () => + InputCallbacks.registerCallbacks (window, inputMailbox)) val _ = CML.spawn (fn () => EventLoop.update (inputMailbox, drawMailbox)) - val _ = CML.spawn (fn () => EventLoop.draw (drawMailbox, window, graphDrawObject, buttonDrawObject, 0)) + val _ = CML.spawn (fn () => + EventLoop.draw + (drawMailbox, window, graphDrawObject, buttonDrawObject, 0)) in () end diff --git a/message-types/draw-msg.sml b/message-types/draw-msg.sml index ab88301..33712e8 100644 --- a/message-types/draw-msg.sml +++ b/message-types/draw-msg.sml @@ -1,11 +1,9 @@ signature DRAW_MESSAGE = sig - datatype t = - DRAW_BUTTON of Real32.real vector + datatype t = DRAW_BUTTON of Real32.real vector end structure DrawMessage :> DRAW_MESSAGE = -struct - datatype t = - DRAW_BUTTON of Real32.real vector +struct + datatype t = DRAW_BUTTON of Real32.real vector end