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

Allow for negative-y sprites

This commit is contained in:
Jeffrey Pfau 2013-04-25 00:11:27 -07:00
parent 4446e0dbde
commit 9dbd925d90
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gba/gba-video.h
View File

@ -48,7 +48,7 @@ union GBAColor {
union GBAOAM { union GBAOAM {
struct GBAObj { struct GBAObj {
int y : 8; unsigned y : 8;
unsigned transformed : 1; unsigned transformed : 1;
unsigned disable : 1; unsigned disable : 1;
enum ObjMode mode : 2; enum ObjMode mode : 2;
@ -70,7 +70,7 @@ union GBAOAM {
} obj[128]; } obj[128];
struct GBATransformedObj { struct GBATransformedObj {
int y : 8; unsigned y : 8;
unsigned transformed : 1; unsigned transformed : 1;
unsigned doublesize : 1; unsigned doublesize : 1;
enum ObjMode mode : 2; enum ObjMode mode : 2;

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

@ -208,9 +208,7 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render
if (sprite->transformed) { if (sprite->transformed) {
// TODO // TODO
} else if (!sprite->disable) { } else if (!sprite->disable) {
if (sprite->y <= y) { _drawSprite(softwareRenderer, sprite, y);
_drawSprite(softwareRenderer, sprite, y);
}
} }
} }
} }
@ -392,7 +390,7 @@ static const int _objSizes[32] = {
static void _drawSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y) { static void _drawSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y) {
int width = _objSizes[sprite->shape * 8 + sprite->size * 2]; int width = _objSizes[sprite->shape * 8 + sprite->size * 2];
int height = _objSizes[sprite->shape * 8 + sprite->size * 2 + 1]; int height = _objSizes[sprite->shape * 8 + sprite->size * 2 + 1];
if (y >= sprite->y + height) { if ((y < sprite->y && (sprite->y + height - 256 < 0 || y >= sprite->y + height - 256)) || y >= sprite->y + height) {
return; return;
} }
(void)(renderer); (void)(renderer);
@ -404,6 +402,9 @@ static void _drawSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj
}; };
int inX = sprite->x; int inX = sprite->x;
int inY = y - sprite->y; int inY = y - sprite->y;
if (sprite->y + height - 256 >= 0) {
inY += 256;
}
unsigned charBase = BASE_TILE + sprite->tile * 0x20; unsigned charBase = BASE_TILE + sprite->tile * 0x20;
unsigned yBase = (inY & ~0x7) * 0x80 + (inY & 0x7) * 4; unsigned yBase = (inY & ~0x7) * 0x80 + (inY & 0x7) * 4;
for (int outX = inX >= 0 ? inX : 0; outX < inX + width && outX < VIDEO_HORIZONTAL_PIXELS; ++outX) { for (int outX = inX >= 0 ? inX : 0; outX < inX + width && outX < VIDEO_HORIZONTAL_PIXELS; ++outX) {