Made trampolines less likely to interfere with level design:

[supertux.git] / src / video / surface.cpp

diff --git a/src/video/surface.cpp b/src/video/surface.cpp
index daca15c..ff89f8c 100644 (file)
--- a/src/video/surface.cpp
+++ b/src/video/surface.cpp
@@ -1,7 +1,7 @@
-//  $Id: surface.cpp 2175 2004-11-24 19:02:49Z sik0fewl $
+//  $Id$
 //
 //  SuperTux
-//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  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
@@ -15,8 +15,8 @@
 //
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
 #include <cassert>
@@ -32,7 +32,8 @@
 #include "gameconfig.hpp"
 #include "physfs/physfs_sdl.hpp"
 #include "video/surface.hpp"
-#include "video/screen.hpp"
+#include "video/drawing_context.hpp"
+#include "video/color.hpp"
 #include "image_texture.hpp"
 #include "texture_manager.hpp"
 
@@ -131,6 +132,72 @@ static inline void intern_draw(float left, float top, float right, float bottom,
   glEnd();
 }
 
+static inline void intern_draw2(float left, float top, float right, float bottom,
+                                float uv_left, float uv_top,
+                                float uv_right, float uv_bottom,
+                                float angle,
+                                const Color& color,
+                                const Blend& blend,
+                                DrawingEffect effect)
+{
+  if(effect & HORIZONTAL_FLIP)
+    std::swap(uv_left, uv_right);
+  if(effect & VERTICAL_FLIP) {
+    std::swap(uv_top, uv_bottom);
+  }
+  
+  float center_x = (left + right) / 2;
+  float center_y = (top + bottom) / 2;
+  
+  float sa = sinf(angle/180.0f*M_PI);
+  float ca = cosf(angle/180.0f*M_PI);
+
+  left  -= center_x;
+  right -= center_x;
+
+  top    -= center_y;
+  bottom -= center_y;
+
+  glBlendFunc(blend.sfactor, blend.dfactor);
+  glColor4f(color.red, color.green, color.blue, color.alpha);
+  glBegin(GL_QUADS);
+  glTexCoord2f(uv_left, uv_top);
+  glVertex2f(left*ca - top*sa + center_x,
+             left*sa + top*ca + center_y);
+  
+  glTexCoord2f(uv_right, uv_top);
+  glVertex2f(right*ca - top*sa + center_x,
+             right*sa + top*ca + center_y);
+
+  glTexCoord2f(uv_right, uv_bottom);
+  glVertex2f(right*ca - bottom*sa + center_x,
+             right*sa + bottom*ca + center_y);
+
+  glTexCoord2f(uv_left, uv_bottom);
+  glVertex2f(left*ca - bottom*sa + center_x,
+             left*sa + bottom*ca + center_y);
+  glEnd();
+  
+  // FIXME: find a better way to restore the blend mode
+  glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+}
+
+void
+Surface::draw(float x, float y, float alpha, float angle, const Color& color, const Blend& blend, DrawingEffect effect) const
+{
+  glColor4f(1.0f, 1.0f, 1.0f, alpha);
+  glBindTexture(GL_TEXTURE_2D, texture->get_handle());
+
+  intern_draw2(x, y,
+               x + width, y + height,
+               uv_left, uv_top, uv_right, uv_bottom, 
+               angle,
+               color,
+               blend, 
+               effect);
+}
+
 void
 Surface::draw(float x, float y, float alpha, DrawingEffect effect) const
 {