virtual boyee: actually fix the color config stuff

This commit is contained in:
nattthebear 2017-05-29 20:34:07 -04:00
parent 3ec7b0252f
commit aab6391b12
4 changed files with 8 additions and 11 deletions

View File

@ -105,10 +105,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.VB
private static int ConvertColor(Color c)
{
var v = c.ToArgb();
return v & 0xff00
| v << 16 & 0xff0000
| v >> 16 & 0xff;
return c.ToArgb();
}
public static NativeSettings FromFrontendSettings(VirtualBoyee.Settings s, VirtualBoyee.SyncSettings ss)

Binary file not shown.

View File

@ -57,12 +57,12 @@ enum
static const uint32 AnaglyphPreset_Colors[][2] =
{
{0, 0},
{0x0000FF, 0xFF0000},
{0x0000FF, 0xEBB700},
{0x0000FF, 0xFFFF00},
{0x0000FF, 0x00FF00},
{0xFF0000, 0x0000FF},
{0xFF0000, 0x00B7EB},
{0xFF0000, 0x00FFFF},
{0xFF0000, 0x00FF00},
{0x00FF00, 0xFF00FF},
{0x00FFFF, 0xFF0000},
{0xFFFF00, 0x0000FF},
};
int32 VB_InDebugPeek;

View File

@ -105,7 +105,7 @@ static void MakeColorLUT()
const float g_prime = pow(g, 1.0 / 2.2);
const float b_prime = pow(b, 1.0 / 2.2);
ColorLUT[lr][i] = (int)(r_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(b_prime * 255) << 16 & 0xff0000 | 0xff000000;
ColorLUT[lr][i] = (int)(b_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(r_prime * 255) << 16 & 0xff0000 | 0xff000000;
}
}
@ -132,7 +132,7 @@ static void MakeColorLUT()
g_prime = pow(g, 1.0 / 2.2);
b_prime = pow(b, 1.0 / 2.2);
AnaSlowColorLUT[l_b][r_b] = (int)(r_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(b_prime * 255) << 16 & 0xff0000 | 0xff000000;
AnaSlowColorLUT[l_b][r_b] = (int)(b_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(r_prime * 255) << 16 & 0xff0000 | 0xff000000;
}
}
}