X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fspecial%2Fsprite.cpp;h=d27ae05b7a17190775bc971da7db9a2db1ae1c69;hb=09cabd98fefc508488b696552107f11336f80493;hp=75e6e5459f23f69dcbd26b4c1af885fddd9633e8;hpb=4b476ec30e7dd62249328054402d6493c20a685d;p=supertux.git diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp index 75e6e5459..d27ae05b7 100644 --- a/lib/special/sprite.cpp +++ b/lib/special/sprite.cpp @@ -29,68 +29,195 @@ using namespace SuperTux; Sprite::Sprite(lisp_object_t* cur) { - init_defaults(); + for(; !lisp_nil_p(cur); cur = lisp_cdr(cur)) + { + std::string token = lisp_symbol(lisp_car(lisp_car(cur))); + lisp_object_t* data = lisp_car(lisp_cdr(lisp_car(cur))); + LispReader reader(lisp_cdr(lisp_car(cur))); + + if(token == "name") + name = lisp_string(data); + else if(token == "action") + parse_action(reader); + else + std::cerr << "Warning: Unknown sprite field: " << token << std::endl; + } + + if(name.empty()) + Termination::abort("Error: Sprite wihtout name.", ""); + if(actions.empty()) + Termination::abort("Error: Sprite wihtout actions.", ""); +} + +Sprite::~Sprite() +{ + for(Actions::iterator i_act = actions.begin(); i_act != actions.end(); ++i_act) + { + for(std::vector::iterator i_sur = i_act->second->surfaces.begin(); + i_sur != i_act->second->surfaces.end(); ++i_sur) + delete *i_sur; + delete i_act->second; + } +} - LispReader reader(cur); +void +Sprite::parse_action(LispReader& lispreader) +{ + action = new Action; - if(!reader.read_string("name", name)) - st_abort("Sprite wihtout name", ""); - reader.read_int("x-hotspot", x_hotspot); - reader.read_int("y-hotspot", y_hotspot); - reader.read_float("fps", fps); + init_defaults(action); + + 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-offset", action->x_offset); + lispreader.read_int("y-offset", action->y_offset); + lispreader.read_float("fps", action->fps); std::vector images; - if(!reader.read_string_vector("images", images)) - st_abort("Sprite contains no images: ", name.c_str()); + if(!lispreader.read_string_vector("images", images)) + Termination::abort("Sprite contains no images: ", action->name.c_str()); for(std::vector::size_type i = 0; i < images.size(); ++i) { - surfaces.push_back( + action->surfaces.push_back( new Surface(datadir + "/images/" + images[i], true)); } - frame_delay = 1000.0f/fps; + actions[action->name] = action; } -Sprite::~Sprite() +void +Sprite::init_defaults(Action* act) { - for(std::vector::iterator i = surfaces.begin(); i != surfaces.end(); - ++i) - delete *i; + act->x_offset = 0; + act->y_offset = 0; + act->fps = 10; + + start_animation(-1); } void -Sprite::init_defaults() +Sprite::set_action(std::string act) { - x_hotspot = 0; - y_hotspot = 0; - fps = 10; - time = 0; - frame_delay = 1000.0f/fps; +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; } void -Sprite::update(float /*delta*/) +Sprite::start_animation(int loops) { - //time += 10*delta; - //std::cout << "Delta: " << delta << std::endl; +reset(); +animation_loops = loops; } void -Sprite::draw(DrawingContext& context, const Vector& pos, int layer, - Uint32 drawing_effect) +Sprite::reset() { - time = SDL_GetTicks(); - unsigned int frame = get_current_frame(); +frame = 0; +last_tick = SDL_GetTicks(); +animation_reversed = false; +next_action.clear(); +} - if (frame < surfaces.size()) +bool +Sprite::check_animation() +{ +return animation_loops; +} + +void +Sprite::reverse_animation(bool reverse) +{ +animation_reversed = reverse; + +if(animation_reversed) + frame = get_frames()-1; +else + frame = 0; +} + +void +Sprite::update() +{ +if(animation_loops == 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; + +if(animation_reversed) { - Surface* surface = surfaces[frame]; - - context.draw_surface(surface, pos - Vector(x_hotspot, y_hotspot), layer, drawing_effect); + 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) + { + animation_loops--; + if(animation_loops == 0 && !next_action.empty()) + { + set_action(next_action); + start_animation(-1); + } + } + + if(fabsf(excedent) < get_frames()) + frame += excedent; + } + } +else + { + float excedent = frame - action->surfaces.size(); + if((int)excedent >= 0) + { + frame = 0; + if(animation_loops > 0) + { + animation_loops--; + if(animation_loops == 0 && !next_action.empty()) + { + set_action(next_action); + start_animation(-1); + } + } + + if(excedent < get_frames()) + frame += excedent; + } } } +void +Sprite::draw(DrawingContext& context, const Vector& pos, int layer, + Uint32 drawing_effect) +{ + update(); + + 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(action->surfaces[(int)frame], + pos - Vector(action->x_offset, action->y_offset), layer, drawing_effect); +} + #if 0 void Sprite::draw_part(float sx, float sy, float x, float y, float w, float h) @@ -99,33 +226,20 @@ 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()) - surfaces[frame]->draw_part(sx, sy, x - x_hotspot, y - y_hotspot, w, h); + surfaces[frame]->draw_part(sx, sy, x - x_offset, y - y_offset, w, h); } #endif -void -Sprite::reset() -{ - time = 0; -} - -int -Sprite::get_current_frame() const -{ - unsigned int frame = static_cast(fmodf(time, surfaces.size()*frame_delay)/frame_delay); - return frame % surfaces.size(); -} - int -Sprite::get_width() const +Sprite::get_width() { - return surfaces[get_current_frame()]->w; + return action->surfaces[get_frame()]->w; } int -Sprite::get_height() const +Sprite::get_height() { - return surfaces[get_current_frame()]->h; + return action->surfaces[get_frame()]->h; } /* EOF */