Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-22 13:48:55 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Couple of minor bugfixes, and incorporated some old notes I had lying around.

Browse Source 
Doesn't fix anything substantial.
This commit is contained in:
Aaron Giles 2011-03-14 15:11:40 +00:00
parent e8ce38e19e
commit 38c271080c
2 changed files with 66 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mame/video/m3raster.c
View File

@ -140,17 +140,20 @@ static void draw_scanline_alpha(void *dest, INT32 scanline, const poly_extent *e
UINT32 pix11 = texture->data[(v2 << width) + u2]; UINT32 pix11 = texture->data[(v2 << width) + u2];
UINT32 texel = rgba_bilinear_filter(pix00, pix01, pix10, pix11, u, v); UINT32 texel = rgba_bilinear_filter(pix00, pix01, pix10, pix11, u, v);
UINT32 fa = texel >> 24; UINT32 fa = texel >> 24;
UINT32 combined = ((fa + 1) * polyi) >> 8; if (fa != 0)
UINT32 fr = ((texel & 0x00ff0000) * combined) >> (8+9); {
UINT32 fg = ((texel & 0x0000ff00) * combined) >> (8+6); UINT32 combined = ((fa + 1) * polyi) >> 8;
UINT32 fb = ((texel & 0x000000ff) * combined) >> (8+3); UINT32 fr = ((texel & 0x00ff0000) * combined) >> (8+9);
UINT16 orig = p[x]; UINT32 fg = ((texel & 0x0000ff00) * combined) >> (8+6);
combined = ((255 - fa) * desttrans) >> 8; UINT32 fb = ((texel & 0x000000ff) * combined) >> (8+3);
fr += ((orig & 0x7c00) * combined) >> 5; UINT16 orig = p[x];
fg += ((orig & 0x03e0) * combined) >> 5; combined = ((255 - fa) * desttrans) >> 5;
fb += ((orig & 0x001f) * combined) >> 5; fr += ((orig & 0x7c00) * combined) >> 8;
p[x] = (fr & 0x7c00) | (fg & 0x3e0) | (fb & 0x1f); fg += ((orig & 0x03e0) * combined) >> 8;
d[x] = iz; fb += ((orig & 0x001f) * combined) >> 8;
p[x] = (fr & 0x7c00) | (fg & 0x3e0) | (fb & 0x1f);
d[x] = iz;
}
} }
ooz += doozdx; ooz += doozdx;

56
src/mame/video/model3.c
View File

@ -567,8 +567,7 @@ static cached_texture *get_texture(running_machine *machine, int page, int texx,
for (x = 0; x < pixwidth; x++) for (x = 0; x < pixwidth; x++)
{ {
UINT16 pixdata = texsrc[x]; UINT16 pixdata = texsrc[x];
dest[x] = MAKE_ARGB(pal1bit(pixdata >> 15), pal5bit(pixdata >> 10), pal5bit(pixdata >> 5), pal5bit(pixdata >> 0)); alpha &= dest[x] = MAKE_ARGB(pal1bit(~pixdata >> 15), pal5bit(pixdata >> 10), pal5bit(pixdata >> 5), pal5bit(pixdata >> 0));
alpha = ~0;
} }
break; break;
@ -1110,7 +1109,7 @@ static void draw_model(running_machine *machine, UINT32 addr)
UINT32 *model = (addr >= 0x100000) ? &state->vrom[addr] : &state->polygon_ram[addr]; UINT32 *model = (addr >= 0x100000) ? &state->vrom[addr] : &state->polygon_ram[addr];
UINT32 header[7]; UINT32 header[7];
int index = 0; int index = 0;
int last_polygon = FALSE, back_face = FALSE; int last_polygon = FALSE, first_polygon = TRUE, back_face = FALSE;
int num_vertices; int num_vertices;
int i, v, vi; int i, v, vi;
float fixed_point_fraction; float fixed_point_fraction;
@ -1146,10 +1145,54 @@ static void draw_model(running_machine *machine, UINT32 addr)
float dot; float dot;
int intensity; int intensity;
int polygon_transparency; int polygon_transparency;
//
// Header bits:
//
// 0:00FFFC00 - polygon ID
// 0:00000300 - ????
// 0:00000040 - if set, indicates a quad, else it's a triangle
// 0:00000008 - inherit vertex 3 from previous polygon
// 0:00000004 - inherit vertex 2 from previous polygon
// 0:00000002 - inherit vertex 1 from previous polygon
// 0:00000001 - inherit vertex 0 from previous polygon
//
// 1:FFFFFF00 - polygon normal X coordinate, 2.22
// 1:00000040 - if set, U/V is as-is, else divide U/V by 8
// 1:00000004 - if set, indicates last polygon in model
//
// 2:FFFFFF00 - polygon normal Y coordinate, 2.22
// 2:00000002 - if set, mirror texture in U
// 2:00000001 - if set, mirror texture in V
//
// 3:FFFFFF00 - polygon normal Z coordinate, 2.22
// 3:00000038 - texture width, in tiles
// 3:00000007 - texture height, in tiles
//
// 4:FFFFFF00 - RGB lighting color
// 4:00000040 - texture page
// 4:0000001F - upper 5 bits of texture X coordinate
//
// 5:00000080 - low bit of texture X coordinate
// 5:0000001F - low 5 bits of texture Y coordinate
//
// 6:80000000 - if set, enable alpha test
// 6:04000000 - if set, textures enabled
// 6:00800000 - if set, force transparency off
// 6:007C0000 - 5-bit transparency value (0 is transparent, 0x1F is nearly opaque)
// 6:00010000 - if set, disable lighting
// 6:0000F800 - 5-bit additional color control
// 6:00000380 - 3-bit texture format
// 6:00000001 - alpha enable?
//
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
header[i] = model[index++]; header[i] = model[index++];
if (first_polygon && (header[0] & 0x0f) != 0)
return;
first_polygon = FALSE;
if (header[6] == 0) if (header[6] == 0)
return; return;
@ -1175,6 +1218,11 @@ static void draw_model(running_machine *machine, UINT32 addr)
/* load new vertices */ /* load new vertices */
for ( ; vi < num_vertices; vi++) for ( ; vi < num_vertices; vi++)
{ {
if ((model[index+0] & 0xf0000000) == 0x70000000 ||
(model[index+1] & 0xf0000000) == 0x70000000 ||
(model[index+2] & 0xf0000000) == 0x70000000)
return;
vertex[vi].x = (float)((INT32)model[index++]) * fixed_point_fraction; vertex[vi].x = (float)((INT32)model[index++]) * fixed_point_fraction;
vertex[vi].y = (float)((INT32)model[index++]) * fixed_point_fraction; vertex[vi].y = (float)((INT32)model[index++]) * fixed_point_fraction;
vertex[vi].pz = (float)((INT32)model[index++]) * fixed_point_fraction; vertex[vi].pz = (float)((INT32)model[index++]) * fixed_point_fraction;
@ -1294,7 +1342,7 @@ static void draw_model(running_machine *machine, UINT32 addr)
render_one(machine, &tri); render_one(machine, &tri);
} }
} }
}; }
} }