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

* Lua: removed "shadow pixels" from gui.text() 

* Lua: fixed width of question mark symbol
* Lua: made gui.parsecolor() function available for users
This commit is contained in:
ansstuff 2013-01-15 12:53:04 +00:00
parent 30378d8b49
commit f22dc51e71
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changelog.txt
View File

@ -1,3 +1,12 @@
15-Jan-2013 - AnS - Lua: removed "shadow pixels" from gui.text(), made gui.parsecolor() function available for users
10-Jan-2013 - AnS - Taseditor: Config->Project file saving options
01-Jan-2013 - zeromus - NameTableViewer: do something reasonable if a 4-screen, table2, table3 mirror mode is chosen when the corresponding nametable ram is not available on the cart (instead of crashing)
31-Dec-2012 - CaH4e3 - fixed mappers 24, 26, 115
29-Dec-2012 - AnS - Taseditor: Changed "Compact save" dialog, added 4 options of Greenzone saving
29-Dec-2012 - AnS - Cheats: added "Add from CHT file..." button
29-Dec-2012 - AnS - win32: force the entire client area to be invalidated at the beginning of WM_PAINT; this fixes the rare bug with DIRECTDRAWCLIPPER sometimes calculating wrong region (was noticed on some video cards)
27-Dec-2012 - AnS - Play movie dialog shows New PPU in red if the required setting does not match
27-Dec-2012 - thezlomus - RAM Search: added "Search ROM" checkbox
19-Dec-2012 - AnS - win32: remodel "Video config" dialog 19-Dec-2012 - AnS - win32: remodel "Video config" dialog
19-Dec-2012 - AnS - win32: fixed restoring maximized window after switching from fullscreen 19-Dec-2012 - AnS - win32: fixed restoring maximized window after switching from fullscreen
18-Dec-2012 - CaH4e3 - fixed mapper 018 and 198 18-Dec-2012 - CaH4e3 - fixed mapper 018 and 198

12
src/drawing.cpp
View File

@ -7,7 +7,7 @@
static uint8 Font6x7[792] = static uint8 Font6x7[792] =
{ {
6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, // 0x20 - Spacebar
3, 64, 64, 64, 64, 64, 0, 64, 3, 64, 64, 64, 64, 64, 0, 64,
5, 80, 80, 80, 0, 0, 0, 0, 5, 80, 80, 80, 0, 0, 0, 0,
6, 80, 80,248, 80,248, 80, 80, 6, 80, 80,248, 80,248, 80, 80,
@ -23,7 +23,7 @@ static uint8 Font6x7[792] =
5, 0, 0, 0,240, 0, 0, 0, 5, 0, 0, 0,240, 0, 0, 0,
3, 0, 0, 0, 0, 0, 0, 64, 3, 0, 0, 0, 0, 0, 0, 64,
5, 16, 16, 32, 32, 32, 64, 64, 5, 16, 16, 32, 32, 32, 64, 64,
6,112,136,136,136,136,136,112, //0 6,112,136,136,136,136,136,112, // 0x30 - 0
6, 32, 96, 32, 32, 32, 32, 32, 6, 32, 96, 32, 32, 32, 32, 32,
6,112,136, 8, 48, 64,128,248, 6,112,136, 8, 48, 64,128,248,
6,112,136, 8, 48, 8,136,112, 6,112,136, 8, 48, 8,136,112,
@ -38,9 +38,9 @@ static uint8 Font6x7[792] =
4, 0, 32, 64,128, 64, 32, 0, 4, 0, 32, 64,128, 64, 32, 0,
5, 0, 0,240, 0,240, 0, 0, 5, 0, 0,240, 0,240, 0, 0,
4, 0,128, 64, 32, 64,128, 0, 4, 0,128, 64, 32, 64,128, 0,
5,112,136, 8, 16, 32, 0, 32, 6,112,136, 8, 16, 32, 0, 32, // 0x3F - ?
6,112,136,136,184,176,128,112, 6,112,136,136,184,176,128,112, // 0x40 - @
6,112,136,136,248,136,136,136, //A 6,112,136,136,248,136,136,136, // 0x41 - A
6,240,136,136,240,136,136,240, 6,240,136,136,240,136,136,240,
6,112,136,128,128,128,136,112, 6,112,136,128,128,128,136,112,
6,224,144,136,136,136,144,224, 6,224,144,136,136,136,144,224,
@ -72,7 +72,7 @@ static uint8 Font6x7[792] =
4, 64,160, 0, 0, 0, 0, 0, 4, 64,160, 0, 0, 0, 0, 0,
6, 0, 0, 0, 0, 0, 0,248, 6, 0, 0, 0, 0, 0, 0,248,
3,128, 64, 0, 0, 0, 0, 0, 3,128, 64, 0, 0, 0, 0, 0,
5, 0, 0, 96, 16,112,144,112, //a 5, 0, 0, 96, 16,112,144,112, // 0x61 - a
5,128,128,224,144,144,144,224, 5,128,128,224,144,144,144,224,
5, 0, 0,112,128,128,128,112, 5, 0, 0,112,128,128,128,112,
5, 16, 16,112,144,144,144,112, 5, 16, 16,112,144,144,144,112,

16
src/lua-engine.cpp
View File

@ -3781,7 +3781,7 @@ static void LuaDisplayString (const char *string, int y, int x, uint32 color, ui
static uint8 FCEUFont[792] = static uint8 FCEUFont[792] =
{ {
6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, // 0x20 - Spacebar
3, 64, 64, 64, 64, 64, 0, 64, 3, 64, 64, 64, 64, 64, 0, 64,
5, 80, 80, 80, 0, 0, 0, 0, 5, 80, 80, 80, 0, 0, 0, 0,
6, 80, 80,248, 80,248, 80, 80, 6, 80, 80,248, 80,248, 80, 80,
@ -3797,7 +3797,7 @@ static uint8 FCEUFont[792] =
5, 0, 0, 0,240, 0, 0, 0, 5, 0, 0, 0,240, 0, 0, 0,
3, 0, 0, 0, 0, 0, 0, 64, 3, 0, 0, 0, 0, 0, 0, 64,
5, 16, 16, 32, 32, 32, 64, 64, 5, 16, 16, 32, 32, 32, 64, 64,
6,112,136,136,136,136,136,112, //0 6,112,136,136,136,136,136,112, // 0x30 - 0
6, 32, 96, 32, 32, 32, 32, 32, 6, 32, 96, 32, 32, 32, 32, 32,
6,112,136, 8, 48, 64,128,248, 6,112,136, 8, 48, 64,128,248,
6,112,136, 8, 48, 8,136,112, 6,112,136, 8, 48, 8,136,112,
@ -3812,9 +3812,9 @@ static uint8 FCEUFont[792] =
4, 0, 32, 64,128, 64, 32, 0, 4, 0, 32, 64,128, 64, 32, 0,
5, 0, 0,240, 0,240, 0, 0, 5, 0, 0,240, 0,240, 0, 0,
4, 0,128, 64, 32, 64,128, 0, 4, 0,128, 64, 32, 64,128, 0,
5,112,136, 8, 16, 32, 0, 32, 6,112,136, 8, 16, 32, 0, 32, // 0x3F - ?
6,112,136,136,184,176,128,112, 6,112,136,136,184,176,128,112, // 0x40 - @
6,112,136,136,248,136,136,136, //A 6,112,136,136,248,136,136,136, // 0x41 - A
6,240,136,136,240,136,136,240, 6,240,136,136,240,136,136,240,
6,112,136,128,128,128,136,112, 6,112,136,128,128,128,136,112,
6,224,144,136,136,136,144,224, 6,224,144,136,136,136,144,224,
@ -3846,7 +3846,7 @@ static uint8 FCEUFont[792] =
4, 64,160, 0, 0, 0, 0, 0, 4, 64,160, 0, 0, 0, 0, 0,
6, 0, 0, 0, 0, 0, 0,248, 6, 0, 0, 0, 0, 0, 0,248,
3,128, 64, 0, 0, 0, 0, 0, 3,128, 64, 0, 0, 0, 0, 0,
5, 0, 0, 96, 16,112,144,112, //a 5, 0, 0, 96, 16,112,144,112, // 0x61 - a
5,128,128,224,144,144,144,224, 5,128,128,224,144,144,144,224,
5, 0, 0,112,128,128,128,112, 5, 0, 0,112,128,128,128,112,
5, 16, 16,112,144,144,144,112, 5, 16, 16,112,144,144,144,112,
@ -3943,11 +3943,13 @@ void LuaDrawTextTransWH(const char *str, size_t l, int &x, int y, uint32 color,
gui_drawpixel_internal(x+x2, y+y2, backcolor); gui_drawpixel_internal(x+x2, y+y2, backcolor);
} }
} }
/*
// shadows :P // shadows :P
if (diffy >= 7) for(int x2 = 0; x2 < wid; x2++) if (diffy >= 7) for(int x2 = 0; x2 < wid; x2++)
gui_drawpixel_internal(x+x2, y+7, LUA_BUILD_PIXEL(defaultAlpha, 0, 0, 0)); gui_drawpixel_internal(x+x2, y+7, LUA_BUILD_PIXEL(defaultAlpha, 0, 0, 0));
if (*str == '\0' || *str == '\n') for(int y2 = 0; y2 < diffy; y2++) if (*str == '\0' || *str == '\n') for(int y2 = 0; y2 < diffy; y2++)
gui_drawpixel_internal(x+wid, y+y2, LUA_BUILD_PIXEL(defaultAlpha, 0, 0, 0)); gui_drawpixel_internal(x+wid, y+y2, LUA_BUILD_PIXEL(defaultAlpha, 0, 0, 0));
*/
x += wid; x += wid;
len--; len--;
@ -5341,6 +5343,8 @@ static const struct luaL_reg guilib[] = {
{"box", gui_box}, {"box", gui_box},
{"text", gui_text}, {"text", gui_text},
{"parsecolor", gui_parsecolor},
{"savescreenshot", gui_savescreenshot}, {"savescreenshot", gui_savescreenshot},
{"savescreenshotas", gui_savescreenshotas}, {"savescreenshotas", gui_savescreenshotas},
{"gdscreenshot", gui_gdscreenshot}, {"gdscreenshot", gui_gdscreenshot},