projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed code variables, as well.
[supertux.git]
/
lib
/
special
/
sprite.cpp
diff --git
a/lib/special/sprite.cpp
b/lib/special/sprite.cpp
index
f676c08
..
d27ae05
100644
(file)
--- a/
lib/special/sprite.cpp
+++ b/
lib/special/sprite.cpp
@@
-39,6
+39,8
@@
Sprite::Sprite(lisp_object_t* cur)
name = lisp_string(data);
else if(token == "action")
parse_action(reader);
name = lisp_string(data);
else if(token == "action")
parse_action(reader);
+ else
+ std::cerr << "Warning: Unknown sprite field: " << token << std::endl;
}
if(name.empty())
}
if(name.empty())
@@
-68,8
+70,8
@@
Sprite::parse_action(LispReader& lispreader)
if(!lispreader.read_string("name", action->name))
if(!actions.empty())
Termination::abort("Error: If there are more than one action, they need names!", "");
if(!lispreader.read_string("name", action->name))
if(!actions.empty())
Termination::abort("Error: If there are more than one action, they need names!", "");
- lispreader.read_int("x-
hotspot", action->x_hotspo
t);
- lispreader.read_int("y-
hotspot", action->y_hotspo
t);
+ lispreader.read_int("x-
offset", action->x_offse
t);
+ lispreader.read_int("y-
offset", action->y_offse
t);
lispreader.read_float("fps", action->fps);
std::vector<std::string> images;
lispreader.read_float("fps", action->fps);
std::vector<std::string> images;
@@
-88,26
+90,35
@@
Sprite::parse_action(LispReader& lispreader)
void
Sprite::init_defaults(Action* act)
{
void
Sprite::init_defaults(Action* act)
{
- act->x_
hotspo
t = 0;
- act->y_
hotspo
t = 0;
+ act->x_
offse
t = 0;
+ act->y_
offse
t = 0;
act->fps = 10;
act->fps = 10;
- animation_loops = -1;
- last_tick = 0;
+ start_animation(-1);
}
void
Sprite::set_action(std::string act)
{
}
void
Sprite::set_action(std::string act)
{
+if(!next_action.empty() && animation_loops > 0)
+ {
+ next_action = act;
+ return;
+ }
Actions::iterator i = actions.find(act);
Actions::iterator i = actions.find(act);
+if(i == actions.end())
+ {
+ std::cerr << "Warning: Action '" << act << "' not found on Sprite '" << name << "'\n";
+ return;
+ }
action = i->second;
}
void
Sprite::start_animation(int loops)
{
action = i->second;
}
void
Sprite::start_animation(int loops)
{
-animation_loops = loops;
reset();
reset();
+animation_loops = loops;
}
void
}
void
@@
-116,6
+127,7
@@
Sprite::reset()
frame = 0;
last_tick = SDL_GetTicks();
animation_reversed = false;
frame = 0;
last_tick = SDL_GetTicks();
animation_reversed = false;
+next_action.clear();
}
bool
}
bool
@@
-125,9
+137,9
@@
return animation_loops;
}
void
}
void
-Sprite::reverse_animation()
+Sprite::reverse_animation(
bool reverse
)
{
{
-animation_reversed =
!animation_reversed
;
+animation_reversed =
reverse
;
if(animation_reversed)
frame = get_frames()-1;
if(animation_reversed)
frame = get_frames()-1;
@@
-141,31
+153,52
@@
Sprite::update()
if(animation_loops == 0)
return;
if(animation_loops == 0)
return;
-float inc_frame = (action->fps/1000) * (SDL_GetTicks() - last_tick);
+float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick);
+last_tick = SDL_GetTicks();
if(animation_reversed)
if(animation_reversed)
- frame -=
inc_frame
;
+ frame -=
frame_inc
;
else
else
- frame += inc_frame;
-
-last_tick = SDL_GetTicks();
+ frame += frame_inc;
if(animation_reversed)
{
if(animation_reversed)
{
- if((unsigned int)frame < 0)
- {
- frame = get_frames()-1;
+ float excedent = frame - 0;
+ if((int)excedent < 0 || excedent >= get_frames())
+ { // last case can happen when not used reverse_animation()
+ frame = get_frames() - 1;
if(animation_loops > 0)
if(animation_loops > 0)
+ {
animation_loops--;
animation_loops--;
+ if(animation_loops == 0 && !next_action.empty())
+ {
+ set_action(next_action);
+ start_animation(-1);
+ }
+ }
+
+ if(fabsf(excedent) < get_frames())
+ frame += excedent;
}
}
else
{
}
}
else
{
- if((unsigned int)frame >= action->surfaces.size())
+ float excedent = frame - action->surfaces.size();
+ if((int)excedent >= 0)
{
frame = 0;
if(animation_loops > 0)
{
frame = 0;
if(animation_loops > 0)
+ {
animation_loops--;
animation_loops--;
+ if(animation_loops == 0 && !next_action.empty())
+ {
+ set_action(next_action);
+ start_animation(-1);
+ }
+ }
+
+ if(excedent < get_frames())
+ frame += excedent;
}
}
}
}
}
}
@@
-177,10
+210,12
@@
Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
update();
if((int)frame >= get_frames() || (int)frame < 0)
update();
if((int)frame >= get_frames() || (int)frame < 0)
- std::cerr << "Warning: frame higher than total frames or lower than 0!\n";
+ std::cerr << "Warning: frame out of range: " << (int)frame
+ << "/" << get_frames() << " at sprite: " << get_name()
+ << "/" << get_action_name() << std::endl;
else
context.draw_surface(action->surfaces[(int)frame],
else
context.draw_surface(action->surfaces[(int)frame],
- pos - Vector(action->x_
hotspot, action->y_hotspo
t), layer, drawing_effect);
+ pos - Vector(action->x_
offset, action->y_offse
t), layer, drawing_effect);
}
#if 0
}
#if 0
@@
-191,7
+226,7
@@
Sprite::draw_part(float sx, float sy, float x, float y, float w, float h)
unsigned int frame = get_current_frame();
if (frame < surfaces.size())
unsigned int frame = get_current_frame();
if (frame < surfaces.size())
- surfaces[frame]->draw_part(sx, sy, x - x_
hotspot, y - y_hotspo
t, w, h);
+ surfaces[frame]->draw_part(sx, sy, x - x_
offset, y - y_offse
t, w, h);
}
#endif
}
#endif