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
@@ -29,7 +29,7 @@ namespace BBM
return this->_modelAnimation.at(this->_currentAnimIndex).getFrameCounter();
}
RAY::ModelAnimation AnimationsComponent::getCurrentModelAnim()
RAY::ModelAnimation &AnimationsComponent::getCurrentModelAnim()
{
return this->_modelAnimation[this->_currentAnimIndex];
}
@@ -20,7 +20,11 @@ namespace BBM
int _currentAnimIndex;
//! @brief Bool allowing to play pause an animation
bool _animDisabled;
public:
//! @brief Should the next update call be skipped?
bool skipNext = false;
//! @inherit
WAL::Component *clone(WAL::Entity &entity) const override;
@@ -34,7 +38,7 @@ namespace BBM
size_t getCurrentAnimFrameCounter() const;
//! @brief get the current
RAY::ModelAnimation getCurrentModelAnim();
RAY::ModelAnimation &getCurrentModelAnim();
//! @brief set the anim frame counter
void setCurrentAnimFrameCounter(size_t animFrameCounter);