[2777429] (missing 3d art) fixed: recent regression causing 16bpp textures to be transparent on softrasterizer

This commit is contained in:
zeromus 2009-04-23 06:22:01 +00:00
parent d3de70b80d
commit 39d123cbfc
2 changed files with 12 additions and 12 deletions

View File

@ -348,17 +348,17 @@ struct Shader
dst.b = modulate_table[texColor.b][materialColor.b];
dst.a = modulate_table[texColor.a][materialColor.a];
//dst.color.components.a = 31;
//#ifdef _MSC_VER
//if(GetAsyncKeyState(VK_SHIFT)) {
// //debugging tricks
// dst.color = materialColor;
// if(GetAsyncKeyState(VK_TAB)) {
// u8 alpha = dst.color.components.a;
// dst.color.color = polynum*8+8;
// dst.color.components.a = alpha;
// }
//}
//#endif
#ifdef _MSC_VER
if(GetAsyncKeyState(VK_SHIFT)) {
//debugging tricks
dst = materialColor;
if(GetAsyncKeyState(VK_TAB)) {
u8 alpha = dst.a;
dst.color = polynum*8+8;
dst.a = alpha;
}
}
#endif
break;
case 1: //decal
u = invu*w;

View File

@ -556,7 +556,7 @@ REJECT:
for(u32 x = 0; x < ms.items[j].len; ++x)
{
u16 c = map[x];
int alpha = ((c&0x8000)?255:0);
int alpha = ((c&0x8000)?opaqueColor:0);
*dwdst++ = CONVERT(c&0x7FFF,alpha);
}
}