Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-09 01:39:48 +03:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

improve graphics in gostop (nw)

Browse Source
This commit is contained in:
David Haywood 2014-10-10 23:27:04 +00:00
parent 774b2021ab
commit f2d8c05791
1 changed files with 223 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
src/mame/machine/st0016.c
View File

@ -341,13 +341,13 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
76543210 (bit) 76543210 (bit)
0 llllllll 0 llllllll
1 ---1SSSl 1 ---gSSSl
2 oooooooo 2 oooooooo
3 fooooooo 3 fooooooo
4 xxxxxxxx 4 xxxxxxxx
5 ------xx 5 ----XXxx
6 yyyyyyyy 6 yyyyyyyy
7 ------yy 7 ----XYyy
1 - always(?) set 1 - always(?) set
S - scroll index ? (ports $40-$60, X(word),Y(word) ) S - scroll index ? (ports $40-$60, X(word),Y(word) )
@ -356,6 +356,11 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
f - end of list flag f - end of list flag
x,y - sprite coords x,y - sprite coords
(complete guess)
g - use tile sizes specified in list (global / fixed ones if not set?) (gostop)
X = global X size?
Y = global Y size?
sublist format (8 bytes/entry): sublist format (8 bytes/entry):
76543210 76543210
@ -364,9 +369,9 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
2 --kkkkkk 2 --kkkkkk
3 QW------ 3 QW------
4 xxxxxxxx 4 xxxxxxxx
5 -B---XXx 5 -B--XX-x
6 yyyyyyyy 6 yyyyyyyy
7 -----YYy 7 ----YY-y
c - character code c - character code
k - palette k - palette
@ -378,77 +383,92 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
*/ */
gfx_element *gfx = m_gfxdecode->gfx(st0016_ramgfx); gfx_element *gfx = m_gfxdecode->gfx(st0016_ramgfx);
int i,j,lx,ly,x,y,code,offset,length,sx,sy,color,flipx,flipy,scrollx,scrolly/*,plx,ply*/; int i, j, lx, ly, x, y, code, offset, length, sx, sy, color, flipx, flipy, scrollx, scrolly/*,plx,ply*/;
for(i=0;i<ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK;i+=8) for (i = 0; i < ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK; i += 8)
{ {
x=st0016_spriteram[i+4]+((st0016_spriteram[i+5]&3)<<8); x = st0016_spriteram[i + 4] + ((st0016_spriteram[i + 5] & 3) << 8);
y=st0016_spriteram[i+6]+((st0016_spriteram[i+7]&3)<<8); y = st0016_spriteram[i + 6] + ((st0016_spriteram[i + 7] & 3) << 8);
scrollx=(st0016_vregs[(((st0016_spriteram[i+1]&0x0f)>>1)<<2)+0x40]+256*st0016_vregs[(((st0016_spriteram[i+1]&0x0f)>>1)<<2)+1+0x40])&0x3ff; int use_sizes = (st0016_spriteram[i + 1] & 0x10);
scrolly=(st0016_vregs[(((st0016_spriteram[i+1]&0x0f)>>1)<<2)+2+0x40]+256*st0016_vregs[(((st0016_spriteram[i+1]&0x0f)>>1)<<2)+3+0x40])&0x3ff; int globalx = (st0016_spriteram[i + 5] & 0x0c)>>2;
int globaly = (st0016_spriteram[i + 7] & 0x0c)>>2;
if(!ISMACS) scrollx = (st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 0x40] + 256 * st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 1 + 0x40]) & 0x3ff;
scrolly = (st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 2 + 0x40] + 256 * st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 3 + 0x40]) & 0x3ff;
if (!ISMACS)
{ {
if (x & 0x200) x-= 0x400; //sign if (x & 0x200) x -= 0x400; //sign
if (y & 0x200) y-= 0x400; if (y & 0x200) y -= 0x400;
if (scrollx & 0x200) scrollx-= 0x400; //sign if (scrollx & 0x200) scrollx -= 0x400; //sign
if (scrolly & 0x200) scrolly-= 0x400; if (scrolly & 0x200) scrolly -= 0x400;
} }
if(ISMACS1) if (ISMACS1)
{ {
if (x & 0x200) x-= 0x400; //sign if (x & 0x200) x -= 0x400; //sign
if (y & 0x200) y-= 0x2b0;//0x400; if (y & 0x200) y -= 0x2b0;//0x400;
if (scrollx & 0x200) scrollx-= 0x400; //sign if (scrollx & 0x200) scrollx -= 0x400; //sign
if (scrolly & 0x200) scrolly-= 0x400; if (scrolly & 0x200) scrolly -= 0x400;
} }
x+=scrollx; x += scrollx;
y+=scrolly; y += scrolly;
if(ISMACS) if (ISMACS)
{ {
y+=0x20; y += 0x20;
} }
if( st0016_spriteram[i+3]&0x80) /* end of list */ if (st0016_spriteram[i + 3] & 0x80) /* end of list */
break; break;
offset=st0016_spriteram[i+2]+256*(st0016_spriteram[i+3]); offset = st0016_spriteram[i + 2] + 256 * (st0016_spriteram[i + 3]);
offset<<=3; offset <<= 3;
length=st0016_spriteram[i+0]+1+256*(st0016_spriteram[i+1]&1); length = st0016_spriteram[i + 0] + 1 + 256 * (st0016_spriteram[i + 1] & 1);
//plx=(st0016_spriteram[i+5]>>2)&0x3; //plx=(st0016_spriteram[i+5]>>2)&0x3;
//ply=(st0016_spriteram[i+7]>>2)&0x3; //ply=(st0016_spriteram[i+7]>>2)&0x3;
if(offset<ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK) if (offset < ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK)
{ {
for(j=0;j<length;j++) for (j = 0; j < length; j++)
{ {
code=st0016_spriteram[offset]+256*st0016_spriteram[offset+1]; code = st0016_spriteram[offset] + 256 * st0016_spriteram[offset + 1];
sx=st0016_spriteram[offset+4]+((st0016_spriteram[offset+5]&1)<<8); sx = st0016_spriteram[offset + 4] + ((st0016_spriteram[offset + 5] & 1) << 8);
sy=st0016_spriteram[offset+6]+((st0016_spriteram[offset+7]&1)<<8); sy = st0016_spriteram[offset + 6] + ((st0016_spriteram[offset + 7] & 1) << 8);
if(ISMACS && !(ISMACS1)) if (ISMACS && !(ISMACS1))
{ {
if (sy & 0x100) sy-= 0x200; //yuka & yujan if (sy & 0x100) sy -= 0x200; //yuka & yujan
} }
if(ISMACS) if (ISMACS)
{ {
sy=0xe0-sy; sy = 0xe0 - sy;
}
sx += x;
sy += y;
color = st0016_spriteram[offset + 2] & 0x3f;
if (use_sizes)
{
lx = (st0016_spriteram[offset + 5] >> 2) & 3;
ly = (st0016_spriteram[offset + 7] >> 2) & 3;
}
else
{
lx = globalx;
ly = globaly;
} }
sx+=x;
sy+=y;
color=st0016_spriteram[offset+2]&0x3f;
lx=(st0016_spriteram[offset+5]>>2)&3;
ly=(st0016_spriteram[offset+7]>>2)&3;
/* /*
if(plx |ply) //parent if(plx |ply) //parent
{ {
@ -457,69 +477,71 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
} }
*/ */
flipx=st0016_spriteram[offset+3]&0x80; flipx = st0016_spriteram[offset + 3] & 0x80;
flipy=st0016_spriteram[offset+3]&0x40; flipy = st0016_spriteram[offset + 3] & 0x40;
if(ISMACS) if (ISMACS)
sy-=(1<<ly)*8; sy -= (1 << ly) * 8;
{ {
int x0,y0,i0=0; int x0, y0, i0 = 0;
for(x0=(flipx?((1<<lx)-1):0);x0!=(flipx?-1:(1<<lx));x0+=(flipx?-1:1)) for (x0 = (flipx ? ((1 << lx) - 1) : 0); x0 != (flipx ? -1 : (1 << lx)); x0 += (flipx ? -1 : 1))
for(y0=(flipy?((1<<ly)-1):0);y0!=(flipy?-1:(1<<ly));y0+=(flipy?-1:1)) for (y0 = (flipy ? ((1 << ly) - 1) : 0); y0 != (flipy ? -1 : (1 << ly)); y0 += (flipy ? -1 : 1))
{ {
/* custom draw */ /* custom draw */
UINT16 *destline; UINT16 *destline;
int yloop,xloop; int yloop, xloop;
int ypos, xpos; int ypos, xpos;
int tileno; int tileno;
const UINT8 *srcgfx; const UINT8 *srcgfx;
int gfxoffs; int gfxoffs;
ypos = sy+y0*8+spr_dy; ypos = sy + y0 * 8 + spr_dy;
xpos = sx+x0*8+spr_dx; xpos = sx + x0 * 8 + spr_dx;
tileno = (code+i0++)&ST0016_CHAR_BANK_MASK ; tileno = (code + i0++)&ST0016_CHAR_BANK_MASK;
gfxoffs = 0; gfxoffs = 0;
srcgfx= gfx->get_data(tileno); srcgfx = gfx->get_data(tileno);
for (yloop=0; yloop<8; yloop++) for (yloop = 0; yloop < 8; yloop++)
{ {
UINT16 drawypos; UINT16 drawypos;
if (!flipy) {drawypos = ypos+yloop;} else {drawypos = (ypos+8-1)-yloop;} if (!flipy) { drawypos = ypos + yloop; }
else { drawypos = (ypos + 8 - 1) - yloop; }
destline = &bitmap.pix16(drawypos); destline = &bitmap.pix16(drawypos);
for (xloop=0; xloop<8; xloop++) for (xloop = 0; xloop<8; xloop++)
{ {
UINT16 drawxpos; UINT16 drawxpos;
int pixdata; int pixdata;
pixdata = srcgfx[gfxoffs]; pixdata = srcgfx[gfxoffs];
if (!flipx) { drawxpos = xpos+xloop; } else { drawxpos = (xpos+8-1)-xloop; } if (!flipx) { drawxpos = xpos + xloop; }
else { drawxpos = (xpos + 8 - 1) - xloop; }
if (drawxpos > cliprect.max_x) if (drawxpos > cliprect.max_x)
drawxpos -= 512; // wrap around drawxpos -= 512; // wrap around
if (cliprect.contains(drawxpos, drawypos)) if (cliprect.contains(drawxpos, drawypos))
{ {
if(st0016_spriteram[offset+5]&0x40) if (st0016_spriteram[offset + 5] & 0x40)
{ {
destline[drawxpos] =(destline[drawxpos] | pixdata<<4)&0x3ff; destline[drawxpos] = (destline[drawxpos] | pixdata << 4) & 0x3ff;
} }
else else
{ {
if(ISMACS2) if (ISMACS2)
{ {
if(pixdata )//|| destline[drawxpos]==UNUSED_PEN) if (pixdata)//|| destline[drawxpos]==UNUSED_PEN)
{ {
destline[drawxpos] = pixdata + (color*16); destline[drawxpos] = pixdata + (color * 16);
} }
} }
else else
{ {
if(pixdata || destline[drawxpos]==UNUSED_PEN) if (pixdata || destline[drawxpos] == UNUSED_PEN)
{ {
destline[drawxpos] = pixdata + (color*16); destline[drawxpos] = pixdata + (color * 16);
} }
} }
} }
@ -530,8 +552,8 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
} }
} }
} }
offset+=8; offset += 8;
if(offset>=ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK) if (offset >= ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK)
break; break;
} }
} }
@ -582,82 +604,86 @@ void st0016_cpu_device::startup()
} }
void st0016_cpu_device::draw_bgmap(bitmap_ind16 &bitmap,const rectangle &cliprect, int priority) void st0016_cpu_device::draw_bgmap(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority)
{ {
gfx_element *gfx = m_gfxdecode->gfx(st0016_ramgfx); gfx_element *gfx = m_gfxdecode->gfx(st0016_ramgfx);
int j; int j;
//for(j=0x40-8;j>=0;j-=8) //for(j=0x40-8;j>=0;j-=8)
for(j=0;j<0x40;j+=8) for (j = 0; j < 0x40; j += 8)
{ {
if(st0016_vregs[j+1] && ((priority && (st0016_vregs[j+3]==0xff))||((!priority)&&(st0016_vregs[j+3]!=0xff)))) if (st0016_vregs[j + 1] && ((priority && (st0016_vregs[j + 3] == 0xff)) || ((!priority) && (st0016_vregs[j + 3] != 0xff))))
{ {
int x,y,code,color,flipx,flipy; int x, y, code, color, flipx, flipy;
int i=st0016_vregs[j+1]*0x1000; int i = st0016_vregs[j + 1] * 0x1000;
for(x=0;x<32*2;x++)
for(y=0;y<8*4;y++)
{
code=st0016_spriteram[i]+256*st0016_spriteram[i+1];
color=st0016_spriteram[i+2]&0x3f;
flipx=st0016_spriteram[i+3]&0x80; for (x = 0; x < 32 * 2; x++)
flipy=st0016_spriteram[i+3]&0x40;
if(priority)
{ {
gfx->transpen(bitmap,cliprect, for (y = 0; y < 8 * 4; y++)
{
code = st0016_spriteram[i] + 256 * st0016_spriteram[i + 1];
color = st0016_spriteram[i + 2] & 0x3f;
flipx = st0016_spriteram[i + 3] & 0x80;
flipy = st0016_spriteram[i + 3] & 0x40;
if (priority)
{
gfx->transpen(bitmap, cliprect,
code, code,
color, color,
flipx,flipy, flipx, flipy,
x*8+spr_dx,y*8+spr_dy,0); x * 8 + spr_dx, y * 8 + spr_dy, 0);
} }
else else
{ {
UINT16 *destline; UINT16 *destline;
int yloop,xloop; int yloop, xloop;
int ypos, xpos; int ypos, xpos;
const UINT8 *srcgfx; const UINT8 *srcgfx;
int gfxoffs; int gfxoffs;
ypos = y*8+spr_dy;//+((st0016_vregs[j+2]==0xaf)?0x50:0);//hack for mayjinsen title screen ypos = y * 8 + spr_dy;//+((st0016_vregs[j+2]==0xaf)?0x50:0);//hack for mayjinsen title screen
xpos = x*8+spr_dx; xpos = x * 8 + spr_dx;
gfxoffs = 0; gfxoffs = 0;
srcgfx= gfx->get_data(code); srcgfx = gfx->get_data(code);
for (yloop=0; yloop<8; yloop++) for (yloop = 0; yloop < 8; yloop++)
{ {
UINT16 drawypos; UINT16 drawypos;
if (!flipy) {drawypos = ypos+yloop;} else {drawypos = (ypos+8-1)-yloop;} if (!flipy) { drawypos = ypos + yloop; }
else { drawypos = (ypos + 8 - 1) - yloop; }
destline = &bitmap.pix16(drawypos); destline = &bitmap.pix16(drawypos);
for (xloop=0; xloop<8; xloop++) for (xloop = 0; xloop<8; xloop++)
{ {
UINT16 drawxpos; UINT16 drawxpos;
int pixdata; int pixdata;
pixdata = srcgfx[gfxoffs]; pixdata = srcgfx[gfxoffs];
if (!flipx) { drawxpos = xpos+xloop; } else { drawxpos = (xpos+8-1)-xloop; } if (!flipx) { drawxpos = xpos + xloop; }
else { drawxpos = (xpos + 8 - 1) - xloop; }
if (drawxpos > cliprect.max_x) if (drawxpos > cliprect.max_x)
drawxpos -= 512; // wrap around drawxpos -= 512; // wrap around
if (cliprect.contains(drawxpos, drawypos)) if (cliprect.contains(drawxpos, drawypos))
{ {
if(st0016_vregs[j+7]==0x12) if (st0016_vregs[j + 7] == 0x12)
destline[drawxpos] = (destline[drawxpos] | (pixdata<<4))&0x3ff; destline[drawxpos] = (destline[drawxpos] | (pixdata << 4)) & 0x3ff;
else else
{ {
if(ISMACS2) if (ISMACS2)
{ {
if(pixdata)// || destline[drawxpos]==UNUSED_PEN) if (pixdata)// || destline[drawxpos]==UNUSED_PEN)
{ {
destline[drawxpos] = pixdata + (color*16); destline[drawxpos] = pixdata + (color * 16);
} }
} }
else else
{ {
if(pixdata || destline[drawxpos]==UNUSED_PEN) if (pixdata || destline[drawxpos] == UNUSED_PEN)
{ {
destline[drawxpos] = pixdata + (color*16); destline[drawxpos] = pixdata + (color * 16);
} }
} }
@ -669,7 +695,8 @@ void st0016_cpu_device::draw_bgmap(bitmap_ind16 &bitmap,const rectangle &cliprec
} }
} }
} }
i+=4; i += 4;
}
} }
} }
} }