Refactor to be functional

1 files changed, 12 insertions, 11 deletions

diff --git a/demo/sandbox.scm b/demo/sandbox.scm
index 319ef80..6a6030f 100644
--- a/demo/sandbox.scm
+++ b/demo/sandbox.scm
@@ -159,16 +159,17 @@
 
     update: (lambda (game dt)
       (set! *demo-t* (+ *demo-t* dt))
-      (let* ((scene (game-scene game))
-             (tm    (scene-tilemap scene)))
-        (scene-update-entities scene (cut step-tweens <> dt))
-        (scene-update-entities scene (cut integrate-entity <> dt tm))
-        (scene-sync-groups! scene)
-        (scene-resolve-collisions scene)
-        (scene-update-entities scene
-          (lambda (e)
-            (if (entity-ref e #:gravity? #f)
-                (detect-on-solid e tm (scene-entities scene))
-                e)))))))
+      (let ((tm (scene-tilemap (game-scene game))))
+        (game-scene-set! game
+          (chain (game-scene game)
+            (scene-update-entities _ (cut step-tweens <> dt))
+            (scene-update-entities _ (cut integrate-entity <> dt tm))
+            (scene-sync-groups _)
+            (scene-resolve-collisions _)
+            (scene-update-entities _
+              (lambda (e)
+                (if (entity-ref e #:gravity? #f)
+                    (detect-on-solid e tm (scene-entities _))
+                    e)))))))))
 
 (game-run! *game*)