Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bitmap: Clip dest rect when blitting from mega surface

This commit is contained in:
Jonas Kulla 2014-08-09 13:43:15 +02:00
parent 0ab543fd75
commit 6c9fbc1465
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/bitmap.cpp
View File

@ -366,6 +366,14 @@ void Bitmap::stretchBlt(const IntRect &destRect,
SDL_Surface *srcSurf = source.megaSurface(); SDL_Surface *srcSurf = source.megaSurface();
SDL_Rect srcRect = sourceRect;
SDL_Rect dstRect = destRect;
SDL_Rect btmRect = { 0, 0, width(), height() };
SDL_Rect bltRect;
if (SDL_IntersectRect(&btmRect, &dstRect, &bltRect) != SDL_TRUE)
return;
int bpp; int bpp;
Uint32 rMask, gMask, bMask, aMask; Uint32 rMask, gMask, bMask, aMask;
SDL_PixelFormatEnumToMasks(SDL_PIXELFORMAT_ABGR8888, SDL_PixelFormatEnumToMasks(SDL_PIXELFORMAT_ABGR8888,
@ -373,23 +381,25 @@ void Bitmap::stretchBlt(const IntRect &destRect,
SDL_Surface *blitTemp = SDL_Surface *blitTemp =
SDL_CreateRGBSurface(0, destRect.w, destRect.h, bpp, rMask, gMask, bMask, aMask); SDL_CreateRGBSurface(0, destRect.w, destRect.h, bpp, rMask, gMask, bMask, aMask);
SDL_Rect srcRect;
srcRect.x = sourceRect.x;
srcRect.y = sourceRect.y;
srcRect.w = sourceRect.w;
srcRect.h = sourceRect.h;
SDL_Rect dstRect;
dstRect.x = dstRect.y = 0;
dstRect.w = blitTemp->w;
dstRect.h = blitTemp->h;
// FXIME: This is supposed to be a scaled blit, put SDL2 for some reason // FXIME: This is supposed to be a scaled blit, put SDL2 for some reason
// makes the source surface unusable after BlitScaled() is called. Investigate! // makes the source surface unusable after BlitScaled() is called. Investigate!
SDL_BlitSurface(srcSurf, &srcRect, blitTemp, &dstRect); SDL_BlitSurface(srcSurf, &srcRect, blitTemp, 0);
TEX::bind(p->gl.tex); TEX::bind(p->gl.tex);
TEX::uploadSubImage(destRect.x, destRect.y, destRect.w, destRect.h, blitTemp->pixels, GL_RGBA);
if (bltRect.w == dstRect.w && bltRect.h == dstRect.h)
{
TEX::uploadSubImage(destRect.x, destRect.y,
destRect.w, destRect.h,
blitTemp->pixels, GL_RGBA);
}
else
{
GLMeta::subRectImageUpload(blitTemp->w, bltRect.x - dstRect.x, bltRect.y - dstRect.y,
bltRect.x, bltRect.y, bltRect.w, bltRect.h, blitTemp, GL_RGBA);
GLMeta::subRectImageEnd();
}
SDL_FreeSurface(blitTemp); SDL_FreeSurface(blitTemp);

8
src/etc-internal.h
View File

@ -24,6 +24,8 @@
#include "util.h" #include "util.h"
#include <SDL_rect.h>
struct Vec2 struct Vec2
{ {
float x, y; float x, y;
@ -118,6 +120,12 @@ struct IntRect
{ {
return Vec2i(w, h); return Vec2i(w, h);
} }
operator SDL_Rect() const
{
SDL_Rect r = { x, y, w, h };
return r;
}
}; };
struct StaticRect { float x, y, w, h; }; struct StaticRect { float x, y, w, h; };