Mercurial > hg > dmlib
changeset 848:30f9af5e80f2
Add setup data options for menu bar position/size adjustments.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 21 Oct 2014 20:10:27 +0300 |
| parents | cf142447dd63 |
| children | 00729394df6a 62ee4e590a15 |
| files | src/dmengine.h src/dmsimple.c |
| diffstat | 2 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dmengine.h Tue Oct 21 16:29:18 2014 +0300 +++ b/src/dmengine.h Tue Oct 21 20:10:27 2014 +0300 @@ -287,7 +287,8 @@ void (*demoQuit)(struct DMEngineData *); // Setup specifics - DMVector setupMenuPos, setupMenuDim, setupText1Pos, setupText2Pos; + DMVector setupMenuPos, setupMenuDim, setupText1Pos, setupText2Pos, + setupMenuBarOffs, setupMenuBarDimAdj; BOOL setupMenuCenter, setupTextCondensed; char setupTextFullscreen[64], setupTextWindowed[64], setupTextPrefix[64], setupTextEnterToStart[64]; } DMEngineData;
--- a/src/dmsimple.c Tue Oct 21 16:29:18 2014 +0300 +++ b/src/dmsimple.c Tue Oct 21 20:10:27 2014 +0300 @@ -245,6 +245,10 @@ &engine.setupText1Pos.x, &engine.setupText1Pos.y) != 2 && sscanf(str, "text2Pos %f %f", &engine.setupText2Pos.x, &engine.setupText2Pos.y) != 2 && + sscanf(str, "menuBarOffs %f %f", + &engine.setupMenuBarOffs.x, &engine.setupMenuBarOffs.y) != 2 && + sscanf(str, "menuBarDimAdj %f %f", + &engine.setupMenuBarDimAdj.x, &engine.setupMenuBarDimAdj.y) != 2 && sscanf(str, "menuCenter %d", &engine.setupMenuCenter) != 1 && sscanf(str, "textCondensed %d", &engine.setupTextCondensed) != 1 && sscanf(str, "textFullscreen %s", engine.setupTextFullscreen) != 1 && @@ -322,6 +326,12 @@ engine.setupMenuDim.x = 0.625f; engine.setupMenuDim.y = 0.41666f; + engine.setupMenuBarOffs.x = 0; + engine.setupMenuBarOffs.y = -0.0001; + + engine.setupMenuBarDimAdj.x = 0; + engine.setupMenuBarDimAdj.y = 0; + engine.setupText1Pos.x = 0.3f; engine.setupText1Pos.y = 0.9f; @@ -486,10 +496,10 @@ if (entry == menuOffset + menuIndex) { dmScaledBlitSurface32to32TransparentGA(menuBarImage, - vsX(engine.setupMenuPos), - vsY(engine.setupMenuPos) + (index * menuEntryHeight), - vsX(engine.setupMenuDim), - menuEntryHeight + 4, + vsX(engine.setupMenuPos) + vsX(engine.setupMenuBarOffs), + vsY(engine.setupMenuPos) + vsY(engine.setupMenuBarOffs) + (index * menuEntryHeight), + vsX(engine.setupMenuDim) + vsX(engine.setupMenuBarDimAdj), + menuEntryHeight + vsY(engine.setupMenuBarDimAdj), engine.screen, 200 + sin(t * 10.0) * 50); }