zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-03 02:23:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning u

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
sources/Component/Animation/AnimationsComponent.cpp
+4 -3
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];
}
sources/Component/Animation/AnimationsComponent.hpp
+2 -2
View File
@@ -34,7 +34,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);
@@ -52,7 +52,7 @@ namespace BBM
bool isAnimDisabled() const;
//! @brief ctor entity and the path of the animation file
AnimationsComponent(WAL::Entity &entity, int animIndex, bool play = true);
explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex, bool play = true);
//! @brief copy ctor
AnimationsComponent(const AnimationsComponent &) = default;
//! @brief dtor