merge from develop (tested)

This commit is contained in:
arthur.jamet
2021-06-18 12:39:28 +02:00
58 changed files with 269 additions and 185 deletions
@@ -16,14 +16,14 @@ namespace RAY2D = RAY::Drawables::Drawables2D;
namespace BBM
{
IntroAnimationSystem::IntroAnimationSystem(WAL::Wal &wal)
: System(wal), wal(wal)
: System(wal)
{}
void IntroAnimationSystem::onFixedUpdate(WAL::ViewEntity<IntroAnimationComponent> &entity)
{
static const RAY::Vector2 logoPos(1920 / 2 - 128, 1080 / 2 - 128);
auto &component = entity.get<IntroAnimationComponent>();
auto scene = wal.getScene();
auto scene = this->_wal.getScene();
RAY2D::Rectangle *rectangle = nullptr;
RAY2D::Text *text = nullptr;
static auto &powered_text = scene->addEntity("powered by text")
@@ -8,10 +8,6 @@ namespace BBM
//! @brief A system to handle Controllable entities in a menu.
class IntroAnimationSystem : public WAL::System<IntroAnimationComponent>
{
private:
//! @brief reference to wal
WAL::Wal &wal;
public:
//! @inherit
void onSelfUpdate(std::chrono::nanoseconds dtime) override;