Cleaning u

This commit is contained in:
Zoe Roux
2021-06-14 16:07:24 +02:00
parent 9b385349dc
commit 10a73e07d1
5 changed files with 8 additions and 15 deletions

View File

@@ -8,9 +8,9 @@
namespace BBM
{
AnimationsComponent::AnimationsComponent(WAL::Entity &entity, int animIndex, bool play)
AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex, bool play)
: WAL::Component(entity),
_modelAnimation("assets/player/player.iqm"),
_modelAnimation(std::move(modelAnimation)),
_currentAnimIndex(animIndex),
_animDisabled(play)
{
@@ -20,6 +20,7 @@ namespace BBM
WAL::Component *AnimationsComponent::clone(WAL::Entity &entity) const
{
return new AnimationsComponent(entity,
RAY::ModelAnimations(this->_modelAnimation.getFilePath()),
this->_currentAnimIndex);
}
@@ -28,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];
}