Skip to content

sega/model2: tilemap fixes #14476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2025
+37 −33
Merged

sega/model2: tilemap fixes #14476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9904ea5
sega/model2: tilemap fixes
gm-matthew Nov 4, 2025
385e5fc
sega/model2: better tilemap fix
gm-matthew Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/mame/sega/model2_v.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2599,8 +2599,12 @@ u32 model2_state::screen_update_model2(screen_device &screen, bitmap_rgb32 &bitm
bitmap.fill(m_palette->pen(0), cliprect);
m_sys24_bitmap.fill(0, cliprect);

for(int layer = 3; layer >= 0; layer--)
m_tiles->draw(screen, m_sys24_bitmap, cliprect, layer<<1, 0, 0);
// draw tilemap B as opaque
for (int layer = 3; layer >= 2; layer--)
m_tiles->draw(screen, m_sys24_bitmap, cliprect, layer << 1, 0, TILEMAP_DRAW_OPAQUE);

for (int layer = 1; layer >= 0; layer--)
m_tiles->draw(screen, m_sys24_bitmap, cliprect, layer << 1, 0, 0);

copybitmap_trans(bitmap, m_sys24_bitmap, 0, 0, 0, 0, cliprect, 0);

Expand Down
58 changes: 29 additions & 29 deletions src/mame/sega/segaic24.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void segas24_tile_device::device_start()
}

void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_ind16 &dm, const uint16_t *mask,
uint16_t tpri, uint8_t lpri, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2)
uint16_t tpri, uint8_t lpri, int flags, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2)
{
const uint16_t *source = &bm.pix(sy, sx);
const uint8_t *trans = &tm.pix(sy, sx);
Expand Down Expand Up @@ -141,7 +141,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
if(!m) {
// 1- 128 pixels from this layer
for(int x=0; x<128; x++) {
if(*srct++ == tpri) {
if(*srct++ == tpri || flags & TILEMAP_DRAW_OPAQUE) {
*dst = *src;
*pr |= lpri;
}
Expand All @@ -163,7 +163,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
if(!(m & 0x8000)) {
int xx;
for(xx=0; xx<8; xx++)
if(srct[xx] == tpri) {
if(srct[xx] == tpri || flags & TILEMAP_DRAW_OPAQUE) {
dst[xx] = src[xx];
pr[xx] |= lpri;
}
Expand All @@ -182,7 +182,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
if(!m) {
// 1- 128 pixels from this layer
for(int x = cur_x; x<llx1; x++) {
if(*srct++ == tpri) {
if(*srct++ == tpri || flags & TILEMAP_DRAW_OPAQUE) {
*dst = *src;
*pr |= lpri;
}
Expand All @@ -201,7 +201,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
} else {
// 3- 128 pixels from both layers
for(int x=cur_x; x<llx1; x++) {
if(*srct++ == tpri && !(m & (0x8000 >> (x >> 3)))) {
if((*srct++ == tpri || flags & TILEMAP_DRAW_OPAQUE) && !(m & (0x8000 >> (x >> 3)))) {
*dst = *src;
*pr |= lpri;
}
Expand Down Expand Up @@ -229,7 +229,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
// priority_bitmap

void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_rgb32 &dm, const uint16_t *mask,
uint16_t tpri, uint8_t lpri, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2)
uint16_t tpri, uint8_t lpri, int flags, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2)
{
const uint16_t *source = &bm.pix(sy, sx);
const uint8_t *trans = &tm.pix(sy, sx);
Expand Down Expand Up @@ -267,7 +267,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
if(!m) {
// 1- 128 pixels from this layer
for(int x=0; x<128; x++) {
if(*srct++ == tpri)
if(*srct++ == tpri || flags & TILEMAP_DRAW_OPAQUE)
*dst = pens[*src];
src++;
dst++;
Expand All @@ -284,7 +284,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
for(int x=0; x<128; x+=8) {
if(!(m & 0x8000)) {
for(int xx=0; xx<8; xx++)
if(srct[xx] == tpri)
if(srct[xx] == tpri || flags & TILEMAP_DRAW_OPAQUE)
dst[xx] = pens[src[xx]];
}
src += 8;
Expand All @@ -300,7 +300,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
if(!m) {
// 1- 128 pixels from this layer
for(int x = cur_x; x<llx1; x++) {
if(*srct++ == tpri)
if(*srct++ == tpri || flags & TILEMAP_DRAW_OPAQUE)
*dst = pens[*src];
src++;
dst++;
Expand All @@ -316,7 +316,7 @@ void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bit
// 3- 128 pixels from both layers
int x;
for(x=cur_x; x<llx1; x++) {
if(*srct++ == tpri && !(m & (0x8000 >> (x >> 3))))
if((*srct++ == tpri || flags & TILEMAP_DRAW_OPAQUE) && !(m & (0x8000 >> (x >> 3))))
*dst = pens[*src];

src++;
Expand Down Expand Up @@ -380,7 +380,7 @@ void segas24_tile_device::draw_common(screen_device &screen, BitmapClass &bitmap

h = hscr & 0x1ff;
tile_layer[l1]->set_scrollx(0, -h);
tile_layer[l1]->draw(screen, bitmap, c, tpri, lpri);
tile_layer[l1]->draw(screen, bitmap, c, tpri | flags, lpri);
}
break;
}
Expand All @@ -407,8 +407,8 @@ void segas24_tile_device::draw_common(screen_device &screen, BitmapClass &bitmap

c1.min_y = c1.max_y = c2.min_y = c2.max_y = y;

tile_layer[l1]->draw(screen, bitmap, c1, tpri, lpri);
tile_layer[l1^1]->draw(screen, bitmap, c2, tpri, lpri);
tile_layer[l1]->draw(screen, bitmap, c1, tpri | flags, lpri);
tile_layer[l1^1]->draw(screen, bitmap, c2, tpri | flags, lpri);
}
break;
}
Expand All @@ -431,8 +431,8 @@ void segas24_tile_device::draw_common(screen_device &screen, BitmapClass &bitmap
if(!((-vscr) & 0x200))
layer ^= 1;

tile_layer[layer]->draw(screen, bitmap, c1, tpri, lpri);
tile_layer[layer^1]->draw(screen, bitmap, c2, tpri, lpri);
tile_layer[layer]->draw(screen, bitmap, c1, tpri | flags, lpri);
tile_layer[layer^1]->draw(screen, bitmap, c2, tpri | flags, lpri);
break;
}
case 2: case 3: {
Expand All @@ -447,8 +447,8 @@ void segas24_tile_device::draw_common(screen_device &screen, BitmapClass &bitmap
if(!((+hscr) & 0x200))
layer ^= 1;

tile_layer[layer]->draw(screen, bitmap, c1, tpri, lpri);
tile_layer[layer^1]->draw(screen, bitmap, c2, tpri, lpri);
tile_layer[layer]->draw(screen, bitmap, c1, tpri | flags, lpri);
tile_layer[layer^1]->draw(screen, bitmap, c2, tpri | flags, lpri);
break;
}
}
Expand All @@ -469,11 +469,11 @@ void segas24_tile_device::draw_common(screen_device &screen, BitmapClass &bitmap
hscr = (-hscrtb[y]) & 0x1ff;
if(hscr + 496 <= 512) {
// Horizontal split unnecessary
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, vscr, 0, y, 496, y+1);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, vscr, 0, y, 496, y+1);
} else {
// Horizontal split necessary
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, vscr, 0, y, 512-hscr, y+1);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, 0, vscr, 512-hscr, y, 496, y+1);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, vscr, 0, y, 512-hscr, y+1);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, 0, vscr, 512-hscr, y, 496, y+1);
}
vscr = (vscr + 1) & 0x1ff;
}
Expand All @@ -485,25 +485,25 @@ void segas24_tile_device::draw_common(screen_device &screen, BitmapClass &bitmap
// Horizontal split unnecessary
if(vscr + 384 <= 512) {
// Vertical split unnecessary
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, vscr, 0, 0, 496, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, vscr, 0, 0, 496, 384);
} else {
// Vertical split necessary
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, vscr, 0, 0, 496, 512-vscr);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, 0, 0, 512-vscr, 496, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, vscr, 0, 0, 496, 512-vscr);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, 0, 0, 512-vscr, 496, 384);

}
} else {
// Horizontal split necessary
if(vscr + 384 <= 512) {
// Vertical split unnecessary
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, vscr, 0, 0, 512-hscr, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, 0, vscr, 512-hscr, 0, 496, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, vscr, 0, 0, 512-hscr, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, 0, vscr, 512-hscr, 0, 496, 384);
} else {
// Vertical split necessary
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, vscr, 0, 0, 512-hscr, 512-vscr);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, 0, vscr, 512-hscr, 0, 496, 512-vscr);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, hscr, 0, 0, 512-vscr, 512-hscr, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, win, 0, 0, 512-hscr, 512-vscr, 496, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, vscr, 0, 0, 512-hscr, 512-vscr);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, 0, vscr, 512-hscr, 0, 496, 512-vscr);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, hscr, 0, 0, 512-vscr, 512-hscr, 384);
draw_rect(screen, bm, tm, bitmap, mask, tpri, lpri, flags, win, 0, 0, 512-hscr, 512-vscr, 496, 384);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/mame/sega/segaic24.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ class segas24_tile_device : public device_t, public device_gfx_interface
TILE_GET_INFO_MEMBER(tile_info_1w);

void draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_ind16 &dm, const uint16_t *mask,
uint16_t tpri, uint8_t lpri, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2);
uint16_t tpri, uint8_t lpri, int flags, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2);
void draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_rgb32 &dm, const uint16_t *mask,
uint16_t tpri, uint8_t lpri, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2);
uint16_t tpri, uint8_t lpri, int flags, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2);

template<class BitmapClass>
void draw_common(screen_device &screen, BitmapClass &bitmap, const rectangle &cliprect, int layer, int pri, int flags);
Expand Down
Loading