ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in OBJ mosaic

This commit is contained in:
Jeffrey Pfau 2013-10-27 21:58:37 -07:00
parent 09888a8852
commit 8902635e3a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gba/renderers/video-software.c
View File

@ -1184,8 +1184,8 @@ static const int _objSizes[32] = {
#define SPRITE_MOSAIC_LOOP(DEPTH, TYPE) \ #define SPRITE_MOSAIC_LOOP(DEPTH, TYPE) \
SPRITE_YBASE_ ## DEPTH(inY); \ SPRITE_YBASE_ ## DEPTH(inY); \
if (outX % mosaicH) { \ if (outX % mosaicH) { \
outX += mosaicH - (outX % mosaicH); \
inX += (mosaicH - (outX % mosaicH)) * xOffset; \ inX += (mosaicH - (outX % mosaicH)) * xOffset; \
outX += mosaicH - (outX % mosaicH); \
} \ } \
for (; outX < condition; ++outX, inX += xOffset) { \ for (; outX < condition; ++outX, inX += xOffset) { \
if (!(renderer->row[outX] & FLAG_UNWRITTEN)) { \ if (!(renderer->row[outX] & FLAG_UNWRITTEN)) { \
@ -1251,6 +1251,10 @@ static const int _objSizes[32] = {
static int _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y) { static int _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y) {
int height = _objSizes[sprite->shape * 8 + sprite->size * 2 + 1]; int height = _objSizes[sprite->shape * 8 + sprite->size * 2 + 1];
if (sprite->mosaic) {
int mosaicV = renderer->mosaic.objV + 1;
y -= y % mosaicV;
}
if ((y < sprite->y && (sprite->y + height - 256 < 0 || y >= sprite->y + height - 256)) || y >= sprite->y + height) { if ((y < sprite->y && (sprite->y + height - 256 < 0 || y >= sprite->y + height - 256)) || y >= sprite->y + height) {
return 0; return 0;
} }
@ -1273,10 +1277,10 @@ static int _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct G
int condition = x + width; int condition = x + width;
int mosaicH = 1; int mosaicH = 1;
if (sprite->mosaic) { if (sprite->mosaic) {
int mosaicV = renderer->mosaic.objV + 1;
mosaicH = renderer->mosaic.objH + 1; mosaicH = renderer->mosaic.objH + 1;
y -= y % mosaicV; if (condition % mosaicH) {
condition += mosaicH - (condition % mosaicH); condition += mosaicH - (condition % mosaicH);
}
} }
int inY = y - sprite->y; int inY = y - sprite->y;
if (sprite->y + height - 256 >= 0) { if (sprite->y + height - 256 >= 0) {