#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>
public:
const Sprite *GetSprite() const { return sprite; }
- void ChangeSprite(const Sprite *s) { sprite = s; }
int FrameTime() const { return frameTime; }
bool Repeat() const { return repeat; }
public:
explicit AnimationRunner(const Animation *a = 0, int colOffset = 0, int rowOffset = 0)
- : animation(a), colOffset(colOffset), rowOffset(rowOffset) { }
+ : animation(a), sprite(a ? a->GetSprite() : 0), colOffset(colOffset), rowOffset(rowOffset) { }
public:
bool Valid() const { return animation; }
- void Clear() { animation = 0; timer = app::Timer<int>(); }
+ void Clear() { animation = 0; timer = app::Timer<Uint32>(); }
void Start(app::State &ctrl) {
timer = ctrl.GraphicsTimers().StartInterval(animation->FrameTime());
void SetRowOffset(int offset) { rowOffset = offset; }
int RowOffset() const { return rowOffset; }
- void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
- animation->GetSprite()->Draw(dest, position + animation->Offset(Frame()), animation->Col(Frame()) + ColOffset(), animation->Row(Frame()) + 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::Point<int> position) const {
- geometry::Vector<int> offset(-animation->GetSprite()->Width(), 0);
+ 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(-animation->GetSprite()->Width() / 2, -animation->GetSprite()->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 {
- geometry::Vector<int> offset(-animation->GetSprite()->Width() / 2, -animation->GetSprite()->Height());
+ void DrawCenterBottom(SDL_Surface *dest, geometry::Vector<int> position) const {
+ geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height());
Draw(dest, position + offset);
}
private:
const Animation *animation;
+ const graphics::Sprite *sprite;
app::Timer<Uint32> timer;
int colOffset;
int rowOffset;