Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 17:37:56 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fmtowns: fix horizontal wrap for bitmap layers (#2964)

Browse Source 
* fmtowns: fix horizontal wrap for bitmap layers

* fmtowns: use lambda expressions to check for wrapping

* return int instead of bool
This commit is contained in:
r09 2017-12-24 14:35:06 +01:00 committed by R. Belmont
parent 4c6495a254
commit 79c2e940c5
1 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/mame/video/fmtowns.cpp
View File

@ -903,9 +903,9 @@ void towns_state::render_sprite_16(uint32_t poffset, uint16_t x, uint16_t y, boo
{ {
ystart = y; ystart = y;
if (yhalfsize) if (yhalfsize)
yend = y+16;
else
yend = y+8; yend = y+8;
else
yend = y+16;
ydir = 1; ydir = 1;
} }
xstart &= 0x1ff; xstart &= 0x1ff;
@ -1033,12 +1033,19 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
int hzoom = 1; int hzoom = 1;
int linesize; int linesize;
uint32_t scroll; uint32_t scroll;
bool sprites_enabled = (m_video.towns_sprite_reg[1] & 0x80) >> 7;
if(layer == 0) if(layer == 0)
linesize = m_video.towns_crtc_reg[20] * 4; linesize = m_video.towns_crtc_reg[20] * 4;
else else
linesize = m_video.towns_crtc_reg[24] * 4; linesize = m_video.towns_crtc_reg[24] * 4;
// TODO: figure out how to wrap when there are sprites on layer 1
auto wrap = [layer,sprites_enabled,linesize](int line, uint32_t off)->int
{
return ((layer == 0 || !sprites_enabled) && off >= (line * linesize) && off - (line * linesize) >= linesize);
};
if(m_video.towns_display_page_sel != 0) if(m_video.towns_display_page_sel != 0)
off = 0x20000; off = 0x20000;
@ -1084,6 +1091,10 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
// TODO: figure out how to wrap when there are sprites on layer 1
if ((layer == 0 || !(m_video.towns_sprite_reg[1] & 0x80)) && off >= (line * linesize) && off - (line * linesize) >= linesize)
colour = (m_towns_gfxvram[off+(layer*0x40000)-linesize+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)-linesize];
else
colour = (m_towns_gfxvram[off+(layer*0x40000)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)]; colour = (m_towns_gfxvram[off+(layer*0x40000)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)];
if(colour < 0x8000) if(colour < 0x8000)
{ {
@ -1104,7 +1115,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = (m_towns_gfxvram[off+(layer*0x40000)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)]; colour = (m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour < 0x8000) if(colour < 0x8000)
{ {
bitmap.pix32(scanline, x) = bitmap.pix32(scanline, x) =
@ -1128,7 +1139,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = (m_towns_gfxvram[off+(layer*0x40000)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)]; colour = (m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour < 0x8000) if(colour < 0x8000)
{ {
bitmap.pix32(scanline, x) = bitmap.pix32(scanline, x) =
@ -1156,7 +1167,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = (m_towns_gfxvram[off+(layer*0x40000)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)]; colour = (m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour < 0x8000) if(colour < 0x8000)
{ {
bitmap.pix32(scanline, x) = bitmap.pix32(scanline, x) =
@ -1188,7 +1199,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = (m_towns_gfxvram[off+(layer*0x40000)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)]; colour = (m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)+1] << 8) | m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour < 0x8000) if(colour < 0x8000)
{ {
bitmap.pix32(scanline, x) = bitmap.pix32(scanline, x) =
@ -1225,6 +1236,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
int hzoom = 1; int hzoom = 1;
int linesize; int linesize;
uint32_t scroll; uint32_t scroll;
bool sprites_enabled = (m_video.towns_sprite_reg[1] & 0x80) >> 7;
if(m_video.towns_display_page_sel != 0) if(m_video.towns_display_page_sel != 0)
off = 0x20000; off = 0x20000;
@ -1237,6 +1249,12 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
else else
linesize = m_video.towns_crtc_reg[24] * 8; linesize = m_video.towns_crtc_reg[24] * 8;
// TODO: figure out how to wrap when there are sprites on layer 1
auto wrap = [layer,sprites_enabled,linesize](int line, uint32_t off)->int
{
return ((layer == 0 || !sprites_enabled) && off >= (line * linesize) && off - (line * linesize) >= linesize);
};
if(layer != 0) if(layer != 0)
{ {
if(!(m_video.towns_video_reg[0] & 0x10)) if(!(m_video.towns_video_reg[0] & 0x10))
@ -1274,7 +1292,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)]; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = m_palette->pen(colour); bitmap.pix32(scanline, x) = m_palette->pen(colour);
@ -1291,7 +1309,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)+1]; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = m_palette->pen(colour); bitmap.pix32(scanline, x) = m_palette->pen(colour);
@ -1309,7 +1327,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)+1]; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = m_palette->pen(colour); bitmap.pix32(scanline, x) = m_palette->pen(colour);
@ -1328,7 +1346,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)+1]; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = m_palette->pen(colour); bitmap.pix32(scanline, x) = m_palette->pen(colour);
@ -1348,7 +1366,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)+1]; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)];
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = m_palette->pen(colour); bitmap.pix32(scanline, x) = m_palette->pen(colour);
@ -1370,6 +1388,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
int hzoom = 1; int hzoom = 1;
int linesize; int linesize;
uint32_t scroll; uint32_t scroll;
bool sprites_enabled = (m_video.towns_sprite_reg[1] & 0x80) >> 7;
palette_device* pal = (layer == 0) ? m_palette16_0 : m_palette16_1; palette_device* pal = (layer == 0) ? m_palette16_0 : m_palette16_1;
if(m_video.towns_display_page_sel != 0) if(m_video.towns_display_page_sel != 0)
@ -1383,6 +1402,12 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
else else
linesize = m_video.towns_crtc_reg[24] * 4; linesize = m_video.towns_crtc_reg[24] * 4;
// TODO: figure out how to wrap when there are sprites on layer 1
auto wrap = [layer,sprites_enabled,linesize](int line, uint32_t off)->int
{
return ((layer == 0 || !sprites_enabled) && off >= (line * linesize) && off - (line * linesize) >= linesize);
};
if(layer != 0) if(layer != 0)
{ {
if(!(m_video.towns_video_reg[0] & 0x10)) if(!(m_video.towns_video_reg[0] & 0x10))
@ -1420,12 +1445,12 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)] >> 4; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] >> 4;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x+1) = pal->pen(colour); bitmap.pix32(scanline, x+1) = pal->pen(colour);
} }
colour = m_towns_gfxvram[off+(layer*0x40000)] & 0x0f; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] & 0x0f;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = pal->pen(colour); bitmap.pix32(scanline, x) = pal->pen(colour);
@ -1442,13 +1467,13 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)] >> 4; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] >> 4;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x+2) = pal->pen(colour); bitmap.pix32(scanline, x+2) = pal->pen(colour);
bitmap.pix32(scanline, x+3) = pal->pen(colour); bitmap.pix32(scanline, x+3) = pal->pen(colour);
} }
colour = m_towns_gfxvram[off+(layer*0x40000)] & 0x0f; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] & 0x0f;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = pal->pen(colour); bitmap.pix32(scanline, x) = pal->pen(colour);
@ -1466,14 +1491,14 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)] >> 4; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] >> 4;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x+3) = pal->pen(colour); bitmap.pix32(scanline, x+3) = pal->pen(colour);
bitmap.pix32(scanline, x+4) = pal->pen(colour); bitmap.pix32(scanline, x+4) = pal->pen(colour);
bitmap.pix32(scanline, x+5) = pal->pen(colour); bitmap.pix32(scanline, x+5) = pal->pen(colour);
} }
colour = m_towns_gfxvram[off+(layer*0x40000)] & 0x0f; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] & 0x0f;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = pal->pen(colour); bitmap.pix32(scanline, x) = pal->pen(colour);
@ -1492,7 +1517,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)] >> 4; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] >> 4;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x+4) = pal->pen(colour); bitmap.pix32(scanline, x+4) = pal->pen(colour);
@ -1500,7 +1525,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
bitmap.pix32(scanline, x+6) = pal->pen(colour); bitmap.pix32(scanline, x+6) = pal->pen(colour);
bitmap.pix32(scanline, x+7) = pal->pen(colour); bitmap.pix32(scanline, x+7) = pal->pen(colour);
} }
colour = m_towns_gfxvram[off+(layer*0x40000)] & 0x0f; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] & 0x0f;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = pal->pen(colour); bitmap.pix32(scanline, x) = pal->pen(colour);
@ -1520,7 +1545,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
off &= 0x3ffff; // 2 layers off &= 0x3ffff; // 2 layers
else else
off &= 0x7ffff; // 1 layer off &= 0x7ffff; // 1 layer
colour = m_towns_gfxvram[off+(layer*0x40000)] >> 4; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] >> 4;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x+5) = pal->pen(colour); bitmap.pix32(scanline, x+5) = pal->pen(colour);
@ -1529,7 +1554,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
bitmap.pix32(scanline, x+8) = pal->pen(colour); bitmap.pix32(scanline, x+8) = pal->pen(colour);
bitmap.pix32(scanline, x+9) = pal->pen(colour); bitmap.pix32(scanline, x+9) = pal->pen(colour);
} }
colour = m_towns_gfxvram[off+(layer*0x40000)] & 0x0f; colour = m_towns_gfxvram[off+(layer*0x40000)-(wrap(line,off)*linesize)] & 0x0f;
if(colour != 0) if(colour != 0)
{ {
bitmap.pix32(scanline, x) = pal->pen(colour); bitmap.pix32(scanline, x) = pal->pen(colour);