X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvideo%2Fsurface.cpp;h=23ff693897742dcd1ebb6fb27604f265d7b58fe4;hb=394afb555fd97f21a5d7bb473c749535e01df085;hp=799372b27448dfb8124da435ab1207f251d1bdab;hpb=49796e6cc2385aea989d7c44c789b406190f2bf7;p=supertux.git

diff --git a/src/video/surface.cpp b/src/video/surface.cpp
index 799372b27..23ff69389 100644
--- a/src/video/surface.cpp
+++ b/src/video/surface.cpp
@@ -32,6 +32,8 @@
 #include "gameconfig.hpp"
 #include "physfs/physfs_sdl.hpp"
 #include "video/surface.hpp"
+#include "video/drawing_context.hpp"
+#include "video/color.hpp"
 #include "image_texture.hpp"
 #include "texture_manager.hpp"
 
@@ -114,11 +116,11 @@ static inline void intern_draw(float left, float top, float right, float bottom,
   if(effect & VERTICAL_FLIP) {
     std::swap(uv_top, uv_bottom);
   }
-  
+
   glBegin(GL_QUADS);
   glTexCoord2f(uv_left, uv_top);
   glVertex2f(left, top);
-  
+
   glTexCoord2f(uv_right, uv_top);
   glVertex2f(right, top);
 
@@ -134,6 +136,8 @@ 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)
@@ -141,10 +145,10 @@ static inline void intern_draw2(float left, float top, float right, float bottom
   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);
 
@@ -154,11 +158,13 @@ static inline void intern_draw2(float left, float top, float right, float bottom
   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);
@@ -171,18 +177,24 @@ static inline void intern_draw2(float left, float top, float right, float 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, DrawingEffect effect) const
+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, 
+               uv_left, uv_top, uv_right, uv_bottom,
                angle,
+               color,
+               blend,
                effect);
 }
 
@@ -204,17 +216,16 @@ Surface::draw_part(float src_x, float src_y, float dst_x, float dst_y,
 {
   float uv_width = uv_right - uv_left;
   float uv_height = uv_bottom - uv_top;
-  
+
   float uv_left = this->uv_left + (uv_width * src_x) / this->width;
   float uv_top = this->uv_top + (uv_height * src_y) / this->height;
   float uv_right = this->uv_left + (uv_width * (src_x + width)) / this->width;
   float uv_bottom = this->uv_top + (uv_height * (src_y + height)) / this->height;
-  
+
   glColor4f(1.0f, 1.0f, 1.0f, alpha);
-  glBindTexture(GL_TEXTURE_2D, texture->get_handle());  
-  
+  glBindTexture(GL_TEXTURE_2D, texture->get_handle());
+
   intern_draw(dst_x, dst_y,
               dst_x + width, dst_y + height,
               uv_left, uv_top, uv_right, uv_bottom, effect);
 }
-