Reverted the experiment, it didn't work.
This commit is contained in:
parent
e4acc9ef07
commit
84c86a8df1
1 changed files with 17 additions and 39 deletions
|
@ -999,7 +999,6 @@ SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
|||
{
|
||||
SDL_Window *window;
|
||||
SDL_Rect real_srcrect;
|
||||
SDL_Rect clip_dstrect;
|
||||
SDL_Rect real_dstrect;
|
||||
|
||||
CHECK_RENDERER_MAGIC(renderer, -1);
|
||||
|
@ -1011,16 +1010,6 @@ SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
|||
}
|
||||
window = renderer->window;
|
||||
|
||||
if (dstrect) {
|
||||
clip_dstrect = *dstrect;
|
||||
} else {
|
||||
clip_dstrect.x = 0;
|
||||
clip_dstrect.y = 0;
|
||||
clip_dstrect.w = renderer->viewport.w;
|
||||
clip_dstrect.h = renderer->viewport.h;
|
||||
}
|
||||
dstrect = &clip_dstrect;
|
||||
|
||||
real_srcrect.x = 0;
|
||||
real_srcrect.y = 0;
|
||||
real_srcrect.w = texture->w;
|
||||
|
@ -1029,26 +1018,14 @@ SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
|||
if (!SDL_IntersectRect(srcrect, &real_srcrect, &real_srcrect)) {
|
||||
return 0;
|
||||
}
|
||||
/* Clip dstrect by the same amount as srcrect was clipped */
|
||||
if (srcrect->w != real_srcrect.w) {
|
||||
int deltax = (real_srcrect.x - srcrect->x);
|
||||
int deltaw = (real_srcrect.w - srcrect->w);
|
||||
clip_dstrect.x += (deltax * clip_dstrect.w) / srcrect->w;
|
||||
clip_dstrect.w += (deltaw * clip_dstrect.w) / srcrect->w;
|
||||
}
|
||||
if (srcrect->h != real_srcrect.h) {
|
||||
int deltay = (real_srcrect.y - srcrect->y);
|
||||
int deltah = (real_srcrect.h - srcrect->h);
|
||||
clip_dstrect.y += (deltay * clip_dstrect.h) / srcrect->h;
|
||||
clip_dstrect.h += (deltah * clip_dstrect.h) / srcrect->h;
|
||||
}
|
||||
}
|
||||
|
||||
real_dstrect.x = 0;
|
||||
real_dstrect.y = 0;
|
||||
real_dstrect.w = renderer->viewport.w;
|
||||
real_dstrect.h = renderer->viewport.h;
|
||||
if (!SDL_IntersectRect(&clip_dstrect, &real_dstrect, &real_dstrect)) {
|
||||
if (dstrect) {
|
||||
if (!SDL_IntersectRect(dstrect, &real_dstrect, &real_dstrect)) {
|
||||
return 0;
|
||||
}
|
||||
/* Clip srcrect by the same amount as dstrect was clipped */
|
||||
|
@ -1064,6 +1041,7 @@ SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
|||
real_srcrect.y += (deltay * real_srcrect.h) / dstrect->h;
|
||||
real_srcrect.h += (deltah * real_srcrect.h) / dstrect->h;
|
||||
}
|
||||
}
|
||||
|
||||
if (texture->native) {
|
||||
texture = texture->native;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue