X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsprite%2Fsprite.hpp;h=cf44de706797d18a6c1100883470d5f93252551f;hb=1eb64ffd2a23eea4b399c1bb8b9dc10293c334d7;hp=0bcc4e79c0b6f3de1779b79466441d783eb3de61;hpb=6dd8ff98068af6c053733df6bb01ba47c8eb379e;p=supertux.git

diff --git a/src/sprite/sprite.hpp b/src/sprite/sprite.hpp
index 0bcc4e79c..cf44de706 100644
--- a/src/sprite/sprite.hpp
+++ b/src/sprite/sprite.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -22,13 +22,16 @@
 
 #include <string>
 #include <assert.h>
-#include <SDL.h>
 
-#include "video/surface.hpp"
 #include "math/vector.hpp"
+#include "math/rect.hpp"
 #include "sprite_data.hpp"
+#include "video/color.hpp"
+#include "video/drawing_context.hpp"
 
+class Surface;
 class DrawingContext;
+class Blend;
 
 class Sprite
 {
@@ -44,7 +47,14 @@ public:
       const Vector& size, const Vector& pos, int layer);
 
   /** Set action (or state) */
-  void set_action(const std::string& act, int loops = -1);
+  void set_action(const std::string& name, int loops = -1);
+
+  /** Set action (or state), but keep current frame number, loop counter, etc. */
+  void set_action_continued(const std::string& name);
+
+  /** Set number of animation cycles until animation stops */
+  void set_animation_loops(int loops = -1)
+  { animation_loops = loops; }
 
   /** Set framerate */
   void set_fps(float new_fps);
@@ -64,25 +74,50 @@ public:
   const std::string& get_name() const
   { return data.name; }
   /** Get current action name */
-  const std::string& get_action_name() const
+  const std::string& get_action() const
   { return action->name; }
 
   int get_width() const;
   int get_height() const;
 
+  /** return x-offset of current action's hitbox, relative to start of image */
+  float get_current_hitbox_x_offset() const;
+  /** return y-offset of current action's hitbox, relative to start of image */
+  float get_current_hitbox_y_offset() const;
+  /** return width of current action's hitbox */
+  float get_current_hitbox_width() const;
+  /** return height of current action's hitbox */
+  float get_current_hitbox_height() const;
+  /** return current action's hitbox, relative to 0,0 */
+  Rect get_current_hitbox() const;
+
+  /** Set the angle of the sprite rotation in degree */
+  void set_angle(float angle);
+
+  /** Get the angle of the sprite rotation in degree */
+  float get_angle() const;
+
+  void set_color(const Color& color);
+
+  Color get_color() const;
+
+  void set_blend(const Blend& blend);
+
+  Blend get_blend() const;
+
   /** Get current frame */
   int get_frame() const
   { return (int)frame; }
   /** Set current frame */
   void set_frame(int frame)
-  { 
-    this->frame = (frame % get_frames()); 
+  {
+    this->frame = (float) (frame % get_frames());
   }
   Surface* get_frame(unsigned int frame)
   {
     assert(frame < action->surfaces.size());
     return action->surfaces[frame];
-  }    
+  }
 
 private:
   void update();
@@ -90,11 +125,13 @@ private:
   SpriteData& data;
 
   float frame;
-  int animation_loops;
-  Uint32 last_ticks;
+  int   animation_loops;
+  float last_ticks;
+  float angle;
+  Color color;
+  Blend blend;
 
   SpriteData::Action* action;
 };
 
 #endif
-