X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fspecial%2Fsprite.cpp;h=82639166ed99f5b72abfe25a9f9c1e337f6bb186;hb=e4db6eb50cd6bcba607858b5e6c4c5d53531ed1f;hp=f37e5eebbf999266a762d988e4c488e66ea0f672;hpb=332658f5f24460cc9533e9f42d67c5bb5ddd298d;p=supertux.git diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp index f37e5eebb..82639166e 100644 --- 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); + else + std::cerr << "Warning: Unknown sprite field: " << token << std::endl; } if(name.empty()) @@ -53,7 +55,10 @@ Sprite::~Sprite() { for(std::vector::iterator i_sur = i_act->second->surfaces.begin(); i_sur != i_act->second->surfaces.end(); ++i_sur) - delete *i_sur; + { + if(!i_act->second->mirror) + delete *i_sur; + } delete i_act->second; } } @@ -68,46 +73,103 @@ 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!", ""); - lispreader.read_int("x-hotspot", action->x_hotspot); - lispreader.read_int("y-hotspot", action->y_hotspot); + lispreader.read_int("x-offset", action->x_offset); + lispreader.read_int("y-offset", action->y_offset); + lispreader.read_int("z-order", action->z_order); lispreader.read_float("fps", action->fps); - std::vector images; - if(!lispreader.read_string_vector("images", images)) - Termination::abort("Sprite contains no images: ", action->name.c_str()); + /* TODO: add a top filter entry */ + std::vector mask_color; + lispreader.read_int_vector("apply-mask", mask_color); + if(mask_color.size() == 4) + { + for(std::vector::iterator i = action->surfaces.begin(); + i < action->surfaces.end(); i++) + { + (*i)->apply_mask(Color(mask_color)); + } + } + + action->mirror = false; + std::string mirror_action; + lispreader.read_string("mirror-action", mirror_action); + if(!mirror_action.empty()) + { + action->mirror = true; + Action* act_tmp = get_action(mirror_action); + if(act_tmp == NULL) + std::cerr << "Warning: Could not mirror action. Action not found\n" + "Mirror actions must be defined after the real one!\n"; + else + action->surfaces = act_tmp->surfaces; + } - for(std::vector::size_type i = 0; i < images.size(); ++i) + // Load images + if(!action->mirror) { + std::vector images; + if(!lispreader.read_string_vector("images", images)) + Termination::abort("Sprite contains no images: ", action->name); + + for(std::vector::size_type i = 0; i < images.size(); i++) + { action->surfaces.push_back( new Surface(datadir + "/images/" + images[i], true)); - } - + } + } actions[action->name] = action; } +/*void Sprite::parse_filter(LispReader& lispreader) +{ + +}*/ + void Sprite::init_defaults(Action* act) { - act->x_hotspot = 0; - act->y_hotspot = 0; + act->x_offset = 0; + act->y_offset = 0; + act->z_order = 0; act->fps = 10; - animation_loops = -1; - last_tick = 0; + start_animation(-1); } void Sprite::set_action(std::string act) { +if(!next_action.empty() && animation_loops > 0) + { + next_action = act; + return; + } 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; } +Sprite::Action* +Sprite::get_action(std::string act) +{ +Actions::iterator i = actions.find(act); +if(i == actions.end()) + { + std::cerr << "Warning: Action '" << act << "' not found on Sprite '" << name << "'\n"; + return NULL; + } +return i->second; +} + void Sprite::start_animation(int loops) { -animation_loops = loops; reset(); +animation_loops = loops; } void @@ -116,6 +178,7 @@ Sprite::reset() frame = 0; last_tick = SDL_GetTicks(); animation_reversed = false; +next_action.clear(); } bool @@ -125,9 +188,9 @@ return animation_loops; } void -Sprite::reverse_animation() +Sprite::reverse_animation(bool reverse) { -animation_reversed = !animation_reversed; +animation_reversed = reverse; if(animation_reversed) frame = get_frames()-1; @@ -139,41 +202,58 @@ void Sprite::update() { if(animation_loops == 0) + { + if(frame >= get_frames() || frame < 0) + frame = 0; return; + } float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick); +last_tick = SDL_GetTicks(); if(animation_reversed) frame -= frame_inc; else frame += frame_inc; -last_tick = SDL_GetTicks(); - if(animation_reversed) { - float expedient = frame - 0; - if(expedient < 0) - { - frame = get_frames()-1; + if(frame < 0 || frame >= (float)get_frames()) + { // last case can happen when not used reverse_animation() + float excedent = frame - 0; + frame = get_frames() - 1; if(animation_loops > 0) + { animation_loops--; - - if(expedient > -get_frames()) - frame -= expedient; + if(animation_loops == 0 && !next_action.empty()) + { + set_action(next_action); + start_animation(-1); + } + } + + if(fabsf(excedent) < get_frames()) + frame += excedent; } } else { - float expedient = frame - action->surfaces.size(); - if(expedient >= 0) + if(frame >= (float)get_frames()) { + float excedent = frame - get_frames(); frame = 0; if(animation_loops > 0) + { animation_loops--; - - if(expedient < get_frames()) - frame += expedient; + if(animation_loops == 0 && !next_action.empty()) + { + set_action(next_action); + start_animation(-1); + } + } + + if(excedent < get_frames()) + frame += excedent; } } } @@ -185,23 +265,30 @@ Sprite::draw(DrawingContext& context, const Vector& pos, int layer, 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 " << get_name() + << "/" << get_action_name() << std::endl; else context.draw_surface(action->surfaces[(int)frame], - pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); + pos - Vector(action->x_offset, action->y_offset), layer + action->z_order, + action->mirror ? drawing_effect | HORIZONTAL_FLIP : drawing_effect); } -#if 0 void -Sprite::draw_part(float sx, float sy, float x, float y, float w, float h) +Sprite::draw_part(DrawingContext& context, const Vector& source, const Vector& size, + const Vector& pos, int layer, Uint32 drawing_effect) { - time = SDL_GetTicks(); - unsigned int frame = get_current_frame(); + update(); - if (frame < surfaces.size()) - surfaces[frame]->draw_part(sx, sy, x - x_hotspot, y - y_hotspot, w, h); + if((int)frame >= get_frames() || (int)frame < 0) + std::cerr << "Warning: frame out of range: " << (int)frame + << "/" << get_frames() << " at sprite: " << get_name() + << "/" << get_action_name() << std::endl; + else + context.draw_surface_part(action->surfaces[(int)frame], source, size, + pos - Vector(action->x_offset, action->y_offset), layer + action->z_order, + action->mirror ? drawing_effect | HORIZONTAL_FLIP : drawing_effect); } -#endif int Sprite::get_width()