From c59c81a4eacee39d7ec50e58133ffb9bd16d3d1e Mon Sep 17 00:00:00 2001
From: tali <iitalics@gmail.com>
Date: Fri, 19 Jan 2024 19:58:34 -0500
Subject: [PATCH] compose tetris HUD scene

---
 assets/main.scene | 39 +++++++++++++++++++++++++++++----------
 src/main.ml       |  2 +-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/assets/main.scene b/assets/main.scene
index 97fff15..1ec980f 100644
--- a/assets/main.scene
+++ b/assets/main.scene
@@ -1,12 +1,31 @@
 (scene
  (object root
-  (object L
-   (object (sprite blocks L (pos 0 0)))
-   (object (sprite blocks L (pos 32 0)))
-   (object (sprite blocks L (pos 64 0)))
-   (object (sprite blocks L (pos 64 -32))))
-  (object J
-   (object (sprite blocks J (pos -96 32)))
-   (object (sprite blocks J (pos -64 32)))
-   (object (sprite blocks J (pos -32 32)))
-   (object (sprite blocks J (pos -32 64))))))
+
+  (object playfield
+   (transform (tx -160) (ty 320))
+   (sprite hud grid)
+   (sprite hud field)
+   (object blocks
+    (sprite blocks L (pos 0 0))
+    (sprite blocks L (pos 32 0))
+    (sprite blocks L (pos 64 0))
+    (sprite blocks L (pos 64 -32))))
+
+  (object hold
+   (transform (tx -272) (ty -272))
+   (sprite hud hold))
+
+  (object next
+   (transform (tx 272) (ty -272))
+   (sprite hud next))
+
+  (object left_labels
+   (transform (tx -172) (ty 320))
+   (sprite hud pps (pos -12 -148))
+   (sprite hud kpp (pos -12 -116))
+   (sprite hud time (pos 0 -25))
+   (sprite hud num (pos 0 -73)))
+
+  (object right_labels
+   (transform (tx 272) (ty 320))
+   (sprite hud lines_rem (pos 0 -20)))))
diff --git a/src/main.ml b/src/main.ml
index e36f496..e9984f5 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -30,7 +30,7 @@ let main () =
 
       let tf = TG.model (Scene.transform root) in
       begin
-        let tx = 512.0 +. Float.sin (time *. 3.0) *. 100.0 in
+        let tx = 512.0 +. Float.sin (time *. 3.0) *. 20.0 in
         let ty = 400.0 in
         let _ = time in
         Mat2A.set tf ~tx ~ty ~sx:1.0 ~sy:1.0