Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / sprite / sprite.cpp

diff --git a/src/sprite/sprite.cpp b/src/sprite/sprite.cpp
index 00c6247..782fc52 100644 (file)
--- a/src/sprite/sprite.cpp
+++ b/src/sprite/sprite.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  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,39 +12,34 @@
 //  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 <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <iostream>
 #include <cmath>
-#include <cassert>
-#include <stdexcept>
-
 
-#include "video/surface.hpp"
-#include "sprite.hpp"
-#include "video/drawing_context.hpp"
-#include "log.hpp"
-#include "timer.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/timer.hpp"
 
 Sprite::Sprite(SpriteData& newdata)
-  : data(newdata), frame(0), animation_loops(-1), angle(0.0f)
+  : data(newdata),
+    frame(0),
+    animation_loops(-1),
+    angle(0.0f),
+    color(1.0f, 1.0f, 1.0f, 1.0f)
 {
   action = data.get_action("normal");
   if(!action)
     action = data.actions.begin()->second;
-  last_ticks = real_time;
+  last_ticks = game_time;
 }
 
 Sprite::Sprite(const Sprite& other)
   : data(other.data), frame(other.frame),
     animation_loops(other.animation_loops),
     angle(0.0f),
+    color(1.0f, 1.0f, 1.0f, 1.0f),
     action(other.action)
 {
-  last_ticks = real_time;
+  last_ticks = game_time;
 }
 
 Sprite::~Sprite()
@@ -70,6 +63,28 @@ Sprite::set_action(const std::string& name, int loops)
   frame = 0;
 }
 
+void
+Sprite::set_action_continued(const std::string& name)
+{
+  if(action && action->name == name)
+    return;
+
+  SpriteData::Action* newaction = data.get_action(name);
+  if(!newaction) {
+    log_debug << "Action '" << name << "' not found." << std::endl;
+    return;
+  }
+
+  action = newaction;
+  if(frame >= get_frames()) {
+    frame = fmodf(frame, get_frames());
+
+    if (animation_loops > 0) animation_loops--;
+    if(animation_done())
+      frame = get_frames()-1;
+  }
+}
+
 bool
 Sprite::animation_done()
 {
@@ -82,14 +97,14 @@ Sprite::update()
   if(animation_done())
     return;
 
-  float frame_inc = action->fps * (real_time - last_ticks);
-  last_ticks = real_time;
+  float frame_inc = action->fps * (game_time - last_ticks);
+  last_ticks = game_time;
 
   frame += frame_inc;
 
   if(frame >= get_frames()) {
     frame = fmodf(frame, get_frames());
-      
+
     animation_loops--;
     if(animation_done())
       frame = get_frames()-1;
@@ -108,18 +123,20 @@ Sprite::draw(DrawingContext& context, const Vector& pos, int layer)
     context.draw_surface(action->surfaces[(int)frame],
                          pos - Vector(action->x_offset, action->y_offset),
                          angle,
+                         color,
+                         blend,
                          layer + action->z_order);
 }
 
 void
 Sprite::draw_part(DrawingContext& context, const Vector& source,
-    const Vector& size, const Vector& pos, int layer)
+                  const Vector& size, const Vector& pos, int layer)
 {
   assert(action != 0);
   update();
 
   int frameidx = (int) frame;
-  
+
   if(frameidx >= get_frames() || frameidx < 0) {
 #ifndef DEBUG
     // in optimized mode we get some small rounding errors in floating point
@@ -128,10 +145,10 @@ Sprite::draw_part(DrawingContext& context, const Vector& source,
 #endif
     frameidx = get_frames() - 1;
   }
-    
+
   context.draw_surface_part(action->surfaces[frameidx], source, size,
-      pos - Vector(action->x_offset, action->y_offset),
-      layer + action->z_order);
+                            pos - Vector(action->x_offset, action->y_offset),
+                            layer + action->z_order);
 }
 
 int
@@ -194,4 +211,28 @@ Sprite::get_angle() const
   return angle;
 }
 
+void
+Sprite::set_color(const Color& c)
+{
+  color = c;
+}
+
+Color
+Sprite::get_color() const
+{
+  return color;
+}
+
+void
+Sprite::set_blend(const Blend& b)
+{
+  blend = b;
+}
+
+Blend
+Sprite::get_blend() const
+{
+  return blend;
+}
+
 /* EOF */