projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Saner life expectancy
[supertux.git]
/
src
/
sprite
/
sprite.hpp
diff --git
a/src/sprite/sprite.hpp
b/src/sprite/sprite.hpp
index
b97b65c
..
b85b62e
100644
(file)
--- a/
src/sprite/sprite.hpp
+++ b/
src/sprite/sprite.hpp
@@
-27,9
+27,13
@@
#include "math/vector.hpp"
#include "math/rect.hpp"
#include "sprite_data.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 Surface;
class DrawingContext;
+class Color;
+class Blend;
class Sprite
{
class Sprite
{
@@
-92,19
+96,27
@@
public:
/** Get the angle of the sprite rotation in degree */
float get_angle() const;
/** 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)
/** Get current frame */
int get_frame() const
{ return (int)frame; }
/** Set current frame */
void set_frame(int frame)
- {
- this->frame = (f
rame % get_frames());
+ {
+ this->frame = (f
loat) (frame % get_frames());
}
Surface* get_frame(unsigned int frame)
{
assert(frame < action->surfaces.size());
return action->surfaces[frame];
}
Surface* get_frame(unsigned int frame)
{
assert(frame < action->surfaces.size());
return action->surfaces[frame];
- }
+ }
private:
void update();
private:
void update();
@@
-115,9
+127,10
@@
private:
int animation_loops;
float last_ticks;
float angle;
int animation_loops;
float last_ticks;
float angle;
-
+ Color color;
+ Blend blend;
+
SpriteData::Action* action;
};
#endif
SpriteData::Action* action;
};
#endif
-