Now the growings animation looks pretty cool :)

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index ff2e31e..d9459f4 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -23,26 +23,26 @@
 #define SUPERTUX_GAMEOBJS_H
 
 #include "type.h"
-#include "texture.h"
+#include "screen/texture.h"
 #include "timer.h"
 #include "scene.h"
 #include "physic.h"
 #include "collision.h"
 #include "game_object.h"
-#include "drawable.h"
 #include "moving_object.h"
+#include "serializable.h"
 #include "lispwriter.h"
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class BouncyDistro : public GameObject, public Drawable
+class BouncyDistro : public GameObject
 {
 public:
-  BouncyDistro(DisplayManager& displaymanager, const Vector& pos);
+  BouncyDistro(const Vector& pos);
   virtual void action(float elapsed_time);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
 
 private:
   Vector position;
@@ -56,14 +56,13 @@ extern Surface* img_distro[4];
 
 class Tile;
 
-class BrokenBrick : public GameObject, public Drawable
+class BrokenBrick : public GameObject
 {
 public:
-  BrokenBrick(DisplayManager& displaymanager, Tile* tile,
-      const Vector& pos, const Vector& movement);
+  BrokenBrick(Tile* tile, const Vector& pos, const Vector& movement);
 
   virtual void action(float elapsed_time);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
 
 private:
   Timer timer;
@@ -72,12 +71,12 @@ private:
   Vector movement;
 };
 
-class BouncyBrick : public GameObject, public Drawable
+class BouncyBrick : public GameObject
 {
 public:
-  BouncyBrick(DisplayManager& displaymanager, const Vector& pos);
+  BouncyBrick(const Vector& pos);
   virtual void action(float elapsed_time);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
   
 private:
   Vector position;
@@ -86,13 +85,13 @@ private:
   int shape;      
 };
 
-class FloatingScore : public GameObject, public Drawable
+class FloatingScore : public GameObject
 {
 public:
-  FloatingScore(DisplayManager& displaymanager, const Vector& pos, int s);
+  FloatingScore(const Vector& pos, int s);
   
   virtual void action(float elapsed_time);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
 
 private:
   Vector position;
@@ -100,14 +99,14 @@ private:
   Timer timer;  
 };
 
-class Trampoline : public MovingObject, public Drawable, public Serializable
+class Trampoline : public MovingObject, public Serializable
 {
 public:
-  Trampoline(DisplayManager& displaymanager, LispReader& reader);
+  Trampoline(LispReader& reader);
  
   virtual void write(LispWriter& writer);
   virtual void action(float frame_ratio);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
 
   virtual void collision(const MovingObject& other, int);
   void collision(void *p_c_object, int c_object, CollisionType type);
@@ -120,18 +119,21 @@ public:
   unsigned int frame;
 };
 
-class FlyingPlatform : public MovingObject, public Drawable, public Serializable
+class FlyingPlatform : public MovingObject, public Serializable
 {
 public:
-  FlyingPlatform(DisplayManager& displaymanager, LispReader& reader);
+  FlyingPlatform(LispReader& reader);
  
   virtual void write(LispWriter& writer);
   virtual void action(float frame_ratio);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
 
   virtual void collision(const MovingObject& other, int);
   void collision(void *p_c_object, int c_object, CollisionType type);
 
+  float get_vel_x() { return vel_x; }
+  float get_vel_y() { return vel_y; }
+
   Physic physic;
   enum { M_NORMAL, M_HELD } mode;
 
@@ -140,6 +142,8 @@ public:
   std::vector<int> pos_y;
   float velocity;
 
+  float vel_x, vel_y;  // calculated based in the velocity
+
   int point;
   bool move;
   unsigned int frame;