Skip to content

Commit 493e537

Browse files
committed
rename SplashData in SplashResources
1 parent ef7994f commit 493e537

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

games/HOME/bits/GameHub.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <gf2/graphics/RenderAsync.h>
1212
#include <gf2/graphics/SceneManager.h>
1313

14-
#include "SplashData.h"
14+
#include "SplashResources.h"
1515
#include "SplashScene.h"
1616
#include "WorldData.h"
1717
#include "WorldScene.h"
@@ -35,7 +35,7 @@ namespace home {
3535
}
3636

3737
private:
38-
SplashData m_splash_data;
38+
SplashResources m_splash_data;
3939
std::unique_ptr<SplashScene> m_splash_scene = nullptr;
4040

4141
gf::RenderAsync m_world_async;

games/HOME/bits/SplashData.cc renamed to games/HOME/bits/SplashResources.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#include "SplashData.h"
1+
#include "SplashResources.h"
22

33
#include "GameHub.h"
44

55
namespace home {
66

7-
SplashData::SplashData()
7+
SplashResources::SplashResources()
88
{
99
// title_sprite
1010

@@ -25,7 +25,7 @@ namespace home {
2525
click_text.data.color = gf::Color(0x44548E);
2626
}
2727

28-
gf::ResourceBundle SplashData::bundle(GameHub* hub)
28+
gf::ResourceBundle SplashResources::bundle(GameHub* hub)
2929
{
3030
gf::ResourceBundle bundle([hub, this](gf::ResourceBundle* bundle, gf::ResourceManager* resources, gf::ResourceAction action) {
3131
// fonts

games/HOME/bits/SplashData.h renamed to games/HOME/bits/SplashResources.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
namespace home {
1010
class GameHub;
1111

12-
struct SplashData {
13-
SplashData();
12+
struct SplashResources {
13+
SplashResources();
1414

1515
gf::ResourceBundle bundle(GameHub* hub);
1616

games/HOME/bits/SplashScene.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
namespace home {
66

7-
SplashScene::SplashScene(GameHub* hub, const SplashData& data)
7+
SplashScene::SplashScene(GameHub* hub, const SplashResources& resources)
88
: m_hub(hub)
99
, m_atlas({ 1024, 1024 }, hub->render_manager())
1010
, m_action_group(compute_settings())
11-
, m_title_sprite(data.title_sprite, hub->render_manager(), hub->resource_manager())
12-
, m_title_text(&m_atlas, data.title_text, hub->render_manager(), hub->resource_manager())
13-
, m_click_text(&m_atlas, data.click_text, hub->render_manager(), hub->resource_manager())
11+
, m_title_sprite(resources.title_sprite, hub->render_manager(), hub->resource_manager())
12+
, m_title_text(&m_atlas, resources.title_text, hub->render_manager(), hub->resource_manager())
13+
, m_click_text(&m_atlas, resources.click_text, hub->render_manager(), hub->resource_manager())
1414
{
1515
set_clear_color(gf::Color(0xAEF6B8));
1616
set_world_center({ 0.0f, 0.0f });

games/HOME/bits/SplashScene.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
#include <gf2/graphics/SpriteEntity.h>
99
#include <gf2/graphics/TextEntity.h>
1010

11-
#include "SplashData.h"
11+
#include "SplashResources.h"
1212

1313
namespace home {
1414
class GameHub;
1515

1616
class SplashScene : public gf::Scene {
1717
public:
18-
SplashScene(GameHub* hub, const SplashData& data);
18+
SplashScene(GameHub* hub, const SplashResources& resources);
1919

2020
private:
2121
static gf::ActionGroupSettings compute_settings();

0 commit comments

Comments
 (0)