Resource system

apps/CMakeLists.txt

@@ -1,10 +1,4 @@
 add_subdirectory(_template)
-add_subdirectory(minimal_demo)
-add_subdirectory(sandbox)
-add_subdirectory(btcpp)
 add_subdirectory(asteroids)
-add_subdirectory(textdemo)
-add_subdirectory(stellarfield)
 add_subdirectory(galaxy)
-add_subdirectory(productionSandbox)
-add_subdirectory(markov_gen)
+add_subdirectory(sandboxes)

apps/asteroids/main.cpp

@@ -18,7 +18,7 @@
 int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
 try
 {
-    pg::game::Game game;
+    pg::game::Game game({});
 
     pg::game::SystemsFactory::registerSystem<asteroids::Lasers>("lasers");
     pg::game::SystemsFactory::registerSystem<asteroids::Player>("player");

apps/asteroids/systems/Background.cpp

@@ -3,6 +3,8 @@
 #include <pgGame/components/WindowDetails.hpp>
 #include "components/Entities.h"
 #include <pgGame/components/Drawable.hpp>
+#include <pgEngine/factories/Factories.hpp>
+#include <pgEngine/primitives/BackgoundSprite.hpp>
 
 void asteroids::Background::handle(const pg::FrameStamp&)
 {

apps/galaxy/Galaxy.cpp

@@ -14,8 +14,8 @@
 #include <systems/BehaviorSystem.hpp>
 #include <systems/StatsSystem.hpp>
 
-galaxy::GalacticCore::GalacticCore()
-  : game(std::make_unique<pg::game::Game>())
+galaxy::GalacticCore::GalacticCore(pg::game::GameConfig&& config)
+  : game(std::make_unique<pg::game::Game>(std::move(config)))
 {
 }
 
@@ -30,8 +30,8 @@ void galaxy::GalacticCore::setup()
     // TODO: from file
 
     static const auto event_sound_cfg = std::unordered_map<std::string, EventSound>{
-        {"PickEvent", {"../data/sound/asteroids/laser_short.wav"}},
-        {"MenuButtonPressed", {"../data/sounds/ui/spacebar-click-keyboard-199448.mp3"}}};
+        {"PickEvent", {"data/sound/asteroids/laser_short.wav"}},
+        {"MenuButtonPressed", {"data/sounds/ui/spacebar-click-keyboard-199448.mp3"}}};
 
     // TODO: structure of files/resources to be loaded
     //  the structure must be annotated to allow for dispatching to specific loader
@@ -41,13 +41,15 @@ void galaxy::GalacticCore::setup()
     game->getConfig().addPerSceneConfig<galaxy::SceneSoundScape>(
         "mainMenu",
         "soundScape",
-        {.background_music{.music_list{{"../data/music/dead-space-style-ambient-music-184793.mp3"}}},
+        {.background_music{.music_list{{"data/music/dead-space-style-ambient-music-184793.mp3"}}},
          .event_sounds = {event_sound_cfg}});
 
     game->getConfig().addPerSceneConfig<galaxy::SceneSoundScape>(
         "galaxy",
         "soundScape",
-        {.background_music{.music_list{{"../data/music/a-meditation-through-time-amp-space-11947.mp3"}}},
+        // {.background_music{.music_list{{"data/music/a-meditation-through-time-amp-space-11947.mp3"}}},
+        {.background_music{
+             .music_list{{"music/soundtracks/cylinders/Chris Zabriskie - Cylinders - 08 Cylinder Eight.mp3"}}},
          .event_sounds = {event_sound_cfg}
 
         });

apps/galaxy/Galaxy.hpp

@@ -7,7 +7,7 @@ class GalacticCore
 
 {
 public:
-    GalacticCore();
+    GalacticCore(pg::game::GameConfig&&);
 
     void setup();
 

apps/galaxy/gui/InSceneOptionsWidget.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include <gui/GameGuiWidget.hpp>
 #include <pgGame/events/GameEvents.hpp>
+#include <pgEngine/gui/ImGuiScopedWrappers.hpp>
+#include "menus/OptionsMenu.hpp"
 
 namespace galaxy::gui {
 
@@ -11,34 +13,13 @@ class InSceneOptionsWidget : public galaxy::gui::GameGuiWidget
 
     void draw([[maybe_unused]] pg::Gui& gui) override
     {
-        ImGui::Begin("In Scene Options", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-        // HACK:
-        if (getGame().getCurrentSceneId() == "galaxy")
+        if (getGame().getCurrentSceneId() != "galaxy") { return; }
+        auto& menu_active = getGame().getCurrentScene().getSingleton<bool&>("galaxy.options_menu.active");
+        if (!menu_active) { return; }
         {
-            // background opacity
-            auto opacity = getGame().getCurrentScene().callGetter<float>("galaxy.background.opacity");
-            if (ImGui::SliderFloat("Opacity", &opacity, 0.f, 1.f))
-            {
-                getGame().getCurrentScene().callSetter<float>("galaxy.background.opacity", opacity);
-            }
-            // grid visible
-            if (getGame().getCurrentScene().hasAccessor<float>("galaxy.grid.opacity"))
-            {
-                float gridVisible = getGame().getCurrentScene().callGetter<float>("galaxy.grid.opacity");
-                if (ImGui::SliderFloat("Grid Visibility", &gridVisible, 0.f, 1.f))
-                {
-                    getGame().getCurrentScene().callSetter<float>("galaxy.grid.opacity", gridVisible);
-                }
-            }
+            auto window = pgf::gui::Window("Options", &menu_active);
+            inGameOptions(getGame());
         }
-
-        auto volume = getGame().getCurrentScene().callGetter<float>("scene.sound.volume");
-        if (ImGui::SliderFloat("Global Volume", &volume, 0.f, 1.f))
-        {
-            getGame().getCurrentScene().callSetter<float>("scene.sound.volume", volume);
-        }
-
-        ImGui::End();
     }
 };
 

apps/galaxy/gui/LoadingBarWidget.hpp

@@ -0,0 +1,55 @@
+#pragma once
+#include <gui/GameGuiWidget.hpp>
+#include <imgui.h>
+#include <components/Stats.hpp>
+#include <ranges>
+#include <pgFoundation/imgui/Spinner.hpp>
+
+#include <pgGame/events/SceneManagementEvents.hpp>
+#include <pgEngine/gui/ImGuiScopedWrappers.hpp>
+
+namespace galaxy::gui {
+
+class LoadingBarWidget : public galaxy::gui::GameGuiWidget
+{
+    uint32_t numFramesFinished = 0;
+
+public:
+    using galaxy::gui::GameGuiWidget::GameGuiWidget;
+    static constexpr auto num_frames_to_fade = 200u;
+
+    void draw([[maybe_unused]] pg::Gui& gui) override
+    {
+        float totalProgress = getGame().getCurrentScene().getSingleton<float&>("resourceLoader.totalProgress");
+        if (totalProgress >= 1.0f) { numFramesFinished++; }
+        if (numFramesFinished > num_frames_to_fade) { return; }
+
+        ImGui::Begin("Loading Resources",
+                     nullptr,
+                     ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse |
+                         ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_AlwaysAutoResize);
+
+        ImGui::SetWindowPos(ImVec2(0, ImGui::GetIO().DisplaySize.y - ImGui::GetWindowHeight()));
+        ImGui::SetWindowSize(ImVec2(ImGui::GetIO().DisplaySize.x, 20));
+
+        ImGui::SetCursorPosX(10);
+
+        {
+            pgf::gui::StyleStack styleStack;
+            styleStack.pushStyleColor(ImGuiCol_Text, ImVec4{1.0f, 1.0f, 1.0f, 1.0f});
+            // if number of frames finished is > 0 slowly fade out
+            if (numFramesFinished > 0)
+            {
+                float alpha = 1.0f - numFramesFinished / static_cast<float>(num_frames_to_fade);
+                // use blending to fade out
+                styleStack.pushStyle(ImGuiStyleVar_Alpha, alpha);
+            }
+
+            ImGui::ProgressBar(totalProgress, ImVec2{ImGui::GetIO().DisplaySize.x - 20, 40}, "");
+        }
+
+        ImGui::End();
+    }
+};
+
+} // namespace galaxy::gui