X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=0e8945d5883b1e69d4d5b49faa72a29c6f432906;hp=5dd81ef0eb04f5adcfa05c247215dac96d16ab85;hb=3e3b2e2cbfb978e4a18276ddfe872eed61dc1d95;hpb=12d4953d364b0b185f7669e36c6d64adb29d742d diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 5dd81ef0..0e8945d5 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -226,6 +226,39 @@ static boolean equalSDLPixelFormat(SDL_PixelFormat *format1, format1->Bmask == format2->Bmask); } +static Pixel SDLGetColorKey(SDL_Surface *surface) +{ + Pixel color_key; + + if (SDL_GetColorKey(surface, &color_key) != 0) + return -1; + + return color_key; +} + +static boolean SDLHasColorKey(SDL_Surface *surface) +{ + return (SDLGetColorKey(surface) != -1); +} + +static boolean SDLHasAlpha(SDL_Surface *surface) +{ + SDL_BlendMode blend_mode; + + if (SDL_GetSurfaceBlendMode(surface, &blend_mode) != 0) + return FALSE; + + return (blend_mode == SDL_BLENDMODE_BLEND); +} + +static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha) +{ + SDL_BlendMode blend_mode = (set ? SDL_BLENDMODE_BLEND : SDL_BLENDMODE_NONE); + + SDL_SetSurfaceBlendMode(surface, blend_mode); + SDL_SetSurfaceAlphaMod(surface, alpha); +} + SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface) { SDL_PixelFormat format; @@ -277,35 +310,42 @@ boolean SDLSetNativeSurface(SDL_Surface **surface) #else -boolean SDLSetNativeSurface(SDL_Surface **surface) +static Pixel SDLGetColorKey(SDL_Surface *surface) { - SDL_Surface *new_surface; + if ((surface->flags & SDL_SRCCOLORKEY) == 0) + return -1; - if (surface == NULL || - *surface == NULL || - !video.initialized) - return FALSE; - - new_surface = SDL_DisplayFormat(*surface); - - if (new_surface == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); + return surface->format->colorkey; +} - SDL_FreeSurface(*surface); +static boolean SDLHasColorKey(SDL_Surface *surface) +{ + return (SDLGetColorKey(surface) != -1); +} - *surface = new_surface; +static boolean SDLHasAlpha(SDL_Surface *surface) +{ + return ((surface->flags & SDL_SRCALPHA) != 0); +} - return TRUE; +static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha) +{ + SDL_SetAlpha(surface, (set ? SDL_SRCALPHA : 0), alpha); } SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface) { SDL_Surface *new_surface; - if (video.initialized) - new_surface = SDL_DisplayFormat(surface); - else + if (surface == NULL) + return NULL; + + if (!video.initialized) new_surface = SDL_ConvertSurface(surface, surface->format, SURFACE_FLAGS); + else if (SDLHasAlpha(surface)) + new_surface = SDL_DisplayFormatAlpha(surface); + else + new_surface = SDL_DisplayFormat(surface); if (new_surface == NULL) Error(ERR_EXIT, "%s() failed: %s", @@ -315,6 +355,24 @@ SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface) return new_surface; } +boolean SDLSetNativeSurface(SDL_Surface **surface) +{ + SDL_Surface *new_surface; + + if (surface == NULL || + *surface == NULL || + !video.initialized) + return FALSE; + + new_surface = SDLGetNativeSurface(*surface); + + SDL_FreeSurface(*surface); + + *surface = new_surface; + + return TRUE; +} + #endif #if defined(TARGET_SDL2) @@ -988,11 +1046,8 @@ void SDLFadeRectangle(int x, int y, int width, int height, int i; SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect); -#if defined(TARGET_SDL2) - SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_NONE); -#else - SDL_SetAlpha(surface_target, 0, 0); /* disable alpha blending */ -#endif + + SDLSetAlpha(surface_target, FALSE, 0); /* disable alpha blending */ ypos[0] = -GetSimpleRandom(16); @@ -1105,11 +1160,8 @@ void SDLFadeRectangle(int x, int y, int width, int height, int xx_size = width / 2; SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect); -#if defined(TARGET_SDL2) - SDL_SetSurfaceBlendMode(surface_source, SDL_BLENDMODE_NONE); -#else - SDL_SetAlpha(surface_source, 0, 0); /* disable alpha blending */ -#endif + + SDLSetAlpha(surface_source, FALSE, 0); /* disable alpha blending */ for (xx = 0; xx < xx_size;) { @@ -1172,12 +1224,7 @@ void SDLFadeRectangle(int x, int y, int width, int height, SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect); /* draw new (target) image to screen buffer using alpha blending */ -#if defined(TARGET_SDL2) - SDL_SetSurfaceAlphaMod(surface_target, alpha_final); - SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_BLEND); -#else - SDL_SetAlpha(surface_target, SDL_SRCALPHA, alpha_final); -#endif + SDLSetAlpha(surface_target, TRUE, alpha_final); SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect); if (draw_border_function != NULL) @@ -2131,10 +2178,28 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) return zoom_dst; } +static void SetOpaqueBitmapSurface(Bitmap *bitmap) +{ + if (bitmap == NULL) + return; + + if (bitmap->surface) + SDL_FreeSurface(bitmap->surface); + + if ((bitmap->surface = SDLGetNativeSurface(bitmap->surface_masked)) == NULL) + Error(ERR_EXIT, "SDL_DisplayFormat() failed"); + + /* remove alpha channel from native non-transparent surface, if defined */ + SDLSetAlpha(bitmap->surface, FALSE, 0); + + /* remove transparent color from native non-transparent surface, if defined */ + SDL_SetColorKey(bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0); +} + Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height) { Bitmap *dst_bitmap = CreateBitmapStruct(); - SDL_Surface **dst_surface = &dst_bitmap->surface; + SDL_Surface **dst_surface = &dst_bitmap->surface_masked; dst_width = MAX(1, dst_width); /* prevent zero bitmap width */ dst_height = MAX(1, dst_height); /* prevent zero bitmap height */ @@ -2143,11 +2208,19 @@ Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height) dst_bitmap->height = dst_height; /* create zoomed temporary surface from source surface */ - *dst_surface = zoomSurface(src_bitmap->surface, dst_width, dst_height); + *dst_surface = zoomSurface(src_bitmap->surface_masked, dst_width, dst_height); /* create native format destination surface from zoomed temporary surface */ SDLSetNativeSurface(dst_surface); + /* set color key for zoomed surface from source surface, if defined */ + if (SDLHasColorKey(src_bitmap->surface_masked)) + SDL_SetColorKey(*dst_surface, SET_TRANSPARENT_PIXEL, + SDLGetColorKey(src_bitmap->surface_masked)); + + /* create native non-transparent surface for opaque blitting */ + SetOpaqueBitmapSurface(dst_bitmap); + return dst_bitmap; } @@ -2185,15 +2258,23 @@ Bitmap *SDLLoadImage(char *filename) return NULL; } + /* remove alpha channel from native non-transparent surface, if defined */ + SDLSetAlpha(new_bitmap->surface, FALSE, 0); + + /* remove transparent color from native non-transparent surface, if defined */ + SDL_SetColorKey(new_bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0); + print_timestamp_time("SDL_DisplayFormat (opaque)"); UPDATE_BUSY_STATE(); - /* create native transparent surface for current image */ - if (sdl_image_tmp->format->Amask == 0) + /* set black pixel to transparent if no alpha channel / transparent color */ + if (!SDLHasAlpha(sdl_image_tmp) && + !SDLHasColorKey(sdl_image_tmp)) SDL_SetColorKey(sdl_image_tmp, SET_TRANSPARENT_PIXEL, SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00)); + /* create native transparent surface for current image */ if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL) { SetError("SDL_DisplayFormat(): %s", SDL_GetError());