Skip to content

Commit

Permalink
Merge pull request #17 from Ursanon/feature/player
Browse files Browse the repository at this point in the history
added background
  • Loading branch information
Krzysztof Begiedza authored Apr 30, 2020
2 parents c5ea1f4 + 224e995 commit 2305163
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 6 deletions.
18 changes: 12 additions & 6 deletions engine/src/Resources/ResourceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ bs::ResourceManager::ResourceManager(IRenderTarget& context)
: context_(context)
{
assetsToLoad_.emplace(0, "Assets/Textures/player_fly");
assetsToLoad_.emplace(1, "Assets/Textures/bg");
}

void bs::ResourceManager::PreloadAssets()
Expand Down Expand Up @@ -59,16 +60,21 @@ std::unique_ptr<bs::Scene> bs::ResourceManager::LoadScene()
{
auto fakeScene = std::make_unique<Scene>();

auto entity = std::unique_ptr<GameEntity>(new GameEntity(0));
std::shared_ptr<IEntityComponent> spriteRenderer = std::make_shared<SpriteRenderer>(entity.get(), sprites_[101].get());
entity->AddComponent(spriteRenderer);
auto backgroundEntity = std::unique_ptr<GameEntity>(new GameEntity(0));
std::shared_ptr<IEntityComponent> bgRenderer = std::make_shared<SpriteRenderer>(backgroundEntity.get(), sprites_[110].get());
backgroundEntity->AddComponent(bgRenderer);
fakeScene->AddEntity(std::move(backgroundEntity));

auto playerEntity = std::unique_ptr<GameEntity>(new GameEntity(1));
std::shared_ptr<IEntityComponent> spriteRenderer = std::make_shared<SpriteRenderer>(playerEntity.get(), sprites_[101].get());
playerEntity->AddComponent(spriteRenderer);

const float speed = 100.f;
const float angularSpeed = 100.f;
std::shared_ptr<IEntityComponent> playerController = std::make_shared<game::PlayerController>(entity.get(), speed, angularSpeed);
entity->AddComponent(playerController);
std::shared_ptr<IEntityComponent> playerController = std::make_shared<game::PlayerController>(playerEntity.get(), speed, angularSpeed);
playerEntity->AddComponent(playerController);

fakeScene->AddEntity(std::move(entity));
fakeScene->AddEntity(std::move(playerEntity));

return fakeScene;
}
Binary file added game/Assets/Textures/bg.bmp
Binary file not shown.
14 changes: 14 additions & 0 deletions game/Assets/Textures/bg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"Id": 1,
"Sprites": [
{
"Id": 110,
"Rect": {
"X": 0,
"Y": 0,
"Width": 1920,
"Height": 1281
}
}
]
}

0 comments on commit 2305163

Please sign in to comment.