added animation synchronization function

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

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 0baba35d915e2ee91754a64a7028a5bb2a82a4e3..a224f548590c4af16edad31b32c1ab596881df3d 100644 (file)
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -1,27 +1,29 @@
-/*
- *  Animation.h
- *
- *  Created on: Aug 11, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_ANIMATION_H_
 #define GRAPHICS_ANIMATION_H_
 
-#include "Sprite.h"
-#include "../app/Application.h"
-#include "../app/State.h"
+namespace app {
+       class Application;
+       class State;
+}
+namespace loader {
+       class TypeDescription;
+}
+
 #include "../app/Timer.h"
-#include "../geometry/operators.h"
-#include "../geometry/Point.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
+#include <memory>
 #include <SDL.h>
 
 namespace graphics {
 
+class Sprite;
+
 class Animation {
 
+public:
+       static const int TYPE_ID = 401;
+
 public:
        Animation()
        : sprite(0), frameTime(0), repeat(false) { }
@@ -30,16 +32,25 @@ 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>(); }
+       virtual math::Vector<int> Offset(int frame) const { return math::Vector<int>(); }
+
+       static void CreateTypeDescription();
+
+protected:
+       static void AddFields(loader::TypeDescription &, const Animation &, std::ptrdiff_t offset);
 
 private:
        const Sprite *sprite;
@@ -53,66 +64,48 @@ 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) { }
+       : animation(a), sprite(0), frameShift(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(animation->FrameTime());
-       }
-       void Start(app::Application &ctrl) {
-               timer = ctrl.GlobalTimers().StartInterval(animation->FrameTime());
-       }
-       void Stop() {
-               timer = app::Timer<Uint32>();
-       }
-       bool Started() const {
-               return timer.Started();
-       }
-       bool Running() const {
-               return timer.Running() && (animation->Repeat() || timer.Iteration() < animation->NumFrames());
-       }
-       bool Finished() const {
-               return Started() && !Running();
-       }
-       bool JustFinished() const {
-               return timer.JustHit() && timer.Iteration() == animation->NumFrames();
-       }
+       void Start(app::State &ctrl);
+       void Start(app::Application &ctrl);
+       void Synchronize(const AnimationRunner &other) { timer = other.timer; }
+       void Stop();
+       bool Started() const;
+       bool Running() const;
+       bool Finished() const;
+       bool JustFinished() const;
 
        const app::Timer<Uint32> &GetTimer() { return timer; }
 
+       void SetFrameShift(int offset) { frameShift = offset; }
+       int FrameShift() const { return frameShift; }
        void SetColOffset(int offset) { colOffset = offset; }
        int ColOffset() const { return colOffset; }
        void SetRowOffset(int offset) { rowOffset = offset; }
        int RowOffset() const { return rowOffset; }
 
+       void ChangeAnimation(const Animation *a) { animation = a; }
+       const Animation *GetAnimation() const { return animation; }
+
        void ChangeSprite(const Sprite *s) { sprite = s; }
-       const Sprite *GetSprite() const { return sprite; }
+       const Sprite *GetSprite() const { return sprite ? sprite : animation->GetSprite(); }
+
+       void Draw(SDL_Surface *dest, math::Vector<int> position) const;
+       void DrawTopRight(SDL_Surface *dest, math::Vector<int> position) const;
+       void DrawCenter(SDL_Surface *dest, math::Vector<int> position) const;
+       void DrawCenterBottom(SDL_Surface *dest, math::Vector<int> position) const;
 
-       void Draw(SDL_Surface *dest, geometry::Point<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 {
-               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 DrawCenterBottom(SDL_Surface *dest, geometry::Point<int> position) const {
-               geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height());
-               Draw(dest, position + offset);
-       }
-
-       int Frame() const { return Running() ? (timer.Iteration() % animation->NumFrames()) : 0; }
+       int Frame() const;
 
 private:
        const Animation *animation;
        const graphics::Sprite *sprite;
        app::Timer<Uint32> timer;
+       int frameShift;
        int colOffset;
        int rowOffset;
 
@@ -120,4 +113,4 @@ private:
 
 }
 
-#endif /* GRAPHICS_SIMPLEANIMATION_H_ */
+#endif