X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FAnimation.cpp;h=f55a9aa9fc6520b7c46e1532f8c83fccd9dece55;hb=2255d436a0c2acc10b015827366a72b2ece86094;hp=9bbfa1a1139b530e918cab5fb35bd663a6c743f5;hpb=be7b4addf295d6193ba2527cdd17cdb524339aed;p=l2e.git

diff --git a/src/graphics/Animation.cpp b/src/graphics/Animation.cpp
index 9bbfa1a..f55a9aa 100644
--- a/src/graphics/Animation.cpp
+++ b/src/graphics/Animation.cpp
@@ -1,23 +1,94 @@
-/*
- * Animation.cpp
- *
- *  Created on: Sep 5, 2012
- *      Author: holy
- */
-
 #include "Animation.h"
 
+#include "Sprite.h"
+#include "../app/Application.h"
+#include "../app/State.h"
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
+#include <cassert>
+
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace graphics {
 
-void Animation::AddFields(TypeDescription &td, const Animation &a, std::ptrdiff_t offset, int boolId, int numberId, int spriteId) {
-	td.AddField("sprite", FieldDescription(((char *)&a.sprite) - ((char *)&a) - offset, spriteId, true));
-	td.AddField("frametime", FieldDescription(((char *)&a.frameTime) - ((char *)&a) - offset, numberId, false));
-	td.AddField("repeat", FieldDescription(((char *)&a.repeat) - ((char *)&a) - offset, boolId, false));
+void Animation::CreateTypeDescription() {
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Animation"));
+	td.SetDescription("Abstract base type for animations.");
+	td.SetSize(sizeof(Animation));
+}
+
+void Animation::AddFields(TypeDescription &td, const Animation &a, std::ptrdiff_t offset) {
+	td.AddField("sprite", FieldDescription(((char *)&a.sprite) - ((char *)&a) - offset, Sprite::TYPE_ID).SetReferenced().SetDescription("the sprite used for cutting out frames"));
+	td.AddField("frametime", FieldDescription(((char *)&a.frameTime) - ((char *)&a) - offset, Interpreter::NUMBER_ID).SetDescription("duration of a frame in miliseconds"));
+	td.AddField("repeat", FieldDescription(((char *)&a.repeat) - ((char *)&a) - offset, Interpreter::BOOLEAN_ID).SetDescription("whether the animation should start over at the beginning after reaching the last frame"));
+}
+
+
+void AnimationRunner::Start(app::State &ctrl) {
+	assert(animation);
+	timer = ctrl.GraphicsTimers().StartInterval(animation->FrameTime());
+}
+
+void AnimationRunner::Start(app::Application &ctrl) {
+	assert(animation);
+	timer = ctrl.GlobalTimers().StartInterval(animation->FrameTime());
+}
+
+void AnimationRunner::Stop() {
+	timer = app::Timer<Uint32>();
+}
+
+bool AnimationRunner::Started() const {
+	return timer.Started();
+}
+
+bool AnimationRunner::Running() const {
+	return animation
+			&& timer.Running()
+			&& (animation->Repeat()
+					|| timer.Iteration() < animation->NumFrames());
 }
 
+bool AnimationRunner::Finished() const {
+	return Started() && !Running();
+}
+
+bool AnimationRunner::JustFinished() const {
+	return animation
+			&& timer.JustHit()
+			&& timer.Iteration() == animation->NumFrames();
+}
+
+
+void AnimationRunner::Draw(SDL_Surface *dest, geometry::Vector<int> position) const {
+	GetSprite()->Draw(dest,
+			position + animation->Offset(Frame()),
+			animation->Col(Frame()) + ColOffset(),
+			animation->Row(Frame()) + RowOffset());
+}
+
+void AnimationRunner::DrawTopRight(SDL_Surface *dest, geometry::Vector<int> position) const {
+	geometry::Vector<int> offset(-GetSprite()->Width(), 0);
+	Draw(dest, position + offset);
+}
+
+void AnimationRunner::DrawCenter(SDL_Surface *dest, geometry::Vector<int> position) const {
+	Draw(dest, position - (GetSprite()->Size() / 2));
+}
+
+void AnimationRunner::DrawCenterBottom(SDL_Surface *dest, geometry::Vector<int> position) const {
+	geometry::Vector<int> offset(-GetSprite()->Width() / 2, -GetSprite()->Height());
+	Draw(dest, position + offset);
+}
+
+int AnimationRunner::Frame() const {
+	return Running()
+			? ((timer.Iteration() + frameShift) % animation->NumFrames())
+			: 0;
+}
+
+
 }