From 7fd393bbc70dec44898c486c858ab338214504d6 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 1 Oct 2012 21:57:09 -0700 Subject: [PATCH] The viewport is already scaled to the output coordinates --- src/render/software/SDL_render_sw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c index 43d9d84e6..785b6ef7b 100644 --- a/src/render/software/SDL_render_sw.c +++ b/src/render/software/SDL_render_sw.c @@ -361,8 +361,8 @@ SW_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points, return -1; } if (renderer->viewport.x || renderer->viewport.y) { - float x = renderer->viewport.x * renderer->scale.x; - float y = renderer->viewport.y * renderer->scale.y; + int x = renderer->viewport.x; + int y = renderer->viewport.y; for (i = 0; i < count; ++i) { final_points[i].x = (int)(x + points[i].x); @@ -411,8 +411,8 @@ SW_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points, return -1; } if (renderer->viewport.x || renderer->viewport.y) { - float x = renderer->viewport.x * renderer->scale.x; - float y = renderer->viewport.y * renderer->scale.y; + int x = renderer->viewport.x; + int y = renderer->viewport.y; for (i = 0; i < count; ++i) { final_points[i].x = (int)(x + points[i].x); @@ -460,8 +460,8 @@ SW_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects, int count) return -1; } if (renderer->viewport.x || renderer->viewport.y) { - float x = renderer->viewport.x * renderer->scale.x; - float y = renderer->viewport.y * renderer->scale.y; + int x = renderer->viewport.x; + int y = renderer->viewport.y; for (i = 0; i < count; ++i) { final_rects[i].x = (int)(x + rects[i].x); @@ -507,8 +507,8 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, } if (renderer->viewport.x || renderer->viewport.y) { - final_rect.x = (int)((renderer->viewport.x * renderer->scale.x) + dstrect->x); - final_rect.y = (int)((renderer->viewport.y * renderer->scale.y) + dstrect->y); + final_rect.x = (int)(renderer->viewport.x + dstrect->x); + final_rect.y = (int)(renderer->viewport.y + dstrect->y); } else { final_rect.x = (int)dstrect->x; final_rect.y = (int)dstrect->y; @@ -553,8 +553,8 @@ SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, } if (renderer->viewport.x || renderer->viewport.y) { - final_rect.x = (int)((renderer->viewport.x * renderer->scale.x) + dstrect->x); - final_rect.y = (int)((renderer->viewport.y * renderer->scale.y) + dstrect->y); + final_rect.x = (int)(renderer->viewport.x + dstrect->x); + final_rect.y = (int)(renderer->viewport.y + dstrect->y); } else { final_rect.x = (int)dstrect->x; final_rect.y = (int)dstrect->y;