From 3293d06b364bc91348f6a305f97e607ff610eb98 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 13 Nov 2022 12:05:43 +0100 Subject: Make animations use runtime polimorphism: Lets us make different animation types but use them interchangeably --- src/graphics/animation.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/graphics/animation.h') diff --git a/src/graphics/animation.h b/src/graphics/animation.h index 9f5dfa5..503b75d 100644 --- a/src/graphics/animation.h +++ b/src/graphics/animation.h @@ -21,20 +21,21 @@ namespace Graphics{ ~Animation(); Animation(const sf::Texture& texture, int count, int switchTime, int height, int width, int row); - sf::IntRect& next(int deltaTime); - void reset(); + virtual sf::IntRect& next(int deltaTime); + virtual void reset(); + virtual bool finished(); }; - class OneShotAnimation : Animation { + class OneShotAnimation : public Animation { public: OneShotAnimation(); OneShotAnimation(const sf::Texture& texture, int count, int switchTime, int height, int width, int row); - bool finished(); - sf::IntRect& next(int deltaTime); + sf::IntRect& next(int deltaTime) override; + bool finished() override; }; - class BouncingAnimation : Animation{ + class BouncingAnimation : public Animation{ private: bool up_; public: @@ -42,7 +43,7 @@ namespace Graphics{ BouncingAnimation(const sf::Texture& texture, int count, int switchTime, int height, int width, int row); ~BouncingAnimation(); - sf::IntRect& next(int deltaTime); + sf::IntRect& next(int deltaTime) override; }; } #endif // GRAPHICS_ANIMATION_H -- cgit v1.2.3