use BundleBuilder in SpashResources

Author: jube

games/HOME/bits/SplashResources.cc

@@ -1,5 +1,7 @@
 #include "SplashResources.h"
 
+#include <gf2/framework/BundleBuilder.h>
+
 #include "GameHub.h"
 
 namespace home {
@@ -25,23 +27,15 @@ namespace home {
     click_text.data.color = gf::Color(0x44548E);
   }
 
-  gf::ResourceBundle SplashResources::bundle(GameHub* hub)
+  gf::ResourceBundle SplashResources::bundle(GameHub* hub) const
   {
-    gf::ResourceBundle bundle([hub, this](gf::ResourceBundle* bundle, gf::ResourceManager* resources, gf::ResourceAction action) {
-      // fonts
-
-      for (const gf::TextResource* resource : { &title_text, &click_text }) {
-        bundle->handle<gf::FontFace>(resource->font, hub->font_manager(), resources, action);
-      }
-
-      // textures
+    gf::BundleBuilder builder(hub);
 
-      for (const gf::SpriteResource* resource : { &title_sprite }) {
-        bundle->handle<gf::Texture>(resource->texture, hub->render_manager(), resources, action);
-      }
-    });
+    builder.add_in_bundle(title_sprite);
+    builder.add_in_bundle(title_text);
+    builder.add_in_bundle(click_text);
 
-    return bundle;
+    return builder.make_bundle();
   }
 
 }

games/HOME/bits/SplashResources.h

@@ -12,7 +12,7 @@ namespace home {
   struct SplashResources {
     SplashResources();
 
-    gf::ResourceBundle bundle(GameHub* hub);
+    gf::ResourceBundle bundle(GameHub* hub) const;
 
     gf::SpriteResource title_sprite;
     gf::TextResource title_text;

include/gf2/framework/BundleBuilder.h

@@ -14,6 +14,7 @@ namespace gf {
   class AudioManager;
   class FontManager;
   class RenderManager;
+  class SceneSystem;
   struct AnimationResource;
   struct AnimationGroupResource;
   struct AudioSourceResource;
@@ -26,6 +27,7 @@ namespace gf {
   class GF_FRAMEWORK_API BundleBuilder {
   public:
     BundleBuilder(RenderManager* render_manager, FontManager* font_manager, AudioManager* audio_manager);
+    BundleBuilder(SceneSystem* scene_manager);
 
     void add_in_bundle(const AnimationResource& resource);
     void add_in_bundle(const AnimationGroupResource& resource);

library/framework/BundleBuilder.cc

@@ -15,6 +15,7 @@
 #include <gf2/audio/Sound.h>
 #include <gf2/graphics/Texture.h>
 #include <gf2/graphics/RichMap.h>
+#include <gf2/framework/SceneSystem.h>
 
 namespace gf {
   BundleBuilder::BundleBuilder(RenderManager* render_manager, FontManager* font_manager, AudioManager* audio_manager)
@@ -24,6 +25,13 @@ namespace gf {
   {
   }
 
+  BundleBuilder::BundleBuilder(SceneSystem* scene_manager)
+  : m_render_manager(scene_manager->render_manager())
+  , m_font_manager(scene_manager->font_manager())
+  , m_audio_manager(scene_manager->audio_manager())
+  {
+  }
+
   void BundleBuilder::add_in_bundle(const AnimationResource& resource)
   {
     for (const std::filesystem::path& texture : resource.textures) {