projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed draw_part() when alpha != 255.
[supertux.git]
/
lib
/
video
/
surface.cpp
diff --git
a/lib/video/surface.cpp
b/lib/video/surface.cpp
index
73dc131
..
718fbeb
100644
(file)
--- a/
lib/video/surface.cpp
+++ b/
lib/video/surface.cpp
@@
-257,24
+257,24
@@
apply_filter_to_surface(SDL_Surface* surface, int filter, Color color)
{
if(filter == MASK_FILTER)
{
{
if(filter == MASK_FILTER)
{
+ SDL_Surface* sur_copy = sdl_surface_from_sdl_surface(surface, true);
+
Uint8 r,g,b,a;
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(sur_copy);
+ for(int x = 0; x < sur_copy->w; x++)
+ for(int y = 0; y < sur_copy->h; y++)
{
{
-// SDL_LockSurface(surface);
- SDL_GetRGBA(getpixel(surface,x,y), surface->format, &r,&g,&b,&a);
-// SDL_UnlockSurface(surface);
+ SDL_GetRGBA(getpixel(sur_copy,x,y), sur_copy->format, &r,&g,&b,&a);
if(a != 0)
{
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));
+ putpixel(sur_copy, x,y, color.map_rgba(sur_copy));
}
}
}
}
- SDL_UnlockSurface(surface);
+ SDL_UnlockSurface(sur_copy);
+
+ SDL_BlitSurface(sur_copy, NULL, surface, NULL);
+ SDL_FreeSurface(sur_copy);
}
}
}
}
@@
-362,6
+362,7
@@
SDL_Surface*
SuperTux::sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha)
{
SDL_Surface* sdl_surface;
SuperTux::sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha)
{
SDL_Surface* sdl_surface;
+#if 0
Uint32 saved_flags;
Uint8 saved_alpha;
Uint32 saved_flags;
Uint8 saved_alpha;
@@
-373,18
+374,21
@@
SuperTux::sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha)
{
SDL_SetAlpha(sdl_surf, 0, 0);
}
{
SDL_SetAlpha(sdl_surf, 0, 0);
}
+#endif
if(use_alpha == false && !use_gl)
sdl_surface = SDL_DisplayFormat(sdl_surf);
else
sdl_surface = SDL_DisplayFormatAlpha(sdl_surf);
if(use_alpha == false && !use_gl)
sdl_surface = SDL_DisplayFormat(sdl_surf);
else
sdl_surface = SDL_DisplayFormatAlpha(sdl_surf);
+#if 0
/* Restore the alpha blending attributes */
if ( (saved_flags & SDL_SRCALPHA)
== SDL_SRCALPHA )
{
SDL_SetAlpha(sdl_surface, saved_flags, saved_alpha);
}
/* Restore the alpha blending attributes */
if ( (saved_flags & SDL_SRCALPHA)
== SDL_SRCALPHA )
{
SDL_SetAlpha(sdl_surface, saved_flags, saved_alpha);
}
+#endif
if (sdl_surface == NULL)
Termination::abort("Can't covert to display format", "SURFACE");
if (sdl_surface == NULL)
Termination::abort("Can't covert to display format", "SURFACE");
@@
-991,10
+995,10
@@
SurfaceSDL::draw_part(float sx, float sy, float x, float y, float w, float h, Ui
/* Create a Surface, make it using colorkey, blit surface into temp, apply alpha
to temp sur, blit the temp into the screen */
/* Note: this has to be done, since SDL doesn't allow to set alpha to surfaces that
/* Create a Surface, make it using colorkey, blit surface into temp, apply alpha
to temp sur, blit the temp into the screen */
/* Note: this has to be done, since SDL doesn't allow to set alpha to surfaces that
- already have an alpha mask yet... */
+ already have an alpha mask
,
yet... */
SDL_Surface* sdl_surface_copy = SDL_CreateRGBSurface (sdl_surface->flags,
SDL_Surface* sdl_surface_copy = SDL_CreateRGBSurface (sdl_surface->flags,
-
sdl_surface->w, sdl_surface->
h, sdl_surface->format->BitsPerPixel,
+
(int)w, (int)
h, sdl_surface->format->BitsPerPixel,
sdl_surface->format->Rmask, sdl_surface->format->Gmask,
sdl_surface->format->Bmask,
0);
sdl_surface->format->Rmask, sdl_surface->format->Gmask,
sdl_surface->format->Bmask,
0);
@@
-1003,7
+1007,7
@@
SurfaceSDL::draw_part(float sx, float sy, float x, float y, float w, float h, Ui
SDL_SetColorKey(sdl_surface_copy, SDL_SRCCOLORKEY, colorkey);
SDL_SetColorKey(sdl_surface_copy, SDL_SRCCOLORKEY, colorkey);
- SDL_BlitSurface(sdl_surface,
NULL
, sdl_surface_copy, NULL);
+ SDL_BlitSurface(sdl_surface,
&src
, sdl_surface_copy, NULL);
SDL_SetAlpha(sdl_surface_copy ,SDL_SRCALPHA,alpha);
int ret = SDL_BlitSurface(sdl_surface_copy, NULL, screen, &dest);
SDL_SetAlpha(sdl_surface_copy ,SDL_SRCALPHA,alpha);
int ret = SDL_BlitSurface(sdl_surface_copy, NULL, screen, &dest);