X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsprite%2Fsprite_data.cpp;h=6d2d2a558df4618291634184e637dfb4d2bd7a40;hb=c1277f5b7db9f55d1d28f658b4e804f32b76f0ce;hp=a369d6664d813d61a14773f17d00ffde0c1b11d9;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git diff --git a/src/sprite/sprite_data.cpp b/src/sprite/sprite_data.cpp index a369d6664..6d2d2a558 100644 --- a/src/sprite/sprite_data.cpp +++ b/src/sprite/sprite_data.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux -// Copyright (C) 2004 Ingo Ruhnke +// Copyright (C) 2006 Matthias Braun // -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,25 +12,31 @@ // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include +// along with this program. If not, see . + +#include "sprite/sprite_data.hpp" -#include -#include -#include #include +#include -#include "sprite_data.h" -#include "resources.h" -#include "video/drawing_context.h" -#include "lisp/list_iterator.h" +#include "lisp/list_iterator.hpp" +#include "util/log.hpp" -SpriteData::Action::Action() +SpriteData::Action::Action() : + name(), + x_offset(), + y_offset(), + hitbox_w(), + hitbox_h(), + z_order(), + fps(), + surfaces() { x_offset = 0; y_offset = 0; - z_order = 0; + hitbox_w = 0; + hitbox_h = 0; + z_order = 0; fps = 10; } @@ -43,22 +47,22 @@ SpriteData::Action::~Action() delete *i; } -SpriteData::SpriteData(const lisp::Lisp* lisp) +SpriteData::SpriteData(const lisp::Lisp* lisp, const std::string& basedir) : + actions(), + name() { lisp::ListIterator iter(lisp); while(iter.next()) { if(iter.item() == "name") { iter.value()->get(name); } else if(iter.item() == "action") { - parse_action(iter.lisp()); + parse_action(iter.lisp(), basedir); } else { - std::cerr << "Unknown sprite field: " << iter.item() << "\n"; + log_warning << "Unknown sprite field: " << iter.item() << std::endl; } } - if(name.empty()) - throw std::runtime_error("Error: Sprite wihtout name."); if(actions.empty()) - throw std::runtime_error("Error: Sprite wihtout actions."); + throw std::runtime_error("Error: Sprite without actions."); } SpriteData::~SpriteData() @@ -68,17 +72,23 @@ SpriteData::~SpriteData() } void -SpriteData::parse_action(const lisp::Lisp* lisp) +SpriteData::parse_action(const lisp::Lisp* lisp, const std::string& basedir) { Action* action = new Action; if(!lisp->get("name", action->name)) { if(!actions.empty()) throw std::runtime_error( - "If there are more than one action, they need names!"); + "If there are more than one action, they need names!"); + } + std::vector hitbox; + if (lisp->get("hitbox", hitbox)) { + if (hitbox.size() != 4) throw std::runtime_error("hitbox must specify exactly 4 coordinates"); + action->x_offset = hitbox[0]; + action->y_offset = hitbox[1]; + action->hitbox_w = hitbox[2]; + action->hitbox_h = hitbox[3]; } - lisp->get("x-offset", action->x_offset); - lisp->get("y-offset", action->y_offset); lisp->get("z-order", action->z_order); lisp->get("fps", action->fps); @@ -88,29 +98,39 @@ SpriteData::parse_action(const lisp::Lisp* lisp) Action* act_tmp = get_action(mirror_action); if(act_tmp == NULL) { throw std::runtime_error("Could not mirror action. Action not found\n" - "Mirror actions must be defined after the real one!"); + "Mirror actions must be defined after the real one!"); } else { - for(int i = 0; static_cast(i) < act_tmp->surfaces.size(); - i++) { - Surface* surface = new Surface(sdl_surface_from_sdl_surface( - act_tmp->surfaces[i]->impl->get_sdl_surface(), true), true); - surface->apply_filter(HORIZONTAL_FLIP_FILTER); + float max_w = 0; + float max_h = 0; + for(int i = 0; static_cast(i) < act_tmp->surfaces.size(); i++) { + Surface* surface = new Surface(*(act_tmp->surfaces[i])); + surface->hflip(); + max_w = std::max(max_w, (float) surface->get_width()); + max_h = std::max(max_h, (float) surface->get_height()); action->surfaces.push_back(surface); } + if (action->hitbox_w < 1) action->hitbox_w = max_w; + if (action->hitbox_h < 1) action->hitbox_h = max_h; } } else { // Load images std::vector images; - if(!lisp->get_vector("images", images)) { + if(!lisp->get("images", images)) { std::stringstream msg; msg << "Sprite '" << name << "' contains no images in action '" << action->name << "'."; throw std::runtime_error(msg.str()); } + float max_w = 0; + float max_h = 0; for(std::vector::size_type i = 0; i < images.size(); i++) { - action->surfaces.push_back( - new Surface(datadir + "/images/" + images[i], true)); + Surface* surface = new Surface(basedir + images[i]); + max_w = std::max(max_w, (float) surface->get_width()); + max_h = std::max(max_h, (float) surface->get_height()); + action->surfaces.push_back(surface); } + if (action->hitbox_w < 1) action->hitbox_w = max_w; + if (action->hitbox_h < 1) action->hitbox_h = max_h; } actions[action->name] = action; } @@ -125,3 +145,4 @@ SpriteData::get_action(std::string act) return i->second; } +/* EOF */