X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanimate.h;h=7c8165c6fcb3ee20bb657d1122ce16e77293c095;hb=4b2708d0a743f74dfc44ea4e4c08344e09c624a6;hp=d386a7ac452a90cedb392cadf5c859a9f2c15e31;hpb=34051ffdca091ad3971c1382c71c5fc58b7ade0f;p=libs%2Fdemoscene.git

diff --git a/source/animate.h b/source/animate.h
index d386a7a..7c8165c 100644
--- a/source/animate.h
+++ b/source/animate.h
@@ -1,10 +1,14 @@
 #ifndef MSP_DEMOSCENE_ANIMATE_H_
 #define MSP_DEMOSCENE_ANIMATE_H_
 
+#include <msp/gl/animatedobject.h>
 #include <msp/gl/animation.h>
 #include <msp/gl/animationplayer.h>
 #include "action.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class Animate: public Action
 {
 public:
@@ -20,16 +24,21 @@ public:
 
 private:
 	Msp::GL::Placeable *target;
+	Msp::GL::AnimatedObject *target_obj;
 	const Msp::GL::Animation *anim;
+	bool stacked;
 	Msp::GL::AnimationPlayer *player;
 
 public:
 	Animate();
-	Animate(Msp::GL::Placeable &, const Msp::GL::Animation &, Msp::GL::AnimationPlayer &);
+	Animate(Msp::GL::Placeable &, const Msp::GL::Animation &, Msp::GL::AnimationPlayer &, bool = false);
 
 	virtual void validate() const;
 
 	virtual void start(float, float);
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif