ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #827 from lodefmode/master 

OSD tidy + better demos
This commit is contained in:
Thomas Jentzsch 2021-09-19 10:54:11 +02:00 committed by GitHub
parent 18874dac5f e3cb93d083
commit f6428e684b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 168 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

322
src/emucore/CartMVC.cxx
View File

@ -538,205 +538,205 @@ static constexpr uInt8 volumeLabelOdd[] = {
// Level bars // Level bars
// 8 rows * 5 columns = 40 // 8 rows * 5 columns = 40
static constexpr uInt8 levelBarsEvenData[] = { static constexpr uInt8 levelBarsEvenData[] = {
/**/ /*0*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x41, 0x41, 0x41, 0x41, 0x41,
2, 40, 161, 133, 20, 0x41, 0x41, 0x41, 0x41, 0x41,
20, 80, 66, 10, 32, 0x41, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x41, 0x41, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*1*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x41, 0x41, 0x41, 0x41, 0x41,
3, 40, 161, 133, 20, 0x7f, 0x41, 0x41, 0x41, 0x41,
244, 80, 66, 10, 32, 0x41, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x41, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*2*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 232, 161, 133, 20, 0x7f, 0x41, 0x41, 0x41, 0x41,
247, 80, 66, 10, 32, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x41, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*3*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 239, 161, 133, 20, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 208, 66, 10, 32, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*4*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 161, 133, 20, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 223, 66, 10, 32, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*5*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 191, 133, 20, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 66, 10, 32, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*6*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 133, 20, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 126, 10, 32, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*7*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 253, 20, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 10, 32, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*8*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 20, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 250, 32, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*9*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 244, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 32, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*10*/
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}; };
static constexpr uInt8 levelBarsOddData[] = { static constexpr uInt8 levelBarsOddData[] = {
/**/ /*0*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x41, 0x41, 0x41, 0x41, 0x41,
20, 80, 66, 10, 32, 0x41, 0x41, 0x41, 0x41, 0x41,
2, 40, 161, 133, 20, 0x41, 0x41, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x41, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*1*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x41, 0x41, 0x41, 0x41,
244, 80, 66, 10, 32, 0x41, 0x41, 0x41, 0x41, 0x41,
3, 40, 161, 133, 20, 0x7f, 0x41, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x41, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*2*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x41, 0x41, 0x41, 0x41,
247, 80, 66, 10, 32, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 232, 161, 133, 20, 0x7f, 0x41, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*3*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 208, 66, 10, 32, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 239, 161, 133, 20, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x41, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*4*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 223, 66, 10, 32, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 161, 133, 20, 0x7f, 0x7f, 0x41, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*5*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 66, 10, 32, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 191, 133, 20, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x41, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*6*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 126, 10, 32, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 133, 20, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*7*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 10, 32, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 253, 20, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x41, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*8*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 250, 32, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 20, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*9*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 32, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 244, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x41,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/**/ /*10*/
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
247, 223, 126, 251, 224, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
3, 239, 191, 253, 247, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}; };
@ -1355,6 +1355,20 @@ void MovieCart::runStateMachine()
case 2: case 2:
if(!myA7) if(!myA7)
{ {
if(myOdd)
{
if(myDrawTimeCode)
{
if (myLines == (TIMECODE_HEIGHT - 0))
myStream.blankPartialLines(true);
}
if(myDrawLevelBars)
{
if(myLines == 22)
myStream.blankPartialLines(true);
}
}
if(myLines >= 1) if(myLines >= 1)
{ {
fill_addr_left_line(1); fill_addr_left_line(1);

BIN
test/roms/bankswitching/MVC/20centuryfox.bin
View File

Binary file not shown.

BIN
test/roms/bankswitching/MVC/cronkite.bin
View File

Binary file not shown.

BIN
test/roms/bankswitching/MVC/dancer.bin
View File

Binary file not shown.

BIN
test/roms/bankswitching/MVC/lion.bin
View File

Binary file not shown.

BIN
test/roms/bankswitching/MVC/street.bin
View File

Binary file not shown.