commit 55d6b0c774879f16736a98b495052daa135f0fc4
author Taylor Cramer <cramertj@google.com> Fri Aug 09 23:04:24 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 09 23:04:24 2024 +0000
tree 7e9c28bcc7b9b581640737a317a94a84037051ba
parent 3c56c4a07e1154cee37311f7cd4a60cdc44f0ff2

32blit_demo: Use D-pad to control text position

Change-Id: I7ac48bbc6a7889704bf4c690cbc74dc09f398581
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/kudzu/+/228561
Pigweed-Auto-Submit: Taylor Cramer <cramertj@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Reviewed-by: Anthony DiGirolamo <tonymd@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>

applications/32blit_demo/main.cc

diff --git a/applications/32blit_demo/main.cc b/applications/32blit_demo/main.cc
index 91d417f..b0c6721 100644
--- a/applications/32blit_demo/main.cc
+++ b/applications/32blit_demo/main.cc
@@ -117,6 +117,8 @@
   Framebuffer framebuffer = display.GetFramebuffer();
   PW_ASSERT(framebuffer.is_valid());
 
+  kudzu::Buttons& kudzu_buttons = Common::GetButtons();
+
   blit::Surface screen = blit::Surface(
       (uint8_t*)framebuffer.data(),
       blit::PixelFormat::RGB565,
@@ -125,9 +127,25 @@
   screen.clear();
 
   display.ReleaseFramebuffer(std::move(framebuffer));
+  int32_t text_pos_x = screen.bounds.w / 2;
+  int32_t text_pos_y = screen.bounds.h * .75;
 
   // The display loop.
   while (1) {
+    kudzu_buttons.Update();
+    if (kudzu_buttons.Held(kudzu::button::up)) {
+      text_pos_y -= 1;
+    }
+    if (kudzu_buttons.Held(kudzu::button::down)) {
+      text_pos_y += 1;
+    }
+    if (kudzu_buttons.Held(kudzu::button::left)) {
+      text_pos_x -= 1;
+    }
+    if (kudzu_buttons.Held(kudzu::button::right)) {
+      text_pos_x += 1;
+    }
+
     frame_counter.StartFrame();
 
     framebuffer = display.GetFramebuffer();
@@ -142,10 +160,32 @@
     // Draw 32blit animation
     std::string text = "Pigweed + 32blit";
     auto text_size = screen.measure_text(text, blit::minimal_font, true);
-    blit::Rect text_rect(
-        blit::Point((screen.bounds.w / 2) - (text_size.w / 2),
-                    (screen.bounds.h * .75) - (text_size.h / 2)),
-        text_size);
+
+    // Ensure that the text stays on-screen by wrapping its position around.
+    int32_t width = screen.bounds.w;
+    int32_t height = screen.bounds.h;
+
+    int32_t min_x = 0 - (text_size.w / 2);
+    int32_t max_x = width + (text_size.w / 2);
+    int32_t min_y = 0 - (text_size.h / 2);
+    int32_t max_y = height + (text_size.h / 2);
+
+    if (text_pos_x < min_x) {
+      text_pos_x = max_x;
+    }
+    if (text_pos_x > max_x) {
+      text_pos_x = min_x;
+    }
+    if (text_pos_y < min_y) {
+      text_pos_y = max_y;
+    }
+    if (text_pos_y > max_y) {
+      text_pos_y = min_y;
+    }
+
+    blit::Rect text_rect(blit::Point(text_pos_x - (text_size.w / 2),
+                                     text_pos_y - (text_size.h / 2)),
+                         text_size);
 
     rain(screen, frame_counter.LastFrameDuration(), text_rect);
     screen.pen = blit::Pen(0xFF, 0xFF, 0xFF);