Merging with develop

This commit is contained in:
Zoe Roux
2021-06-01 17:10:36 +02:00
27 changed files with 184 additions and 84 deletions
+2 -2
View File
@@ -13,13 +13,13 @@ namespace BBM
ringIn(delay)
{}
TimerComponent::TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, const WAL::Callback<WAL::Entity &, const WAL::Wal &> &callback)
TimerComponent::TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, const WAL::Callback<WAL::Entity &, WAL::Wal &> &callback)
: WAL::Component(entity),
ringIn(delay),
callback(callback)
{}
TimerComponent::TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, std::function<void(WAL::Entity &, const WAL::Wal &)> callback)
TimerComponent::TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, std::function<void(WAL::Entity &, WAL::Wal &)> callback)
: WAL::Component(entity),
ringIn(delay),
callback(std::move(callback))
+2 -2
View File
@@ -25,9 +25,9 @@ namespace BBM
//! @brief A default constructor
TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay);
//! @brief Create a timer with a callback.
TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, const WAL::Callback<WAL::Entity &, const WAL::Wal &> &callback);
TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, const WAL::Callback<WAL::Entity &, WAL::Wal &> &callback);
//! @brief Create a timer with a function to call on ring.
TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, std::function<void (WAL::Entity &, const WAL::Wal &)> callback);
TimerComponent(WAL::Entity &entity, std::chrono::nanoseconds delay, std::function<void (WAL::Entity &, WAL::Wal &)> callback);
//! @brief A timer component is copy constructable
TimerComponent(const TimerComponent &) = default;
//! @brief A default destructor