super-tux-commit Mailing List for Super Tux (Page 35)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/super-tux/supertux/lib/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24953/lib/video

Modified Files:
	screen.cpp screen.h surface.cpp surface.h 
Log Message:
Apply filter mask.
TODO: make it working over the other rather than a colorization.

Index: screen.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/screen.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

--- screen.cpp	26 Jul 2004 15:48:38 -0000	1.4
+++ screen.cpp	27 Aug 2004 20:34:56 -0000	1.5
@@ -42,6 +42,37 @@
 using namespace SuperTux;
 
 /* 'Stolen' from the SDL documentation.
+ * Return the pixel value at (x, y)
+ * NOTE: The surface must be locked before calling this!
+ */
+Uint32 SuperTux::getpixel(SDL_Surface *surface, int x, int y)
+{
+    int bpp = surface->format->BytesPerPixel;
+    /* Here p is the address to the pixel we want to retrieve */
+    Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
+
+    switch(bpp) {
+    case 1:
+        return *p;
+
+    case 2:
+        return *(Uint16 *)p;
+
+    case 3:
+        if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
+            return p[0] << 16 | p[1] << 8 | p[2];
+        else
+            return p[0] | p[1] << 8 | p[2] << 16;
+
+    case 4:
+        return *(Uint32 *)p;
+
+    default:
+        return 0;       /* shouldn't happen, but avoids warnings */
+    }
+}
+
+/* 'Stolen' from the SDL documentation.
  * Set the pixel at (x, y) to the given value
  * NOTE: The surface must be locked before calling this!
  */

Index: screen.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/screen.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- screen.h	21 Aug 2004 11:39:59 -0000	1.3
+++ screen.h	27 Aug 2004 20:34:56 -0000	1.4
@@ -49,6 +49,11 @@
       { if(color.size() >= 3) { red = color[0]; green = color[1]; blue = color[2]; }
         if(color.size() == 4) alpha = color[3]; }
 
+      Color(std::vector <int> color)
+          : red(0), green(0), blue(0), alpha(255)
+      { if(color.size() >= 3) { red = color[0]; green = color[1]; blue = color[2]; }
+        if(color.size() == 4) alpha = color[3]; }
+
       Color(const Color& o)
           : red(o.red), green(o.green), blue(o.blue), alpha(o.alpha)
       { }
@@ -61,13 +66,19 @@
         return false;
       }
 
+      Uint32 map_rgb(SDL_Surface* surface)
+        { return SDL_MapRGB(surface->format, red, green, blue); }
+      Uint32 map_rgba(SDL_Surface* surface)
+        { return SDL_MapRGBA(surface->format, red, green, blue, alpha); }
+
       Uint8 red, green, blue, alpha;
     };
 
 
   class Vector;
 
-  void putpixel(SDL_Surface *surface, int x, int y, Uint32 pixel);
+  Uint32 getpixel(SDL_Surface* surface, int x, int y);
+  void putpixel(SDL_Surface* surface, int x, int y, Uint32 pixel);
   void drawpixel(int x, int y, Uint32 pixel);
   void fillrect(float x, float y, float w, float h, int r, int g, int b, int a = 255);
   void draw_line(float x1, float y1, float x2, float y2, int r, int g, int b, int a = 255);

Index: surface.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- surface.h	19 Aug 2004 11:01:46 -0000	1.5
+++ surface.h	27 Aug 2004 20:34:56 -0000	1.6
@@ -35,7 +35,8 @@
 
 namespace SuperTux
   {
-  
+
+  void apply_filter_to_surface(SDL_Surface *surface, int filter, int value);
   SDL_Surface* sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha);
   SDL_Surface* sdl_surface_from_nothing();
 
@@ -56,6 +57,11 @@
     SEMI_TRANSPARENT  = 0x0004
   };
 
+  /// types of filters
+  enum {
+    MASK_FILTER
+  };
+
   /** This class holds all the data necessary to construct a surface */
   class SurfaceData
     {
@@ -111,6 +117,8 @@
       void reload();
 
       void resize(int widht, int height);
+
+      void apply_mask(Color color);
     };
 
   /** Surface implementation, all implementation have to inherit from
@@ -137,6 +145,8 @@
       int resize(int w_, int h_);
 
       SDL_Surface* get_sdl_surface() const; // @evil@ try to avoid this function
+
+      virtual void apply_mask(Color color) = 0;
     };
 
   class SurfaceSDL : public SurfaceImpl
@@ -151,6 +161,8 @@
       int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT);
       int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, Uint32 effect = NONE_EFFECT);
       int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT);
+
+      void apply_mask(Color color);
     };
 
 #ifndef NOOPENGL
@@ -171,6 +183,7 @@
       int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, Uint32 effect = NONE_EFFECT);
       int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT);
 
+      void apply_mask(Color color);
 
     private:
       void create_gl(SDL_Surface * surf, GLuint * tex);

Index: surface.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface.cpp	19 Aug 2004 11:01:46 -0000	1.7
+++ surface.cpp	27 Aug 2004 20:34:56 -0000	1.8
@@ -26,6 +26,7 @@
 #include "SDL_image.h"
 
 #include "../video/surface.h"
+#include "../video/screen.h"
 #include "../app/globals.h"
 #include "../app/setup.h"
 
@@ -196,6 +197,11 @@
   }
 }
 
+void Surface::apply_mask(Color color)
+{
+impl->apply_mask(color);
+}
+
 Surface::~Surface()
 {
 #ifdef DEBUG
@@ -246,6 +252,32 @@
   }
 }
 
+void
+apply_filter_to_surface(SDL_Surface* surface, int filter, Color color)
+{
+if(filter == MASK_FILTER)
+  {
+  Uint8 r,g,b,a;
+  SDL_Rect rect;
+  rect.w = rect.h = 1;
+  SDL_LockSurface(surface);
+  for(int x = 0; x < surface->w; x++)
+    for(int y = 0; y < surface->h; y++)
+      {
+//    SDL_LockSurface(surface);
+      SDL_GetRGBA(getpixel(surface,x,y), surface->format, &r,&g,&b,&a);
+//    SDL_UnlockSurface(surface);
+      if(a != 0)
+        {
+      putpixel(surface, x,y, color.map_rgba(surface));
+//        rect.x = x; rect.y = y;
+//        SDL_FillRect(surface, &rect, color.map_rgba(surface));
+        }
+      }
+  SDL_UnlockSurface(surface);
+  }
+}
+
 SDL_Surface*
 sdl_surface_part_from_file(const std::string& file, int x, int y, int w, int h,  bool use_alpha)
 {
@@ -804,6 +836,16 @@
   return 0;
 }
 
+void
+SurfaceOpenGL::apply_mask(Color color)
+{
+  ::apply_filter_to_surface(sdl_surface, MASK_FILTER, color);
+  create_gl(sdl_surface,&gl_texture);
+
+  w = sdl_surface->w;
+  h = sdl_surface->h;
+}
+
 #endif
 
 SurfaceSDL::SurfaceSDL(SDL_Surface* surf, bool use_alpha)
@@ -1006,6 +1048,15 @@
   return ret;
 }
 
+void
+SurfaceSDL::apply_mask(Color color)
+{
+  ::apply_filter_to_surface(sdl_surface, MASK_FILTER, color);
+
+  w = sdl_surface->w;
+  h = sdl_surface->h;
+}
+
 SurfaceSDL::~SurfaceSDL()
 {}
 





2004	Jan	Feb	Mar (94)	Apr (500)	May (531)	Jun (196)	Jul (224)	Aug (193)	Sep (117)	Oct (115)	Nov (319)	Dec (97)
2005	Jan (19)	Feb	Mar (105)	Apr (41)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (6)
2007	Jan (1)	Feb (2)	Mar	Apr (1)	May	Jun	Jul (2)	Aug (2)	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May (1)	Jun (4)	Jul	Aug	Sep (7)	Oct (12)	Nov (26)	Dec (39)
2009	Jan (6)	Feb (15)	Mar (10)	Apr (25)	May (29)	Jun (21)	Jul (26)	Aug (8)	Sep (3)	Oct	Nov	Dec (10)
2010	Jan (5)	Feb (5)	Mar (2)	Apr	May (5)	Jun	Jul (1)	Aug (2)	Sep (2)	Oct (2)	Nov	Dec

super-tux-commit Mailing List for Super Tux (Page 35)

super-tux-commit — Messages about commits to the sourcecode.