diff options
| -rw-r--r-- | include/components.hpp | 25 | ||||
| -rw-r--r-- | src/components.cpp | 9 |
2 files changed, 29 insertions, 5 deletions
diff --git a/include/components.hpp b/include/components.hpp index f8eeaf1..e0147b0 100644 --- a/include/components.hpp +++ b/include/components.hpp @@ -255,6 +255,22 @@ struct Limb { frame.push_back(fr); } + void firstFrame(Frame& duckmyass) { + // loop through the spritedata of the sprite we wanna change + for (auto &d : duckmyass) { + // if the sprite data is the same limb as this limb + if (d.first.limb == limbID) { + // rotate through (for safety) the first frame to set the limb + for (auto &fa : frame.at(0)) { + if (fa.first.limb == limbID) { + d.first = fa.first; + d.second = fa.second; + } + } + } + } + } + void nextFrame(Frame& duckmyass, float dt) { updateCurrent -= dt; if (updateCurrent <= 0) { @@ -306,8 +322,13 @@ struct Animate { // COMMENT - void firstFrame(Frame &sprite) { - (void)sprite; + void firstFrame(uint updateType, Frame &sprite) { + uint upid = updateType; //^see todo + for (auto &l : limb) { + if (l.updateType == upid) { + l.firstFrame(sprite); + } + } } //TODO make updateType an enum void updateAnimation(uint updateType, Frame& sprite, float dt) { diff --git a/src/components.cpp b/src/components.cpp index b06bf84..2bd93fc 100644 --- a/src/components.cpp +++ b/src/components.cpp @@ -26,9 +26,12 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e if (entity.has_component<Animate>() && entity.has_component<Sprite>()) { auto animate = entity.component<Animate>(); auto sprite = entity.component<Sprite>(); - - animate->updateAnimation(1, sprite->sprite, dt); - } + + if (direction.x) + animate->updateAnimation(1, sprite->sprite, dt); + else + animate->firstFrame(1, sprite->sprite); + } if (entity.has_component<Dialog>() && entity.component<Dialog>()->talking) { direction.x = 0; } else { |