Simple Loot UI started.

autowalker.cpp

@@ -1,7 +1,7 @@
 #include "autowalker.hpp"
 #include "inventory.hpp"
 #include "ai_debug.hpp"
-#include "ritual_ui.hpp"
+#include "gui/ritual_ui.hpp"
 
 template<typename Comp>
 int number_left(gui::FSM& fsm) {

autowalker.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "ai.hpp"
 
-#include "gui_fsm.hpp"
+#include "gui/gui_fsm.hpp"
 
 struct InventoryStats;
 

gui/boss_fight_ui.cpp

@@ -1,4 +1,4 @@
-#include "boss_fight_ui.hpp"
+#include "gui/boss_fight_ui.hpp"
 #include "easings.hpp"
 #include "sound.hpp"
 #include <fmt/xchar.h>

gui/combat_ui.cpp

@@ -1,4 +1,4 @@
-#include "combat_ui.hpp"
+#include "gui/combat_ui.hpp"
 #include "constants.hpp"
 #include "color.hpp"
 #include "rituals.hpp"

gui/debug_ui.cpp

@@ -1,4 +1,4 @@
-#include "debug_ui.hpp"
+#include "gui/debug_ui.hpp"
 #include "constants.hpp"
 #include "color.hpp"
 #include "events.hpp"

gui/gui_fsm.cpp

@@ -23,6 +23,7 @@ namespace gui {
     $status_ui($level),
     $map_ui($level),
     $mini_map($level),
+    $loot_ui($level),
     $font{FONT_FILE_NAME}
     {
     }
@@ -37,6 +38,7 @@ namespace gui {
       FSM_STATE(State, IN_COMBAT, ev);
       FSM_STATE(State, COMBAT_ROTATE, ev);
       FSM_STATE(State, NEXT_LEVEL, ev);
+      FSM_STATE(State, LOOTING, ev);
       FSM_STATE(State, END, ev);
     }
   }
@@ -46,6 +48,7 @@ namespace gui {
     $main_ui.update_level($level);
     $level.world->set_the<Debug>({});
     $main_ui.init();
+    $loot_ui.init();
 
     // BUG: maybe this is a function on main_ui?
     auto cell = $main_ui.$overlay_ui.$gui.cell_for("left");
@@ -110,6 +113,22 @@ namespace gui {
     }
   }
 
+  void FSM::LOOTING(Event ev) {
+    using enum Event;
+
+    switch(ev) {
+      case LOOT_OPEN:
+        $loot_ui.active = false;
+        state(State::IDLE);
+        break;
+      case TICK:
+        // do nothing
+        break;
+      default:
+        state(State::LOOTING);
+    }
+  }
+
   void FSM::IDLE(Event ev) {
     using enum Event;
 
@@ -161,6 +180,10 @@ namespace gui {
       case TICK:
         // do nothing
         break;
+      case LOOT_OPEN:
+        $loot_ui.active = true;
+        state(State::LOOTING);
+        break;
       default:
         dbc::sentinel("unhandled event in IDLE");
     }
@@ -248,6 +271,7 @@ namespace gui {
             $combat_ui.mouse(pos.x, pos.y, false);
             $status_ui.mouse(pos.x, pos.y, false);
             $main_ui.mouse(pos.x, pos.y, false);
+            if($loot_ui.active) $loot_ui.mouse(pos.x, pos.y, false);
           }
         }
       } else if(const auto* mouse = ev->getIf<sf::Event::MouseMoved>()) {
@@ -303,6 +327,9 @@ namespace gui {
           case KEY::L:
             event(Event::STAIRS_DOWN);
             break;
+          case KEY::X:
+            event(Event::LOOT_OPEN);
+            break;
           default:
             break; // ignored
         }
@@ -322,6 +349,8 @@ namespace gui {
       $status_ui.render($window);
       $combat_ui.render($window);
 
+      if($loot_ui.active) $loot_ui.render($window);
+
       if($map_open) {
         $map_ui.render($window, $main_ui.$compass_dir);
       } else {
@@ -442,6 +471,7 @@ namespace gui {
     $mini_map.update_level($level);
     $combat_ui.update_level($level);
     $main_ui.update_level($level);
+    $loot_ui.update_level($level);
 
     $boss_fight_ui = $levels.create_bossfight($level.world);
     $boss_fight_ui->init();

gui/gui_fsm.hpp

@@ -3,11 +3,12 @@
 #include "stats.hpp"
 #include "levelmanager.hpp"
 #include "fsm.hpp"
-#include "debug_ui.hpp"
+#include "gui/debug_ui.hpp"
-#include "main_ui.hpp"
+#include "gui/main_ui.hpp"
-#include "combat_ui.hpp"
+#include "gui/combat_ui.hpp"
-#include "status_ui.hpp"
+#include "gui/status_ui.hpp"
-#include "boss_fight_ui.hpp"
+#include "gui/loot_ui.hpp"
+#include "gui/boss_fight_ui.hpp"
 #include "map_view.hpp"
 #include "mini_map.hpp"
 
@@ -20,6 +21,7 @@ namespace gui {
     ATTACKING,
     ROTATING,
     NEXT_LEVEL,
+    LOOTING,
     IDLE,
     END
   };
@@ -39,7 +41,8 @@ namespace gui {
     START_COMBAT = 11,
     STOP_COMBAT = 12,
     STAIRS_DOWN = 13,
-    QUIT = 14
+    LOOT_OPEN=14,
+    QUIT = 15
   };
 
   class FSM : public DeadSimpleFSM<State, Event> {
@@ -58,6 +61,7 @@ namespace gui {
       StatusUI $status_ui;
       MapViewUI $map_ui;
       MiniMapUI $mini_map;
+      LootUI $loot_ui;
       sf::Font $font;
 
       FSM();
@@ -75,6 +79,7 @@ namespace gui {
       void IN_COMBAT(Event ev);
       void COMBAT_ROTATE(Event ev);
       void NEXT_LEVEL(Event ev);
+      void LOOTING(Event ev);
       void END(Event ev);
 
       void try_move(int dir, bool strafe);

gui/loot_ui.cpp

@@ -0,0 +1,51 @@
+#include "gui/loot_ui.hpp"
+#include "constants.hpp"
+#include "color.hpp"
+#include <fmt/xchar.h>
+#include "guecstra.hpp"
+
+namespace gui {
+  using namespace guecs;
+
+  LootUI::LootUI(GameLevel level) :
+      $level(level)
+  {
+    $gui.position(RAY_VIEW_X+RAY_VIEW_WIDTH/2-200,
+        RAY_VIEW_Y+RAY_VIEW_HEIGHT/2-200, 400, 400);
+
+    $gui.layout(
+        "[button_0 | button_1|button_2 | button_3]"
+        "[button_4 | button_5|button_6 | button_7]"
+        "[button_8 | button_9|button_10 | button_11]"
+        "[button_12 | button_13|button_14 | button_15]"
+        );
+  }
+
+  void LootUI::init() {
+    $gui.set<Background>($gui.MAIN, {$gui.$parser, ColorValue::DARK_MID});
+    for(auto [name, cell] : $gui.cells()) {
+      auto id = $gui.entity(name);
+      $gui.set<guecs::Rectangle>(id, {});
+      if(id < 4) {
+        $gui.set<guecs::Clickable>(id, {
+            [=](auto, auto) { fmt::println("clicked {}", name); }
+        });
+        $gui.set<guecs::Sprite>(id, {"broken_yoyo-64"});
+      }
+    }
+    $gui.init();
+  }
+
+  void LootUI::render(sf::RenderWindow& window) {
+    $gui.render(window);
+  }
+
+  void LootUI::update_level(GameLevel &level) {
+    $level = level;
+    init();
+  }
+
+  bool LootUI::mouse(float x, float y, bool hover) {
+    return $gui.mouse(x, y, hover);
+  }
+}

gui/loot_ui.hpp

@@ -0,0 +1,22 @@
+#pragma once
+#include "levelmanager.hpp"
+#include <SFML/Graphics/RenderWindow.hpp>
+#include <SFML/Graphics/Font.hpp>
+#include <guecs/ui.hpp>
+#include "events.hpp"
+
+namespace gui {
+  class LootUI {
+    public:
+      bool active = false;
+      guecs::UI $gui;
+      GameLevel $level;
+
+      LootUI(GameLevel level);
+
+      void init();
+      void render(sf::RenderWindow& window);
+      void update_level(GameLevel &level);
+      bool mouse(float x, float y, bool hover);
+  };
+}

gui/main_ui.cpp

@@ -1,4 +1,4 @@
-#include "main_ui.hpp"
+#include "gui/main_ui.hpp"
 #include "components.hpp"
 #include "easings.hpp"
 #include <fmt/xchar.h>

gui/main_ui.hpp

@@ -3,12 +3,12 @@
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/System/Clock.hpp>
 #include "stats.hpp"
-#include "overlay_ui.hpp"
+#include <guecs/ui.hpp>
-#include "debug_ui.hpp"
+#include "gui/overlay_ui.hpp"
+#include "gui/debug_ui.hpp"
 #include "raycaster.hpp"
 #include "camera.hpp"
 #include <optional>
-#include <guecs/ui.hpp>
 
 namespace gui {
 

gui/overlay_ui.cpp

@@ -1,4 +1,4 @@
-#include "overlay_ui.hpp"
+#include "gui/overlay_ui.hpp"
 #include "constants.hpp"
 #include "color.hpp"
 #include "events.hpp"

gui/ritual_ui.cpp

@@ -1,4 +1,4 @@
-#include "ritual_ui.hpp"
+#include "gui/ritual_ui.hpp"
 #include "components.hpp"
 #include <guecs/ui.hpp>
 #include "rand.hpp"

gui/status_ui.cpp

@@ -1,4 +1,4 @@
-#include "status_ui.hpp"
+#include "gui/status_ui.hpp"
 #include "components.hpp"
 #include "inventory.hpp"
 #include "color.hpp"

gui/status_ui.hpp

@@ -4,7 +4,7 @@
 #include <deque>
 #include "textures.hpp"
 #include <guecs/ui.hpp>
-#include "ritual_ui.hpp"
+#include "gui/ritual_ui.hpp"
 
 namespace gui {
   class StatusUI {

levelmanager.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include "spatialmap.hpp"
 #include "components.hpp"
-#include "boss_fight_ui.hpp"
+#include "gui/boss_fight_ui.hpp"
 
 using std::shared_ptr;
 

main.cpp

@@ -1,4 +1,4 @@
-#include "gui_fsm.hpp"
+#include "gui/gui_fsm.hpp"
 #include "textures.hpp"
 #include "sound.hpp"
 #include "autowalker.hpp"
@@ -33,6 +33,7 @@ int main(int argc, char* argv[]) {
       // ZED: need to sort out how to deal with this in the FSM
       if(main.in_state(gui::State::IDLE)
           || main.in_state(gui::State::NEXT_LEVEL)
+          || main.in_state(gui::State::LOOTING)
           || main.in_state(gui::State::IN_COMBAT))
       {
         if(main.autowalking) {

meson.build

@@ -86,32 +86,25 @@ sources = [
   'autowalker.cpp',
   'backend.cpp',
   'battle.cpp',
-  'boss_fight_ui.cpp',
   'camera.cpp',
   'combat.cpp',
-  'combat_ui.cpp',
   'components.cpp',
   'config.cpp',
   'dbc.cpp',
-  'debug_ui.cpp',
   'devices.cpp',
   'goap.cpp',
   'guecstra.cpp',
-  'gui_fsm.cpp',
   'inventory.cpp',
   'levelmanager.cpp',
   'lights.cpp',
-  'main_ui.cpp',
   'map.cpp',
   'map_view.cpp',
   'matrix.cpp',
   'matrix.cpp',
   'mini_map.cpp',
-  'overlay_ui.cpp',
   'pathing.cpp',
   'rand.cpp',
   'raycaster.cpp',
-  'ritual_ui.cpp',
   'rituals.cpp',
   'save.cpp',
   'shaders.cpp',
@@ -119,10 +112,18 @@ sources = [
   'sound.cpp',
   'spatialmap.cpp',
   'stats.cpp',
-  'status_ui.cpp',
   'systems.cpp',
   'textures.cpp',
   'tilemap.cpp',
+  'gui/boss_fight_ui.cpp',
+  'gui/loot_ui.cpp',
+  'gui/combat_ui.cpp',
+  'gui/debug_ui.cpp',
+  'gui/gui_fsm.cpp',
+  'gui/main_ui.cpp',
+  'gui/overlay_ui.cpp',
+  'gui/ritual_ui.cpp',
+  'gui/status_ui.cpp',
   'worldbuilder.cpp',
 ]