zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-06 21:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the timer

Browse Source
This commit is contained in:
Zoe Roux
2021-06-18 12:04:33 +02:00
parent de5c7016d9
commit 1bcbdcdd01
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/Runner/Runner.cpp
View File

@@ -70,6 +70,8 @@ namespace BBM
break;
}
}
if (gameState.nextScene != GameState::SceneID::GameScene)
engine.getSystem<CameraSystem>().hasEnded = false;
}
if (gameState.nextScene == gameState.currentScene)
return;

14
sources/System/Renderer/CameraSystem.cpp
View File

@@ -18,16 +18,11 @@ namespace BBM
: System(wal)
{}
bool CameraSystem::introAnimation(WAL::ViewEntity<CameraComponent, PositionComponent> &entity, bool restart)
bool CameraSystem::introAnimation(WAL::ViewEntity<CameraComponent, PositionComponent> &entity)
{
auto &pos = entity.get<PositionComponent>();
static Vector3f posTarget(8, 25, 7);
static bool hasEnded = false;
if (restart) {
hasEnded = false;
return (false);
}
if (hasEnded)
return true;
if (pos.position.distance(posTarget) < 4) {
@@ -43,13 +38,12 @@ namespace BBM
.addComponent<Drawable2DComponent, RAY2D::Text>("", 60, RAY::Vector2(), ORANGE);
for (WAL::Entity &player : this->_wal.getScene()->view<TagComponent<Player>>())
player.getComponent<ControllableComponent>().disabled = false;
return (true);
return true;
}
auto &cam = entity.get<CameraComponent>();
pos.position += (posTarget - pos.position) / 100;
return (false);
return false;
}
void CameraSystem::onUpdate(WAL::ViewEntity<CameraComponent, PositionComponent> &entity,
@@ -68,8 +62,6 @@ namespace BBM
for (auto &[entity, pos, _] : this->_wal.getScene()->view<PositionComponent, TagComponent<Player>>()) {
playerPos.emplace_back(pos.position);
}
if (!playerPos.empty())
introAnimation(entity, true);
if (playerPos.size() == 1)
newCameraPos = playerPos[0];
for (int i = 0; i < playerPos.size(); i++)

5
sources/System/Renderer/CameraSystem.hpp
View File

@@ -16,11 +16,14 @@ namespace BBM
class CameraSystem : public WAL::System<CameraComponent, PositionComponent>
{
public:
//! @brief A boolean indicating if the intro's animation has ended.
bool hasEnded = false;
//! @inherit
void onUpdate(WAL::ViewEntity<CameraComponent, PositionComponent> &entity, std::chrono::nanoseconds) override;
//! @brief introduciton animation when entering gameScene
bool introAnimation(WAL::ViewEntity<CameraComponent, PositionComponent> &entity, bool restart = false);
bool introAnimation(WAL::ViewEntity<CameraComponent, PositionComponent> &entity);
//! @brief ctor
CameraSystem(WAL::Wal &wal);