encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_RenderCopy: scale before doing intersection 

this prevents drawing 1 pixel outside the screen, in letterbox mode
This commit is contained in:
Sylvain Becker 2020-12-28 18:07:03 +01:00
parent 86b81abea6
commit 9efdafd43d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/render/SDL_render.c
View File

@ -2999,24 +2999,25 @@ SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture,
SDL_RenderGetViewport(renderer, &r); SDL_RenderGetViewport(renderer, &r);
real_dstrect.x = 0.0f; real_dstrect.x = 0.0f;
real_dstrect.y = 0.0f; real_dstrect.y = 0.0f;
real_dstrect.w = (float) r.w; real_dstrect.w = (float) r.w * renderer->scale.x;
real_dstrect.h = (float) r.h; real_dstrect.h = (float) r.h * renderer->scale.y;
if (dstrect) { if (dstrect) {
if (!SDL_HasIntersectionF(dstrect, &real_dstrect)) { SDL_FRect dstrect_scaled;
dstrect_scaled.x = dstrect->x * renderer->scale.x;
dstrect_scaled.y = dstrect->y * renderer->scale.y;
dstrect_scaled.w = dstrect->w * renderer->scale.x;
dstrect_scaled.h = dstrect->h * renderer->scale.y;
if (!SDL_HasIntersectionF(&dstrect_scaled, &real_dstrect)) {
return 0; return 0;
} }
real_dstrect = *dstrect; real_dstrect = dstrect_scaled;
} }
if (texture->native) { if (texture->native) {
texture = texture->native; texture = texture->native;
} }
real_dstrect.x *= renderer->scale.x;
real_dstrect.y *= renderer->scale.y;
real_dstrect.w *= renderer->scale.x;
real_dstrect.h *= renderer->scale.y;
texture->last_command_generation = renderer->render_command_generation; texture->last_command_generation = renderer->render_command_generation;
retval = QueueCmdCopy(renderer, texture, &real_srcrect, &real_dstrect); retval = QueueCmdCopy(renderer, texture, &real_srcrect, &real_dstrect);