added setters for animations

[l2e.git] / src / graphics / Animation.h

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 55a16d99034fb70a30323ed6506514c67cebdfe0..2696694a4f4235cc9454af5b2528ad1a80788567 100644 (file)
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -12,8 +12,6 @@
 #include "../app/Application.h"
 #include "../app/State.h"
 #include "../app/Timer.h"
-#include "../geometry/operators.h"
-#include "../geometry/Point.h"
 #include "../geometry/Vector.h"
 
 #include <SDL.h>
@@ -30,45 +28,94 @@ public:
        virtual ~Animation() { };
 
 public:
+       const Sprite *GetSprite() const { return sprite; }
+       int FrameTime() const { return frameTime; }
+       bool Repeat() const { return repeat; }
+
+public:
+       void SetSprite(const Sprite *s) { sprite = s; }
+       void SetFrameTime(int t) { frameTime = t; }
+       void SetRepeat(bool r) { repeat = r; }
+
+public:
+       virtual int NumFrames() const = 0;
+       virtual int Col(int frame) const = 0;
+       virtual int Row(int frame) const = 0;
+       virtual geometry::Vector<int> Offset(int frame) const { return geometry::Vector<int>(); }
+
+private:
+       const Sprite *sprite;
+       int frameTime;
+       bool repeat;
+
+};
+
+
+class AnimationRunner {
+
+public:
+       explicit AnimationRunner(const Animation *a = 0, int colOffset = 0, int rowOffset = 0)
+       : animation(a), sprite(a ? a->GetSprite() : 0), colOffset(colOffset), rowOffset(rowOffset) { }
+
+public:
+       bool Valid() const { return animation; }
+       void Clear() { animation = 0; timer = app::Timer<Uint32>(); }
+
        void Start(app::State &ctrl) {
-               timer = ctrl.GraphicsTimers().StartInterval(frameTime);
+               timer = ctrl.GraphicsTimers().StartInterval(animation->FrameTime());
        }
        void Start(app::Application &ctrl) {
-               timer = ctrl.GlobalTimers().StartInterval(frameTime);
+               timer = ctrl.GlobalTimers().StartInterval(animation->FrameTime());
        }
        void Stop() {
                timer = app::Timer<Uint32>();
        }
+       bool Started() const {
+               return timer.Started();
+       }
        bool Running() const {
-               return timer.Running() && (repeat || timer.Iteration() < NumFrames());
+               return timer.Running() && (animation->Repeat() || timer.Iteration() < animation->NumFrames());
        }
-       virtual void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
-               sprite->Draw(dest, position, Col(), Row());
+       bool Finished() const {
+               return Started() && !Running();
        }
-       void DrawTopRight(SDL_Surface *dest, geometry::Point<int> position) const {
+       bool JustFinished() const {
+               return timer.JustHit() && timer.Iteration() == animation->NumFrames();
+       }
+
+       const app::Timer<Uint32> &GetTimer() { return timer; }
+
+       void SetColOffset(int offset) { colOffset = offset; }
+       int ColOffset() const { return colOffset; }
+       void SetRowOffset(int offset) { rowOffset = offset; }
+       int RowOffset() const { return rowOffset; }
+
+       void ChangeSprite(const Sprite *s) { sprite = s; }
+       const Sprite *GetSprite() const { return sprite; }
+
+       void Draw(SDL_Surface *dest, geometry::Vector<int> position) const {
+               sprite->Draw(dest, position + animation->Offset(Frame()), animation->Col(Frame()) + ColOffset(), animation->Row(Frame()) + RowOffset());
+       }
+       void DrawTopRight(SDL_Surface *dest, geometry::Vector<int> position) const {
                geometry::Vector<int> offset(-sprite->Width(), 0);
                Draw(dest, position + offset);
        }
-       void DrawCenter(SDL_Surface *dest, geometry::Point<int> position) const {
-               geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height() / 2);
-               Draw(dest, position + offset);
+       void DrawCenter(SDL_Surface *dest, geometry::Vector<int> position) const {
+               Draw(dest, position - (sprite->Size() / 2));
        }
-       void DrawCenterBottom(SDL_Surface *dest, geometry::Point<int> position) const {
+       void DrawCenterBottom(SDL_Surface *dest, geometry::Vector<int> position) const {
                geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height());
                Draw(dest, position + offset);
        }
 
-protected:
-       int Frame() const { return Running() ? (timer.Iteration() % NumFrames()) : 0; }
-       virtual int Col() const = 0;
-       virtual int Row() const = 0;
-       virtual int NumFrames() const = 0;
+       int Frame() const { return Running() ? (timer.Iteration() % animation->NumFrames()) : 0; }
 
 private:
-       const Sprite *sprite;
+       const Animation *animation;
+       const graphics::Sprite *sprite;
        app::Timer<Uint32> timer;
-       int frameTime;
-       bool repeat;
+       int colOffset;
+       int rowOffset;
 
 };