From ef97aab9cf7f75f540d40c4568524f1a71ea9653 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 14 Nov 2013 21:39:54 -0800 Subject: [PATCH] Backed out changeset 6c59f7c8ec17 - it didn't actually do anything useful --- src/render/direct3d/SDL_render_d3d.c | 36 +++++++++++++--------------- src/render/opengl/SDL_render_gl.c | 30 ++++++++++------------- 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c index 38fb6d0823c94..a4c6027573b50 100644 --- a/src/render/direct3d/SDL_render_d3d.c +++ b/src/render/direct3d/SDL_render_d3d.c @@ -1635,26 +1635,22 @@ D3D_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, centerx = center->x; centery = center->y; - if ((flip & SDL_FLIP_VERTICAL) && (flip & SDL_FLIP_HORIZONTAL)) { - miny = dstrect->h - centery; - maxy = -centery; - minx = dstrect->w - centerx; - maxx = -centerx; - } else if (flip & SDL_FLIP_HORIZONTAL) { - miny = -centery; - maxy = dstrect->h - centery; - minx = dstrect->w - centerx; - maxx = -centerx; - } else if (flip & SDL_FLIP_VERTICAL) { - miny = dstrect->h - centery; - maxy = -centery; - minx = -centerx; - maxx = dstrect->w - centerx; - } else { - miny = -centery; - maxy = dstrect->h - centery; - minx = -centerx; - maxx = dstrect->w - centerx; + if (flip & SDL_FLIP_HORIZONTAL) { + minx = dstrect->w - centerx - 0.5f; + maxx = -centerx - 0.5f; + } + else { + minx = -centerx - 0.5f; + maxx = dstrect->w - centerx - 0.5f; + } + + if (flip & SDL_FLIP_VERTICAL) { + miny = dstrect->h - centery - 0.5f; + maxy = -centery - 0.5f; + } + else { + miny = -centery - 0.5f; + maxy = dstrect->h - centery - 0.5f; } minu = (float) srcrect->x / texture->w; diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c index bb789c13807ba..94914ead18f22 100644 --- a/src/render/opengl/SDL_render_gl.c +++ b/src/render/opengl/SDL_render_gl.c @@ -1250,26 +1250,22 @@ GL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, centerx = center->x; centery = center->y; - if ((flip & SDL_FLIP_VERTICAL) && (flip & SDL_FLIP_HORIZONTAL)) { - miny = dstrect->h - centery; - maxy = -centery; - minx = dstrect->w - centerx; - maxx = -centerx; - } else if (flip & SDL_FLIP_HORIZONTAL) { - miny = -centery; - maxy = dstrect->h - centery; - minx = dstrect->w - centerx; + if (flip & SDL_FLIP_HORIZONTAL) { + minx = dstrect->w - centerx; maxx = -centerx; - } else if (flip & SDL_FLIP_VERTICAL) { - miny = dstrect->h - centery; - maxy = -centery; + } + else { minx = -centerx; - maxx = dstrect->w - centerx; - } else { + maxx = dstrect->w - centerx; + } + + if (flip & SDL_FLIP_VERTICAL) { + miny = dstrect->h - centery; + maxy = -centery; + } + else { miny = -centery; - maxy = dstrect->h - centery; - minx = -centerx; - maxx = dstrect->w - centerx; + maxy = dstrect->h - centery; } minu = (GLfloat) srcrect->x / texture->w;