From 389690e5c35f0998dcc373aa18fb0614ca4db1a4 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Sat, 22 Feb 2025 22:27:56 -0500
Subject: [PATCH] Optimize GUECS a bit so that it automatically sets up the
 cell names and lel::Cell contents in the world, making it easier to work
 with.

---
 combat_ui.cpp   | 2 --
 guecs.cpp       | 5 +++++
 overlay_ui.cpp  | 5 -----
 status_ui.cpp   | 2 --
 tests/sound.cpp | 4 ++--
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/combat_ui.cpp b/combat_ui.cpp
index eb43103..96a5ddc 100644
--- a/combat_ui.cpp
+++ b/combat_ui.cpp
@@ -23,14 +23,12 @@ namespace gui {
     for(auto& [name, cell] : $gui.cells()) {
       if(name.starts_with("button_")) {
         auto button = $gui.entity(name);
-        world.set<lel::Cell>(button, cell);
         world.set<Rectangle>(button, {});
         world.set<Clickable>(button,
             guecs::make_action(*$level.world, Events::GUI::ATTACK));
         world.set<Label>(button, {"Attack"});
       } else if(name.starts_with("bar_")) {
         $meter = $gui.entity(name);
-        world.set<lel::Cell>($meter, cell);
         world.set<Rectangle>($meter, {});
         world.set<Meter>($meter, {});
       } else {
diff --git a/guecs.cpp b/guecs.cpp
index b80736d..aa42f3f 100644
--- a/guecs.cpp
+++ b/guecs.cpp
@@ -12,6 +12,11 @@ namespace guecs {
   void UI::layout(std::string grid) {
     $grid = grid;
     $parser.parse($grid);
+
+    for(auto& [name, cell] : $parser.cells) {
+      auto ent = entity(name);
+      $world.set<lel::Cell>(ent, cell);
+    }
   }
 
   DinkyECS::Entity UI::entity(std::string name) {
diff --git a/overlay_ui.cpp b/overlay_ui.cpp
index 4ccd1d4..d123a98 100644
--- a/overlay_ui.cpp
+++ b/overlay_ui.cpp
@@ -22,11 +22,6 @@ namespace gui {
   }
 
   void OverlayUI::render() {
-    auto &world = $gui.world();
-    for(auto &[name, cell] : $gui.cells()) {
-      auto region = $gui.entity(name);
-      world.set<lel::Cell>(region, cell);
-    }
     $gui.init();
   }
 
diff --git a/status_ui.cpp b/status_ui.cpp
index a7784fd..4ba56b9 100644
--- a/status_ui.cpp
+++ b/status_ui.cpp
@@ -30,7 +30,6 @@ namespace gui {
     for(auto& [name, cell] : $gui.cells()) {
       if(name == "log_view") {
         $log_to = $gui.entity("log_view");
-        world.set<lel::Cell>($log_to, cell);
         world.set<Rectangle>($log_to, {});
         world.set<Textual>($log_to, {"Welcome to the Game!", 20});
       } else {
@@ -39,7 +38,6 @@ namespace gui {
         auto& fake_item = fake_items[selected_item];
 
         auto button = $gui.entity(name);
-        world.set<lel::Cell>(button, cell);
         world.set<Rectangle>(button, {});
         world.set<Sprite>(button, {fake_item});
         world.set<Clickable>(button,
diff --git a/tests/sound.cpp b/tests/sound.cpp
index 8279141..6f96650 100644
--- a/tests/sound.cpp
+++ b/tests/sound.cpp
@@ -9,7 +9,7 @@ using namespace fmt;
 TEST_CASE("test sound manager", "[sound]") {
   sound::init();
 
-  sound::play("sword_1");
+  sound::play("blank");
 
-  sound::play_at("sword_1", 0.1, 0.1, 0.1);
+  sound::play_at("blank", 0.1, 0.1, 0.1);
 }