From 2ecef8d9f99a70b738b0d019e86f0127f558b734 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 15 Apr 2025 11:38:38 -0400
Subject: [PATCH] Have a basic little click sound going, but hover events will
 need some work.  I'm doing those on every mouse move.

---
 assets/config.json |  4 +++-
 combat_ui.cpp      |  1 +
 guecs.cpp          | 15 +++++++++++++++
 guecs.hpp          |  7 +++++++
 sound.cpp          | 10 +++++-----
 sound.hpp          | 10 +++++-----
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/assets/config.json b/assets/config.json
index d955570..d35f76a 100644
--- a/assets/config.json
+++ b/assets/config.json
@@ -17,7 +17,9 @@
     "Marmot_Scream_1": "assets/sounds/Creature_Sounds-Marmot_Scream_1.ogg",
     "blank": "assets/sounds/blank.ogg",
     "pickup": "assets/sounds/pickup.ogg",
-    "ambient_1": "assets/sounds/ambient_1.ogg"
+    "ambient_1": "assets/sounds/ambient_1.ogg",
+    "ui_click": "assets/sounds/ui_click.ogg",
+    "ui_hover": "assets/sounds/ui_hover.ogg"
   },
   "sprites": {
     "gold_savior":
diff --git a/combat_ui.cpp b/combat_ui.cpp
index da9ebe6..0e2fee0 100644
--- a/combat_ui.cpp
+++ b/combat_ui.cpp
@@ -17,6 +17,7 @@ namespace gui {
     auto button = $gui.entity(name);
     $gui.set<Sprite>(button, {"leather_pouch-128"});
     // $gui.set<Rectangle>(button, {});
+    $gui.set<Sound>(button, {"ui_click", "ui_hover"});
     $gui.set<Label>(button, {label});
     $gui.set<Effect>(button, {.duration=0.1f});
     $gui.set<Clickable>(button,
diff --git a/guecs.cpp b/guecs.cpp
index 0866f78..528d0fe 100644
--- a/guecs.cpp
+++ b/guecs.cpp
@@ -1,5 +1,6 @@
 #include "guecs.hpp"
 #include "shaders.hpp"
+#include "sound.hpp"
 
 namespace guecs {
 
@@ -58,6 +59,14 @@ namespace guecs {
     bar.init(cell);
   }
 
+  void Sound::play(bool hover) {
+    if(hover) {
+      // BUG: need to sort out how to make hover a one shot thing
+      // sound::play(on_hover);
+    } else {
+      sound::play(on_click);
+    }
+  }
 
   void Background::init() {
     sf::Vector2f size{float(w), float(h)};
@@ -232,6 +241,12 @@ namespace guecs {
           effect.run();
         }
 
+        if($world.has<Sound>(ent)) {
+          auto& sound = $world.get<Sound>(ent);
+          sound.play(hover);
+        }
+
+
         if(hover) return; // kinda gross
 
         if(auto action_data = get_if<ActionData>(ent)) {
diff --git a/guecs.hpp b/guecs.hpp
index a75dd5e..36477ee 100644
--- a/guecs.hpp
+++ b/guecs.hpp
@@ -97,6 +97,13 @@ namespace guecs {
     shared_ptr<sf::Shader> checkout_ptr();
   };
 
+  struct Sound {
+    std::string on_click{""};
+    std::string on_hover{""};
+
+    void play(bool hover);
+  };
+
   struct Background {
     float x = 0.0f;
     float y = 0.0f;
diff --git a/sound.cpp b/sound.cpp
index 4422abb..cf8c48a 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -37,7 +37,7 @@ namespace sound {
     }
   }
 
-  void load(const std::string name, const std::string sound_path) {
+  void load(const std::string& name, const std::string& sound_path) {
     dbc::check(fs::exists(sound_path), fmt::format("sound file {} does not exist", sound_path));
 
     // create the buffer and keep in the buffer map
@@ -51,7 +51,7 @@ namespace sound {
     SMGR.sounds.try_emplace(name, buffer, sound);
   }
 
-  void play(const std::string name, bool loop) {
+  void play(const std::string& name, bool loop) {
     if(muted) return;
     auto& pair = get_sound_pair(name);
     pair.sound->setLooping(loop);
@@ -59,18 +59,18 @@ namespace sound {
     pair.sound->play();
   }
 
-  void stop(const std::string name) {
+  void stop(const std::string& name) {
     auto& pair = get_sound_pair(name);
     pair.sound->stop();
   }
 
-  bool playing(const std::string name) {
+  bool playing(const std::string& name) {
     auto& pair = get_sound_pair(name);
     auto status = pair.sound->getStatus();
     return status == sf::SoundSource::Status::Playing;
   }
 
-  void play_at(const std::string name, float x, float y, float z) {
+  void play_at(const std::string& name, float x, float y, float z) {
     auto& pair = get_sound_pair(name);
     pair.sound->setPosition({x, y, z});
     pair.sound->play();
diff --git a/sound.hpp b/sound.hpp
index bf6a058..3dc21cc 100644
--- a/sound.hpp
+++ b/sound.hpp
@@ -16,11 +16,11 @@ namespace sound {
   };
 
   void init();
-  void load(const std::string name, const std::string path);
-  void play(const std::string name, bool loop=false);
-  void play_at(const std::string name, float x, float y, float z);
-  void stop(const std::string name);
+  void load(const std::string& name, const std::string& path);
+  void play(const std::string& name, bool loop=false);
+  void play_at(const std::string& name, float x, float y, float z);
+  void stop(const std::string& name);
   void mute(bool setting);
-  bool playing(const std::string name);
+  bool playing(const std::string& name);
   SoundPair& get_sound_pair(const std::string& name);
 }