X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=7a108238cbe56c5a4279f61f61bd0198d7c924aa;hp=30ca17949a8ad2f9192eed9fb0bd697a75207fd7;hb=97d0f78c43d16fbf73ea0438148a4da781c75600;hpb=f44ab55ae6291508015eb306581f31d53c3cb5bd diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 30ca1794..7a108238 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -129,6 +129,47 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch); } + SDL_Rect *src_rect1 = NULL, *dst_rect1 = NULL; + SDL_Rect *src_rect2 = NULL, *dst_rect2 = NULL; + +#if defined(HAS_SCREEN_KEYBOARD) + if (video.shifted_up || video.shifted_up_delay) + { + int time_current = SDL_GetTicks(); + int pos = video.shifted_up_pos; + int pos_last = video.shifted_up_pos_last; + + if (!DelayReachedExt(&video.shifted_up_delay, video.shifted_up_delay_value, + time_current)) + { + int delay = time_current - video.shifted_up_delay; + int delay_value = video.shifted_up_delay_value; + + pos = pos_last + (pos - pos_last) * delay / delay_value; + } + else + { + video.shifted_up_pos_last = pos; + video.shifted_up_delay = 0; + } + + SDL_Rect src_rect_up = { 0, pos, video.width, video.height - pos }; + SDL_Rect dst_rect_up = { 0, 0, video.width, video.height - pos }; + + if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET || + video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) + { + src_rect2 = &src_rect_up; + dst_rect2 = &dst_rect_up; + } + else + { + src_rect1 = &src_rect_up; + dst_rect1 = &dst_rect_up; + } + } +#endif + // clear render target buffer SDL_RenderClear(sdl_renderer); @@ -139,7 +180,7 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) // copy backbuffer texture to render target buffer if (video.screen_rendering_mode != SPECIAL_RENDERING_TARGET) - SDL_RenderCopy(sdl_renderer, sdl_texture_stream, NULL, NULL); + SDL_RenderCopy(sdl_renderer, sdl_texture_stream, src_rect1, dst_rect1); if (video.screen_rendering_mode != SPECIAL_RENDERING_BITMAP) FinalizeScreen(DRAW_TO_SCREEN); @@ -149,7 +190,7 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) { SDL_SetRenderTarget(sdl_renderer, NULL); - SDL_RenderCopy(sdl_renderer, sdl_texture_target, NULL, NULL); + SDL_RenderCopy(sdl_renderer, sdl_texture_target, src_rect2, dst_rect2); } #endif @@ -2124,7 +2165,8 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) { /* new source surface is 32 bit with a defined RGB ordering */ zoom_src = SDL_CreateRGBSurface(SURFACE_FLAGS, src->w, src->h, 32, - 0x000000ff, 0x0000ff00, 0x00ff0000, 0); + 0x000000ff, 0x0000ff00, 0x00ff0000, + (src->format->Amask ? 0xff000000 : 0)); SDL_BlitSurface(src, NULL, zoom_src, NULL); is_32bit = TRUE; is_converted = TRUE; @@ -2137,7 +2179,8 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) zoom_dst = SDL_CreateRGBSurface(SURFACE_FLAGS, dst_width, dst_height, 32, zoom_src->format->Rmask, zoom_src->format->Gmask, - zoom_src->format->Bmask, 0); + zoom_src->format->Bmask, + zoom_src->format->Amask); } else { @@ -2178,10 +2221,30 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) return zoom_dst; } +static SDL_Surface *SDLGetOpaqueSurface(SDL_Surface *surface) +{ + SDL_Surface *new_surface; + + if (surface == NULL) + return NULL; + + if ((new_surface = SDLGetNativeSurface(surface)) == NULL) + Error(ERR_EXIT, "SDLGetNativeSurface() failed"); + + /* remove alpha channel from native non-transparent surface, if defined */ + SDLSetAlpha(new_surface, FALSE, 0); + + /* remove transparent color from native non-transparent surface, if defined */ + SDL_SetColorKey(new_surface, UNSET_TRANSPARENT_PIXEL, 0); + + return new_surface; +} + Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height) { Bitmap *dst_bitmap = CreateBitmapStruct(); - SDL_Surface **dst_surface = &dst_bitmap->surface; + SDL_Surface *src_surface = src_bitmap->surface_masked; + SDL_Surface *dst_surface; dst_width = MAX(1, dst_width); /* prevent zero bitmap width */ dst_height = MAX(1, dst_height); /* prevent zero bitmap height */ @@ -2190,10 +2253,21 @@ 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_surface, dst_width, dst_height); /* create native format destination surface from zoomed temporary surface */ - SDLSetNativeSurface(dst_surface); + SDLSetNativeSurface(&dst_surface); + + /* set color key for zoomed surface from source surface, if defined */ + if (SDLHasColorKey(src_surface)) + SDL_SetColorKey(dst_surface, SET_TRANSPARENT_PIXEL, + SDLGetColorKey(src_surface)); + + /* create native non-transparent surface for opaque blitting */ + dst_bitmap->surface = SDLGetOpaqueSurface(dst_surface); + + /* set native transparent surface for masked blitting */ + dst_bitmap->surface_masked = dst_surface; return dst_bitmap; } @@ -2214,31 +2288,17 @@ Bitmap *SDLLoadImage(char *filename) /* load image to temporary surface */ if ((sdl_image_tmp = IMG_Load(filename)) == NULL) - { - SetError("IMG_Load(): %s", SDL_GetError()); - - return NULL; - } + Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError()); print_timestamp_time("IMG_Load"); UPDATE_BUSY_STATE(); /* create native non-transparent surface for current image */ - if ((new_bitmap->surface = SDLGetNativeSurface(sdl_image_tmp)) == NULL) - { - SetError("SDL_DisplayFormat(): %s", SDL_GetError()); + if ((new_bitmap->surface = SDLGetOpaqueSurface(sdl_image_tmp)) == NULL) + Error(ERR_EXIT, "SDLGetOpaqueSurface() failed"); - 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)"); + print_timestamp_time("SDLGetNativeSurface (opaque)"); UPDATE_BUSY_STATE(); @@ -2250,13 +2310,9 @@ Bitmap *SDLLoadImage(char *filename) /* create native transparent surface for current image */ if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL) - { - SetError("SDL_DisplayFormat(): %s", SDL_GetError()); - - return NULL; - } + Error(ERR_EXIT, "SDLGetNativeSurface() failed"); - print_timestamp_time("SDL_DisplayFormat (masked)"); + print_timestamp_time("SDLGetNativeSurface (masked)"); UPDATE_BUSY_STATE();