added setters for animations

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

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 0baba35d915e2ee91754a64a7028a5bb2a82a4e3..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,11 +28,15 @@ 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;
@@ -91,18 +93,17 @@ public:
        void ChangeSprite(const Sprite *s) { sprite = s; }
        const Sprite *GetSprite() const { return sprite; }
 
-       void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
+       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::Point<int> position) const {
+       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);
        }