projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mirror actions now cache the horizontal flipped Surfaces, rather than flipping them...
[supertux.git]
/
lib
/
special
/
sprite.h
diff --git
a/lib/special/sprite.h
b/lib/special/sprite.h
index
f848945
..
8239f49
100644
(file)
--- a/
lib/special/sprite.h
+++ b/
lib/special/sprite.h
@@
-39,18
+39,25
@@
namespace SuperTux
{
std::string name;
{
std::string name;
- int x_hotspot;
- int y_hotspot;
+ /** Position correction */
+ int x_offset;
+ int y_offset;
+ /** Drawing priority in queue */
+ int z_order;
/** Frames per second */
float fps;
/** Frames per second */
float fps;
+ /** Mirror is used to avoid duplicating left and right side
+ sprites */
+// bool mirror;
+
std::vector<Surface*> surfaces;
};
public:
std::vector<Surface*> surfaces;
};
public:
- /** cur has to be a pointer to data in the form of ((x-
hotspo
t 5)
- (y-
hotspo
t 10) ...) */
+ /** cur has to be a pointer to data in the form of ((x-
offse
t 5)
+ (y-
offse
t 10) ...) */
Sprite(lisp_object_t* cur);
~Sprite();
Sprite(lisp_object_t* cur);
~Sprite();
@@
-58,6
+65,10
@@
namespace SuperTux
void draw(DrawingContext& context, const Vector& pos, int layer,
Uint32 drawing_effect = NONE_EFFECT);
void draw(DrawingContext& context, const Vector& pos, int layer,
Uint32 drawing_effect = NONE_EFFECT);
+ void draw_part(DrawingContext& context, const Vector& source,
+ const Vector& size, const Vector& pos, int layer,
+ Uint32 drawing_effect = NONE_EFFECT);
+
/** Set action (or state) */
void set_action(std::string act);
/** Set action (or state) */
void set_action(std::string act);
@@
-66,10
+77,13
@@
namespace SuperTux
0 - stopped
1,2,3 - one, two, three times... */
void start_animation(int loops);
0 - stopped
1,2,3 - one, two, three times... */
void start_animation(int loops);
+ /* Stop animation */
+ void stop_animation()
+ { start_animation(0); }
/** Check if animation is stopped or not */
bool check_animation();
/** Reverse the animation */
/** Check if animation is stopped or not */
bool check_animation();
/** Reverse the animation */
- void reverse_animation();
+ void reverse_animation(
bool reverse
);
float get_fps()
{ return action->fps; }
float get_fps()
{ return action->fps; }
@@
-90,7
+104,7
@@
namespace SuperTux
{ return (int)frame; }
/** Set current frame */
void set_frame(int frame_)
{ return (int)frame; }
/** Set current frame */
void set_frame(int frame_)
- { frame = frame_; }
+ {
if(frame_ > get_frames()) frame = 0; else
frame = frame_; }
Surface* get_frame(unsigned int frame)
{
if(frame < action->surfaces.size())
Surface* get_frame(unsigned int frame)
{
if(frame < action->surfaces.size())
@@
-102,6
+116,9
@@
namespace SuperTux
void init_defaults(Action* act);
void parse_action(LispReader& lispreader);
void init_defaults(Action* act);
void parse_action(LispReader& lispreader);
+ /** Get an action */
+ Action* get_action(std::string act);
+
void update();
void reset();
void update();
void reset();
@@
-116,6
+133,7
@@
namespace SuperTux
Actions actions;
Action* action;
Actions actions;
Action* action;
+ std::string next_action;
};
} //namespace SuperTux
};
} //namespace SuperTux