dmlib: src/dmsimple.c annotate

annotate src/dmsimple.c @ 2294:7f6ba3b32f54

Cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 03 Jul 2019 10:28:43 +0300
parents	78a0f44aa8b5
children	69a5af2eb1ea

rev	line source
642 0888971cbff8 Add comment headers to several files. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	1 /*
0888971cbff8 Add comment headers to several files. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	2 * dmlib
0888971cbff8 Add comment headers to several files. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	3 * -- Demo engine "player" code
0888971cbff8 Add comment headers to several files. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	4 * Programmed and designed by Matti 'ccr' Hamalainen
863 27949209238b Update copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 861 diff changeset	5 * (C) Copyright 2012-2015 Tecnic Software productions (TNSP)
642 0888971cbff8 Add comment headers to several files. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	6 */
310 713c8018c3ce Fix includes in the dmsimple engine. Matti Hamalainen <ccr@tnsp.org> parents: 278 diff changeset	7 #include <SDL.h>
967 b387481e511e Remember to initialize dmzlib in the engine. Matti Hamalainen <ccr@tnsp.org> parents: 962 diff changeset	8 #include "dmzlib.h"
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	9 #include "dmengine.h"
310 713c8018c3ce Fix includes in the dmsimple engine. Matti Hamalainen <ccr@tnsp.org> parents: 278 diff changeset	10 #include "dmargs.h"
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	11 #include "dmtext.h"
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	12 #include "dmimage.h"
591 f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	13 #include "setupfont.h"
1079 47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	14
47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	15 #ifdef DM_BUILT_IN_SETUP
47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	16 # include "setupimage.h"
47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	17 # include "setupmenubar.h"
47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	18 #endif
591 f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	19
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	20 // Setup specifics
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	21 #define setupTextFieldLen 64
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	23 static const char *setupDataName = "SetupData.txt";
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	24 static const char *setupFontName = "SetupFont.dmf";
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	25 static DMVector
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	26 setupMenuPos, setupMenuDim, setupText1Pos, setupText2Pos,
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	27 setupMenuBarOffs, setupMenuBarDimAdj;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	28 static BOOL setupMenuCenter, setupTextCondensed;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	29 static char
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	30 setupTextFullscreen[setupTextFieldLen],
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	31 setupTextWindowed[setupTextFieldLen],
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	32 setupTextPrefix[setupTextFieldLen],
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	33 setupTextEnterToStart[setupTextFieldLen],
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	34 setupImageName[setupTextFieldLen] = "SetupImage.png",
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	35 setupMenuBarName[setupTextFieldLen] = "SetupMenuBar.png";
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	36
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	37
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	38 // Engine struct
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	39 static DMEngineData engine;
38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	40
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	41
861 15b413845e24 Oops, few dmargs* API changes related fixes were missing. Matti Hamalainen <ccr@tnsp.org> parents: 850 diff changeset	42 static const DMOptArg optList[] =
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	43 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	44 { 0, '?', "help", "Show this help", OPT_NONE },
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	45 { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	46 };
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	47
861 15b413845e24 Oops, few dmargs* API changes related fixes were missing. Matti Hamalainen <ccr@tnsp.org> parents: 850 diff changeset	48 static const int optListN = sizeof(optList) / sizeof(optList[0]);
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	49
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	50
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	51
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	52 static void argShowHelp()
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	53 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	54 dmPrintBanner(stdout, dmProgName, "[options]");
861 15b413845e24 Oops, few dmargs* API changes related fixes were missing. Matti Hamalainen <ccr@tnsp.org> parents: 850 diff changeset	55 dmArgsPrintHelp(stdout, optList, optListN, 0);
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	56 }
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	57
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	58
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	59 static BOOL argHandleOpt(const int optN, char optArg, char currArg)
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	60 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	61 (void) optArg;
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	62 (void) currArg;
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	63
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	64 switch (optN)
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	65 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	66 case 0:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	67 argShowHelp();
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	68 exit(0);
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	69 break;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	70
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	71 case 1:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	72 dmVerbosity++;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	73 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	74
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	75 default:
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	76 dmErrorDBGMsg("Unknown option '%s'.\n", currArg);
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	77 return FALSE;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	78 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	79
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	80 return TRUE;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	81 }
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	82
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	83
1326 a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	84 static inline void dmFillRect(SDL_Surface *screen,
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	85 const int x0, const int y0,
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	86 const int x1, const int y1,
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	87 const Uint32 col)
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	88 {
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	89 SDL_Rect rc;
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	90 rc.x = x0;
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	91 rc.y = y0;
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	92 rc.w = x1 - x0 + 1;
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	93 rc.h = y1 - y0 + 1;
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	94 SDL_FillRect(screen, &rc, col);
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	95 }
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	96
a265982662cd Add dmFillRect() to dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1321 diff changeset	97
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	98 static int engineShowProgress(int loaded, int total)
40 a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	99 {
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	100 int dx = 60,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	101 dh = 20,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	102 dw = engine.screen->w - (2 * dx),
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	103 dy = (engine.screen->h - dh) / 2;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	104
40 a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	105 // Draw the progress bar
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	106 dmClearSurface(engine.screen, dmMapRGBA(engine.screen, 0,0,0,0));
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	107 dmFillRect(engine.screen, dx, dy, dx+dw, dy+dh, dmMapRGB(engine.screen, 255,255,255));
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	108 dmFillRect(engine.screen, dx+1, dy+1, dx+dw-1, dy+dh-1, dmMapRGB(engine.screen, 0,0,0));
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	109
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	110 if (total > 0)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	111 {
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	112 dmFillRect(engine.screen,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	113 dx+3, dy+3,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	114 dx + 3 + ((dw - 3) * loaded) / total,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	115 dy + dh - 3,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	116 dmMapRGB(engine.screen, 200,200,200));
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	117 }
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	118
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	119 // Flip screen
2043 cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	120 SDL_Surface dst;
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	121 SDL_LockTexture(engine.texture, NULL, &dst.pixels, &dst.pitch);
40 a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	122
2043 cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	123 for (int yc = 0; yc < engine.screen->h; yc++)
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	124 {
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	125 memcpy(dst.pixels + dst.pitch * yc,
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	126 engine.screen->pixels + engine.screen->pitch * yc,
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	127 dst.pitch);
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	128 }
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	129
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	130 SDL_UnlockTexture(engine.texture);
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	131
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	132 SDL_SetRenderDrawColor(engine.renderer, 0, 0, 0, 255);
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	133 SDL_RenderClear(engine.renderer);
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	134 SDL_RenderCopy(engine.renderer, engine.texture, NULL, NULL);
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	135 SDL_RenderPresent(engine.renderer);
cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	136
40 a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	137 return DMERR_OK;
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	138 }
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	139
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	140
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	141 static int engineLoadResources()
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 {
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	143 int err, loaded = 0, total = 0;
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	144 BOOL first = TRUE;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	145
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	146 do
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 // Show a nice progress bar while loading
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	149 if ((err = engineShowProgress(loaded, total)) != DMERR_OK)
35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	150 return err;
35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	151
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	152 err = dmResourcesPreload(engine.resources, first, &loaded, &total);
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	153 first = FALSE;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 }
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	155 while (err == DMERR_PROGRESS);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	156
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 return err;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	161 static BOOL engineGenInitializeVideo(int width, int height, int depth, Uint32 flags)
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	162 {
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	163 dmPrint(1, "Initializing SDL video %d x %d x %dbpp, flags=0x%08x\n",
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	164 width, height, depth, flags);
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	165
2043 cbb3463fea2a Initial dabbling for SDL2 migration of the SW rendering / dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 1606 diff changeset	166 SDL_SetWindowTitle(engine.window, dmProgDesc);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	167
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	168 return TRUE;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	169 }
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	170
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	171
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	172 static BOOL engineInitializeVideo()
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	173 {
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	174 return engineGenInitializeVideo(engine.optVidWidth, engine.optVidHeight,
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	175 engine.optVidDepth, engine.optVFlags);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	176 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	177
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	178
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	179 typedef struct
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	180 {
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	181 int w, h, aspect;
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	182 } DMModeEntry;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	183
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	184
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	185 DMModeEntry *engineModeList = NULL;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	186 int nengineModeList = 0, aengineModeList = 0;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	187
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	188
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	189 static int engineModeSort(const void pa, const void pb)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	190 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	191 DMModeEntry
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	192 va = (DMModeEntry ) pa,
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	193 vb = (DMModeEntry ) pb;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	194
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	195 return (va->w - vb->w);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	196 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	197
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	198
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	199 int engineAddModeToList(int w, int h)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	200 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	201 DMModeEntry *mode;
787 e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	202 int i, aspect = engineGetVideoAspect(w, h);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	203
787 e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	204 dmPrint(2, " - Proposed %d x %d\n", w, h);
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	205 if (aspect <= 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	206 return DMERR_INVALID_ARGS;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	207
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	208 // Check if the mode is already in our list
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	209 for (i = 0; i < nengineModeList; i++)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	210 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	211 mode = &engineModeList[i];
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	212 if (mode->w == w && mode->h == h)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	213 return DMERR_OK;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	214 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	215
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	216 // Check if the mode fits our criteria
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	217 switch (engine.optVidSetup)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	218 {
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	219 case DM_VSETUP_ASPECT:
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	220 if (aspect != engine.optVidAspect)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	221 return DMERR_OK;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	222 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	223
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	224 case DM_VSETUP_ANY:
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	225 break;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	226 }
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	227
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	228 // Reallocate array if needed
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	229 if (nengineModeList + 1 >= aengineModeList)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	230 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	231 aengineModeList += 16;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	232 engineModeList = dmRealloc(engineModeList, sizeof(DMModeEntry) * aengineModeList);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	233 if (engineModeList == NULL)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	234 return DMERR_MALLOC;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	235 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	236
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	237 // Store
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	238 mode = &engineModeList[nengineModeList];
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	239 mode->w = w;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	240 mode->h = h;
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	241 mode->aspect = engineGetVideoAspect(w, h);
787 e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	242 dmPrint(2, " - %d x %d, %d\n", w, h, mode->aspect);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	243
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	244 nengineModeList++;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	245
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	246 return DMERR_OK;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	247 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	248
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	249
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	250 int engineParseSetupConfig(const char *filename)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	251 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	252 DMResource *file = NULL;
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	253 int res;
847 cf142447dd63 Add "enter to start" text for the setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 846 diff changeset	254 char buf[256];
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	255
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	256 if ((res = dmf_open(engine.resources, filename, &file)) != DMERR_OK)
1055 2858b56bdbe5 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1054 diff changeset	257 {
2858b56bdbe5 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1054 diff changeset	258 dmErrorMsg("Failed to open engine setup configuration '%s', %d: %s.\n",
2858b56bdbe5 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1054 diff changeset	259 filename, res, dmErrorStr(res));
733 b505b81a43de Fix resource loading. Matti Hamalainen <ccr@tnsp.org> parents: 730 diff changeset	260 return res;
1055 2858b56bdbe5 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1054 diff changeset	261 }
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	262
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	263 while (dmfgets(buf, sizeof(buf), file) != NULL)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	264 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	265 ssize_t pos;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	266 // Trim line ending
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	267 for (pos = strlen(buf) - 1; pos >= 0 && isspace(buf[pos]); pos--)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	268 buf[pos] = 0;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	269
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	270 // Find start of the line
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	271 for (pos = 0; isspace(buf[pos]); pos++);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	272
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	273 // Skip empty lines and comments
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	274 if (buf[pos] == 0 \|\| buf[pos] == '#')
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	275 continue;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	276
847 cf142447dd63 Add "enter to start" text for the setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 846 diff changeset	277 // XXX TODO FIXME: Needs better parsing, with size checks etc.
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	278 char *str = buf+pos;
4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	279 if (sscanf(str, "menuPos %f %f",
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	280 &setupMenuPos.x, &setupMenuPos.y) != 2 &&
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	281 sscanf(str, "menuDim %f %f",
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	282 &setupMenuDim.x, &setupMenuDim.y) != 2 &&
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	283 sscanf(str, "text1Pos %f %f",
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	284 &setupText1Pos.x, &setupText1Pos.y) != 2 &&
847 cf142447dd63 Add "enter to start" text for the setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 846 diff changeset	285 sscanf(str, "text2Pos %f %f",
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	286 &setupText2Pos.x, &setupText2Pos.y) != 2 &&
848 30f9af5e80f2 Add setup data options for menu bar position/size adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 847 diff changeset	287 sscanf(str, "menuBarOffs %f %f",
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	288 &setupMenuBarOffs.x, &setupMenuBarOffs.y) != 2 &&
848 30f9af5e80f2 Add setup data options for menu bar position/size adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 847 diff changeset	289 sscanf(str, "menuBarDimAdj %f %f",
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	290 &setupMenuBarDimAdj.x, &setupMenuBarDimAdj.y) != 2 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	291 sscanf(str, "menuCenter %d", &setupMenuCenter) != 1 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	292 sscanf(str, "textCondensed %d", &setupTextCondensed) != 1 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	293 sscanf(str, "textFullscreen %s", setupTextFullscreen) != 1 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	294 sscanf(str, "textWindowed %s", setupTextWindowed) != 1 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	295 sscanf(str, "textPrefix %s", setupTextPrefix) != 1 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	296 sscanf(str, "textEnterToStart %s", setupTextEnterToStart) != 1 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	297 sscanf(str, "setupImageName %s", setupImageName) != 1 &&
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	298 sscanf(str, "setupMenuBarName %s", setupMenuBarName) != 1
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	299 )
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	300 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	301 res = dmErrorDBG(DMERR_INVALID_DATA,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	302 "Syntax error in configuration:\n%s\n", buf);
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	303 goto out;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	304 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	305 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	306
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	307 out:
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	308 dmf_close(file);
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	309 return res;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	310 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	311
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	312
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	313 static inline DMFloat vsX(DMVector vec)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	314 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	315 return (DMFloat) engine.screen->w * vec.x;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	316 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	317
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	318
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	319 static inline DMFloat vsY(DMVector vec)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	320 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	321 return (DMFloat) engine.screen->h * vec.y;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	322 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	323
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	324
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	325 int engineVideoSetup()
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	326 {
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	327 DMBitmapFont *menuFont = NULL;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	328 DMResource *file = NULL;
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	329 SDL_Surface menuBgImage = NULL, menuBarImage = NULL;
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	330 int result, menuState = -1;
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	331 BOOL menuFullScreen = TRUE;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	332
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	333 // Compute a list of valid modes
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	334 if (!engineGenInitializeVideo(DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT, engine.optVidDepth, engine.optVFlags))
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	335 goto out;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	336
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	337 SDL_Rect **modes = SDL_ListModes(engine.screen->format, engine.screen->flags \| SDL_FULLSCREEN);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	338 if (modes == (SDL_Rect**) 0)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	339 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	340 dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	341 "No compatible video resolutions/depths available at all. Bailing out.\n");
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	342 goto out;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	343 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	344
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	345 if (modes != (SDL_Rect**) -1)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	346 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	347 int i;
787 e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	348 dmPrint(1, "Enumerating modes.\n");
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	349 for (i = 0; modes[i] != NULL; i++)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	350 engineAddModeToList(modes[i]->w, modes[i]->h);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	351 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	352
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	353 if (nengineModeList == 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	354 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	355 dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	356 "Umm, no modes found.\n");
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	357 goto out;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	358 }
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	359
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	360 qsort(engineModeList, nengineModeList, sizeof(engineModeList[0]), engineModeSort);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	361
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	362 // Open video temporarily
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	363 if (!engineGenInitializeVideo(DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT, 32, SDL_SWSURFACE \| SDL_DOUBLEBUF))
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	364 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	365
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	366 // Get setup data
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	367 setupMenuPos.x = 0.18750f;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	368 setupMenuPos.y = 0.41666f;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	369 setupMenuDim.x = 0.625f;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	370 setupMenuDim.y = 0.41666f;
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	371
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	372 setupMenuBarOffs.x = 0;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	373 setupMenuBarOffs.y = -0.0001;
848 30f9af5e80f2 Add setup data options for menu bar position/size adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 847 diff changeset	374
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	375 setupMenuBarDimAdj.x = 0;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	376 setupMenuBarDimAdj.y = 0;
848 30f9af5e80f2 Add setup data options for menu bar position/size adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 847 diff changeset	377
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	378 setupText1Pos.x = 0.3f;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	379 setupText1Pos.y = 0.9f;
847 cf142447dd63 Add "enter to start" text for the setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 846 diff changeset	380
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	381 setupText2Pos.x = 0.25f;
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	382 setupText2Pos.y = 0.85f;
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	383
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	384 strcpy(setupTextFullscreen , "FULLSCREEN");
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	385 strcpy(setupTextWindowed , " WINDOWED ");
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	386 strcpy(setupTextEnterToStart , "ENTER TO START THE DEMO");
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	387 strcpy(setupTextPrefix , "USE LEFT/RIGHT ARROW TO TOGGLE : ");
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	388
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	389 if (engineParseSetupConfig(setupDataName) != DMERR_OK)
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	390 goto out;
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	391
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	392 // Fetch and decompress setup image, try regular resources first
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	393 if ((result = dmf_open(engine.resources, setupImageName, &file)) == DMERR_OK
1079 47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	394 #ifdef DM_BUILT_IN_SETUP
1606 93d1050eac99 Rename dmf_create_() functions to dmf_open_(). Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	395 \|\| (result = dmf_open_memio(NULL, setupImageName, setupImage, sizeof(setupImage), &file)) == DMERR_OK
1079 47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	396 #endif
47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	397 )
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	398 {
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	399 menuBgImage = dmLoadImage(file);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	400 dmf_close(file);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	401 }
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	402
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	403 if ((result = dmf_open(engine.resources, setupMenuBarName, &file)) == DMERR_OK
1079 47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	404 #ifdef DM_BUILT_IN_SETUP
1606 93d1050eac99 Rename dmf_create_() functions to dmf_open_(). Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	405 \|\| (result = dmf_open_memio(NULL, setupMenuBarName, setupMenuBar, sizeof(setupMenuBar), &file)) == DMERR_OK
1079 47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	406 #endif
47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	407 )
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	408 {
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	409 menuBarImage = dmLoadImage(file);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	410 dmf_close(file);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	411 }
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	412
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	413 if (menuBgImage == NULL \|\| menuBarImage == NULL)
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	414 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	415 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	416 "Could not instantiate setup screen images, %d: %s\n",
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	417 result, dmErrorStr(result));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	418 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	419 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	420
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	421 if (menuBgImage->w != DM_VSETUP_WIDTH \|\|
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	422 menuBgImage->h != DM_VSETUP_HEIGHT)
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	423 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	424 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	425 "Setup screen background image does not match "
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	426 "required dimensions (%dx%d vs %dx%d)\n",
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	427 menuBgImage->w, menuBgImage->h,
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	428 DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	429 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	430 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	431
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	432
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	433 // Load up the bitmap font
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	434 if ((result = dmf_open(engine.resources, setupFontName, &file)) == DMERR_OK
1079 47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	435 #ifdef DM_BUILT_IN_SETUP
1606 93d1050eac99 Rename dmf_create_() functions to dmf_open_(). Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	436 \|\| (result = dmf_open_memio(NULL, setupFontName, setupFont, sizeof(setupFont), &file)) == DMERR_OK
1079 47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	437 #endif
47c0514d9ba4 Make the built in setup font/screen image/bar bitmap optional. Matti Hamalainen <ccr@tnsp.org> parents: 1057 diff changeset	438 )
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	439 {
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	440 result = dmLoadBitmapFont(file, &menuFont);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	441 dmf_close(file);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	442 }
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	443 if (result != DMERR_OK)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	444 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	445 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	446 "Could not instantiate setup screen font, %d: %s\n",
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	447 result, dmErrorStr(result));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	448 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	449 }
614 eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	450
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	451 SDL_Surface *tmp = dmConvertScaledSurface(menuBgImage,
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	452 engine.screen->format, engine.screen->flags,
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	453 engine.screen->w, engine.screen->h);
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	454 if (tmp == NULL)
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	455 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	456 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	457 "Could not convert setup screen background image.\n");
614 eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	458 goto out;
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	459 }
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	460
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	461 SDL_FreeSurface(menuBgImage);
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	462 menuBgImage = tmp;
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	463
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	464 SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	465
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	466
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	467 // Enter the main loop of the menu
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	468 char menuStr[256];
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	469 int menuOffset = 0,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	470 menuIndex = 0,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	471 menuEntryHeight = menuFont->height + 2,
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	472 menuHeight = vsY(setupMenuDim) / menuEntryHeight;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	473
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	474 menuState = 0;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	475
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	476 engine.startTime = SDL_GetTicks();
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	477
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	478 while (!menuState)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	479 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	480 while (SDL_PollEvent(&engine.event))
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	481 switch (engine.event.type)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	482 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	483 case SDL_KEYDOWN:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	484 switch (engine.event.key.keysym.sym)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	485 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	486 case SDLK_ESCAPE:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	487 menuState = -1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	488 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	489
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	490 case SDLK_RETURN:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	491 menuState = 1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	492 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	493
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	494 case SDLK_UP:
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	495 if (menuIndex > 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	496 menuIndex--;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	497 else
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	498 if (menuOffset > 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	499 menuOffset--;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	500 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	501
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	502 case SDLK_DOWN:
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	503 if (menuIndex < menuHeight - 1 && menuOffset + menuIndex < nengineModeList - 1)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	504 menuIndex++;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	505 else
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	506 if (menuOffset + menuIndex < nengineModeList - 1)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	507 menuOffset++;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	508 break;
632 78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	509
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	510 case SDLK_LEFT:
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	511 menuFullScreen = FALSE;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	512 break;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	513
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	514 case SDLK_RIGHT:
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	515 menuFullScreen = TRUE;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	516 break;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	517
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	518 case SDLK_SPACE:
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	519 menuFullScreen = !menuFullScreen;
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	520 break;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	521
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	522 default:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	523 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	524 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	525
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	526 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	527
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	528 case SDL_QUIT:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	529 menuState = -1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	530 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	531 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	532
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	533 // Draw frame
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	534 engine.frameTime = SDL_GetTicks();
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	535
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	536 // Render the menu
614 eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	537 dmDirectBlitSurface(menuBgImage, engine.screen);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	538
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	539 // XXX/TODO: Some hardcoded bits here ...
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	540 float t = engineGetTimeDT(&engine);
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	541 int index, entry;
615 024bc22c54d7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	542
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	543 for (index = 0, entry = menuOffset; entry < nengineModeList && index < menuHeight; index++, entry++)
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	544 {
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	545 DMModeEntry *mode = &engineModeList[entry];
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	546
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	547 if (entry == menuOffset + menuIndex)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	548 {
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	549 dmScaledBlitSurface32to32TransparentGA(menuBarImage,
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	550 vsX(setupMenuPos) + vsX(setupMenuBarOffs),
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	551 vsY(setupMenuPos) + vsY(setupMenuBarOffs) + (index * menuEntryHeight),
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	552 vsX(setupMenuDim) + vsX(setupMenuBarDimAdj),
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	553 menuEntryHeight + vsY(setupMenuBarDimAdj),
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	554 engine.screen,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	555 200 + sin(t * 10.0) * 50);
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	556 }
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	557
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	558 snprintf(menuStr, sizeof(menuStr),
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	559 "%4d X %-4d - %d:%d",
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	560 mode->w, mode->h,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	561 mode->aspect / 1000,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	562 mode->aspect % 1000);
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	563
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	564 DMFloat posX = setupMenuCenter ?
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	565 2.0f + (vsX(setupMenuDim) - menuFont->width * strlen(menuStr)) / 2.0f :
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	566 2.0f;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	567
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	568 dmDrawBMTextConst(
635 7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	569 engine.screen, menuFont,
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	570 setupTextCondensed, DMD_TRANSPARENT,
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	571 vsX(setupMenuPos) + posX,
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	572 vsY(setupMenuPos) + (index * menuEntryHeight),
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	573 menuStr);
8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	574 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	575
847 cf142447dd63 Add "enter to start" text for the setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 846 diff changeset	576 dmDrawBMTextConst(
cf142447dd63 Add "enter to start" text for the setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 846 diff changeset	577 engine.screen, menuFont,
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	578 setupTextCondensed, DMD_TRANSPARENT,
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	579 vsX(setupText2Pos),
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	580 vsY(setupText2Pos),
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	581 setupTextEnterToStart);
847 cf142447dd63 Add "enter to start" text for the setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 846 diff changeset	582
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	583 snprintf(menuStr, sizeof(menuStr),
4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	584 "%s%s",
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	585 setupTextPrefix,
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	586 menuFullScreen ? setupTextFullscreen : setupTextWindowed);
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	587
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	588 dmDrawBMTextConst(
635 7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	589 engine.screen, menuFont,
1321 6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	590 setupTextCondensed, DMD_TRANSPARENT,
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	591 vsX(setupText1Pos),
6732a5ca1fae Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine Matti Hamalainen <ccr@tnsp.org> parents: 1273 diff changeset	592 vsY(setupText1Pos),
756 4dda14ff8e1a Add some configurable texts to setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 755 diff changeset	593 menuStr);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	594
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	595 // Flip screen
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	596 SDL_Flip(engine.screen);
616 ed4536641796 A bit slower screen update rate. Matti Hamalainen <ccr@tnsp.org> parents: 615 diff changeset	597 SDL_Delay(25);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	598 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	599
621 3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	600 // Okay, we accepted the selection
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	601 if (menuState == 1)
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	602 {
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	603 DMModeEntry *mode = &engineModeList[menuOffset + menuIndex];
753 8dd6d512cbb2 Add variable for detecting if we are in "native" video resolution. Matti Hamalainen <ccr@tnsp.org> parents: 733 diff changeset	604 engine.optVidNative =
8dd6d512cbb2 Add variable for detecting if we are in "native" video resolution. Matti Hamalainen <ccr@tnsp.org> parents: 733 diff changeset	605 mode->w == engine.optVidWidth &&
8dd6d512cbb2 Add variable for detecting if we are in "native" video resolution. Matti Hamalainen <ccr@tnsp.org> parents: 733 diff changeset	606 mode->h == engine.optVidHeight;
8dd6d512cbb2 Add variable for detecting if we are in "native" video resolution. Matti Hamalainen <ccr@tnsp.org> parents: 733 diff changeset	607
621 3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	608 engine.optVidWidth = mode->w;
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	609 engine.optVidHeight = mode->h;
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	610 engine.optVidAspect = mode->aspect;
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	611 if (menuFullScreen)
621 3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	612 engine.optVFlags \|= SDL_FULLSCREEN;
753 8dd6d512cbb2 Add variable for detecting if we are in "native" video resolution. Matti Hamalainen <ccr@tnsp.org> parents: 733 diff changeset	613
621 3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	614 }
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	615
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	616 out:
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	617 SDL_FreeSurface(menuBgImage);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	618 SDL_FreeSurface(menuBarImage);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	619 dmFreeBitmapFont(menuFont);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	620
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	621 return menuState;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	622 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	623
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	624
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625 int main(int argc, char *argv[])
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627 int err;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628 BOOL initSDL = FALSE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	629
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1122 diff changeset	630 dmMemset(&engine, 0, sizeof(engine));
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 // Pre-initialization
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	633 if ((err = demoPreInit(&engine)) != DMERR_OK)
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	634 goto out;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	636 if (!dmArgsProcess(argc, argv, optList, optListN,
861 15b413845e24 Oops, few dmargs* API changes related fixes were missing. Matti Hamalainen <ccr@tnsp.org> parents: 850 diff changeset	637 argHandleOpt, NULL, OPTH_BAILOUT))
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	638 return DMERR_INIT_FAIL;
123 6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	639
6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	640 dmPrint(0,
6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	641 "%s\n"
631 25656351f5f9 Remove the note about TNSP simple demoengine. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	642 "%s\n",
123 6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	643 dmProgDesc, dmProgAuthor);
125 5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	644
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	645 dmPrint(0,
1057 eb2d14546a0e Fix init messages. Matti Hamalainen <ccr@tnsp.org> parents: 1055 diff changeset	646 "Using libSDL"
eb2d14546a0e Fix init messages. Matti Hamalainen <ccr@tnsp.org> parents: 1055 diff changeset	647 #if defined(DM_USE_PACKFS) && defined(DM_USE_ZLIB)
eb2d14546a0e Fix init messages. Matti Hamalainen <ccr@tnsp.org> parents: 1055 diff changeset	648 ", zlib"
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	649 #endif
125 5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	650 #ifdef DM_USE_TREMOR
1057 eb2d14546a0e Fix init messages. Matti Hamalainen <ccr@tnsp.org> parents: 1055 diff changeset	651 ", Tremor Vorbis codec"
125 5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	652 #endif
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	653 " and modified stb_image.\n"
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	654 "See README.txt for more information.\n");
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	655
967 b387481e511e Remember to initialize dmzlib in the engine. Matti Hamalainen <ccr@tnsp.org> parents: 962 diff changeset	656 // Initialize dmZlib
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	657 if ((err = dmZLibInit()) != DMERR_OK)
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	658 {
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	659 dmErrorDBGMsg(
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	660 "Failed to initialize dmzlib: %d, %s.\n",
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	661 err, dmErrorStr(err));
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	662 goto out;
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	663 }
967 b387481e511e Remember to initialize dmzlib in the engine. Matti Hamalainen <ccr@tnsp.org> parents: 962 diff changeset	664
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665 // Initialize resource subsystem
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 dmPrint(1, "Initializing resources subsystem.\n");
2106 78a0f44aa8b5 Clean out the resource path handling. Matti Hamalainen <ccr@tnsp.org> parents: 2043 diff changeset	667 if ((err = dmResourcesInit(&engine.resources,
78a0f44aa8b5 Clean out the resource path handling. Matti Hamalainen <ccr@tnsp.org> parents: 2043 diff changeset	668 engine.optPackFilename, "data/",
78a0f44aa8b5 Clean out the resource path handling. Matti Hamalainen <ccr@tnsp.org> parents: 2043 diff changeset	669 engine.optResFlags, engineClassifier)) != DMERR_OK)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670 {
1119 007a9446256c Enable some error messages also in not-debug-build. Matti Hamalainen <ccr@tnsp.org> parents: 1102 diff changeset	671 dmErrorMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	672 "Could not initialize resource manager, #%d: %s.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	673 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	674 goto out;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 // Initialize SDL components
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	678 dmPrint(1, "Initializing libSDL.\n");
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679 if (SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| SDL_INIT_TIMER) != 0)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	681 dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	682 "Could not initialize SDL: %s\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	683 SDL_GetError());
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	684 goto out;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 initSDL = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687
868 2c6b092328be Possibly improve audio synchronization. Matti Hamalainen <ccr@tnsp.org> parents: 863 diff changeset	688 // Set start time
2c6b092328be Possibly improve audio synchronization. Matti Hamalainen <ccr@tnsp.org> parents: 863 diff changeset	689 engine.startTimeAudio = -1;
2c6b092328be Possibly improve audio synchronization. Matti Hamalainen <ccr@tnsp.org> parents: 863 diff changeset	690 engine.startTime = -1;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	691
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	692 // Present video mode selector
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	693 if (engine.optVidAspect <= 0)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	694 engine.optVidAspect = engineGetVideoAspect(engine.optVidWidth, engine.optVidHeight);
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	695
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	696 if (engine.optVidSetup)
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	697 {
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	698 if ((err = engineVideoSetup()) <= 0)
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	699 goto out;
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	700 }
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	701
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	702 // Initialize audio parts
126 97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	703 if (engine.optAfmt.freq == 0 && engine.optAfmt.channels == 0)
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	704 {
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	705 engine.optAfmt.freq = 44100;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	706 engine.optAfmt.format = AUDIO_S16SYS;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	707 engine.optAfmt.channels = 2;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	708 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	709
640 55743025d628 Change audio default setup. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	710 if (engine.optAfmt.samples == 0)
787 e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	711 engine.optAfmt.samples = engine.optAfmt.freq / 50;
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	712
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	713 switch (engine.optAudioSetup)
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	714 {
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	715 case DM_ASETUP_JSS:
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	716 #ifdef DM_USE_JSS
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	717 jssInit();
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	718
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	719 switch (engine.optAfmt.format)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	720 {
754 ce7acde37dc7 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	721 case AUDIO_S16SYS: engine.jssFormat = JSS_AUDIO_S16; break;
ce7acde37dc7 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	722 case AUDIO_U16SYS: engine.jssFormat = JSS_AUDIO_U16; break;
ce7acde37dc7 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	723 case AUDIO_S8: engine.jssFormat = JSS_AUDIO_S8; break;
ce7acde37dc7 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	724 case AUDIO_U8: engine.jssFormat = JSS_AUDIO_U8; break;
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	725 }
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	726
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	727 dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n",
754 ce7acde37dc7 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	728 engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	729
754 ce7acde37dc7 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	730 if ((engine.jssDev = jvmInit(engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	731 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	732 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	733 "jvmInit() returned NULL, voi perkele.\n");
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	734 goto out;
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	735 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736
754 ce7acde37dc7 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	737 if ((engine.jssPlr = jmpInit(engine.jssDev)) == NULL)
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	738 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	739 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	740 "jmpInit() returned NULL\n");
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	741 goto out;
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	742 }
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	743 #else
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	744 dmErrorDBGMsg("miniJSS support not included.\n");
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	745 #endif
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	746 break;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	747
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	748 case DM_ASETUP_TREMOR:
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	749 #ifndef DM_USE_TREMOR
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	750 dmErrorDBGMsg("Tremor support not included.\n");
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	751 #endif
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	752 break;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	753 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 // Initialize SDL audio
787 e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	756 dmPrint(1, "Trying to init SDL audio with: fmt=%d, chn=%d, freq=%d, samples=%d\n",
e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	757 engine.optAfmt.format, engine.optAfmt.channels,
e8153e8a948e Merged. Matti Hamalainen <ccr@tnsp.org> parents: 786 diff changeset	758 engine.optAfmt.freq, engine.optAfmt.samples);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759
846 05a3ee1ca964 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 845 diff changeset	760 if ((err = engineInitAudioParts(&engine)) != DMERR_OK)
786 bc95f8a6d89c Add audio sample size information into the engine structure. Matti Hamalainen <ccr@tnsp.org> parents: 785 diff changeset	761 {
1273 132706e3b94b Improve error handling and reporting slightly. Matti Hamalainen <ccr@tnsp.org> parents: 1263 diff changeset	762 dmErrorMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	763 "engineInitAudioParts() failed: #%d: %s\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	764 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	765 goto out;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768 // Initialize SDL video
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	769 if (engine.demoInitPreVideo != NULL &&
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	770 (err = engine.demoInitPreVideo(&engine)) != DMERR_OK)
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	771 {
1273 132706e3b94b Improve error handling and reporting slightly. Matti Hamalainen <ccr@tnsp.org> parents: 1263 diff changeset	772 dmErrorMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	773 "demoInitPreVideo() failed, #%d: %s\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	774 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	775 goto out;
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	776 }
ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	777
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	778 if (!engineInitializeVideo())
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	779 goto out;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	781 if (engine.demoInitPostVideo != NULL &&
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	782 (err = engine.demoInitPostVideo(&engine)) != DMERR_OK)
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	783 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	784 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	785 "demoInitPostVideo() failed, #%d: %s\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	786 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	787 goto out;
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	788 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	790 // Hide cursor
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	791 SDL_ShowCursor(SDL_DISABLE);
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	792
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	793 // Load resources
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	794 dmPrint(1, "Loading resources, please wait...\n");
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795 if ((err = engineLoadResources()) != DMERR_OK)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796 {
1273 132706e3b94b Improve error handling and reporting slightly. Matti Hamalainen <ccr@tnsp.org> parents: 1263 diff changeset	797 dmErrorMsg(
962 b7c01d4ca984 Fix dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	798 "Error loading resources, #%d: %s.\n",
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	800 goto out;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 // Final initializations
1122 320dcfd1bd75 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1119 diff changeset	804 dmPrint(1, "Initializing demo...\n");
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	805 if ((err = engine.demoInit(&engine)) != DMERR_OK)
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	806 {
1273 132706e3b94b Improve error handling and reporting slightly. Matti Hamalainen <ccr@tnsp.org> parents: 1263 diff changeset	807 dmErrorMsg(
962 b7c01d4ca984 Fix dmsimple. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	808 "Failure in demoInit(), #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	809 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	810 goto out;
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	811 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	812
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	813 // Initialize effects
369 e1c984404b6b Re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 367 diff changeset	814 if ((err = engineInitializeEffects(&engine)) != DMERR_OK)
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	815 {
1273 132706e3b94b Improve error handling and reporting slightly. Matti Hamalainen <ccr@tnsp.org> parents: 1263 diff changeset	816 dmErrorMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	817 "Effects initialization failed, #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	818 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	819 goto out;
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	820 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	821
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	822 // Use a timeline, if set
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	823 #ifdef DM_USE_TIMELINE
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	824 if (engine.timeline != NULL)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	825 {
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	826 if ((err = dmLoadTimeline(engine.timeline, &engine.tl)) != DMERR_OK)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	827 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	828 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	829 "Error loading timeline, #%d: %s\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	830 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	831 goto out;
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	832 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	833
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	834 if ((err = dmPrepareTimeline(engine.tl, engine.ptl)) != DMERR_OK)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	835 {
1049 771e03bf9fcd Make more error message fall under DM_DEBUG. Matti Hamalainen <ccr@tnsp.org> parents: 967 diff changeset	836 dmErrorDBGMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 868 diff changeset	837 "Error creating prepared timeline, #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	838 err, dmErrorStr(err));
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	839 goto out;
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	840 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	841 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	842 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	844 dmPrint(1, "Starting up.\n");
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	845
868 2c6b092328be Possibly improve audio synchronization. Matti Hamalainen <ccr@tnsp.org> parents: 863 diff changeset	846 engine.startTime = SDL_GetTicks();
2c6b092328be Possibly improve audio synchronization. Matti Hamalainen <ccr@tnsp.org> parents: 863 diff changeset	847
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	848 SDL_LockAudio();
1263 4e9deb14e67f Fix audio sync with nosound. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	849 enginePauseAudio(&engine, 0);
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	850 SDL_UnlockAudio();
919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	851
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	852 while (!engine.exitFlag)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	854 while (SDL_PollEvent(&engine.event))
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	855 switch (engine.event.type)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	856 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	857 case SDL_KEYDOWN:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	858 switch (engine.event.key.keysym.sym)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	859 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	860 case SDLK_ESCAPE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	861 engine.exitFlag = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	862 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	863
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864 case SDLK_SPACE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865 engine.pauseFlag = !engine.pauseFlag;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867
336 13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	868 case SDLK_f:
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	869 engine.optVFlags ^= SDL_FULLSCREEN;
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	870 if (!engineInitializeVideo())
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	871 goto out;
336 13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	872 break;
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	873
109 3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	874 case SDLK_RETURN:
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	875 if (engine.event.key.keysym.mod & KMOD_ALT)
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	876 {
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	877 engine.optVFlags ^= SDL_FULLSCREEN;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	878 if (!engineInitializeVideo())
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	879 goto out;
109 3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	880 }
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	881 break;
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	882
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	883 default:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	884 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	887 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889 case SDL_VIDEOEXPOSE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	890 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	891
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	892 case SDL_QUIT:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	893 engine.exitFlag = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	895 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897 // Draw frame
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	898 engine.frameTime = SDL_GetTicks();
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	899 if (engine.pauseFlag != engine.paused)
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	900 {
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	901 engine.paused = engine.pauseFlag;
367 9875c65029af Work towards re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 366 diff changeset	902 engine.pauseTime = engineGetTick(&engine);
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	903 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	904
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	905 if (engine.paused)
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	906 {
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	907 engine.startTime = engine.frameTime - engine.pauseTime;
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	908 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910 // Call main tick
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	911 if (engine.demoRender != NULL)
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	912 {
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	913 if ((err = engine.demoRender(&engine)) != DMERR_OK)
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	914 goto out;
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	915 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	916 #ifdef DM_USE_TIMELINE
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	917 else
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	918 {
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	919 if ((err = dmExecuteTimeline(engine.ptl, engine.screen, engineGetTick(&engine))) != DMERR_OK)
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	920 goto out;
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	921 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	922 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	923
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	924 SDL_Delay(engine.paused ? 100 : 20);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	925
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	926 engine.frameCount++;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	928
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929 // Print benchmark results
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930 engine.endTime = SDL_GetTicks();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931 dmPrint(1, "%d frames in %d ms, fps = %1.3f\n",
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	932 engine.frameCount, engine.endTime - engine.startTime,
bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	933 (float) (engine.frameCount * 1000.0f) / (float) (engine.endTime - engine.startTime));
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934
868 2c6b092328be Possibly improve audio synchronization. Matti Hamalainen <ccr@tnsp.org> parents: 863 diff changeset	935 dmPrint(1, "startTime=%d, startTimeAudio=%d, offsetTime=%d\n",
2c6b092328be Possibly improve audio synchronization. Matti Hamalainen <ccr@tnsp.org> parents: 863 diff changeset	936 engine.startTime, engine.startTimeAudio, engine.offsetTime);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	938 out:
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 dmPrint(1, "Shutting down.\n");
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	941 SDL_ShowCursor(SDL_ENABLE);
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	942
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	943 SDL_LockAudio();
1263 4e9deb14e67f Fix audio sync with nosound. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	944 enginePauseAudio(&engine, 1);
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	945 #ifdef DM_USE_JSS
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	946 if (engine.optAudioSetup == DM_ASETUP_JSS)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	947 {
769 b87c7fc646f9 Fix two 10L: forgot to rename these structure members here. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	948 jmpClose(engine.jssPlr);
b87c7fc646f9 Fix two 10L: forgot to rename these structure members here. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	949 jvmClose(engine.jssDev);
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	950 jssClose();
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	951 }
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	952 #endif
781 e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	953
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	954 if (engine.audioSimThread != NULL)
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	955 {
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	956 dmMutexLock(engine.audioStreamMutex);
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	957 engine.audioSimDone = TRUE;
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	958 dmMutexUnlock(engine.audioStreamMutex);
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	959 SDL_WaitThread(engine.audioSimThread, NULL);
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	960 }
e15e0469499a Add initial code for simulating audio playback while in no-sound situation. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	961
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	962 SDL_UnlockAudio();
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1079 diff changeset	963
755 614df17de975 Add mutex locking to audio stream stuff. Matti Hamalainen <ccr@tnsp.org> parents: 754 diff changeset	964 if (engine.audioStreamMutex != NULL)
614df17de975 Add mutex locking to audio stream stuff. Matti Hamalainen <ccr@tnsp.org> parents: 754 diff changeset	965 dmDestroyMutex(engine.audioStreamMutex);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	966
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	967 #ifdef DM_USE_TIMELINE
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	968 dmFreeTimeline(engine.tl);
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	969 dmFreePreparedTimelineData(engine.ptl);
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	970 #endif
14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	971
369 e1c984404b6b Re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 367 diff changeset	972 engineShutdownEffects(&engine);
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	973 dmResourcesClose(engine.resources);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	974
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	975 if (engine.demoShutdown != NULL)
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	976 engine.demoShutdown(&engine);
94 4bbfc0274b29 Change some function names, etc. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	977
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	978 if (initSDL)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979 SDL_Quit();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	980
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	981 if (engine.demoQuit != NULL)
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	982 engine.demoQuit(&engine);
1054 d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	983
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	984 dmZLibClose();
d98fcb10df6a Work on dmzlib. Matti Hamalainen <ccr@tnsp.org> parents: 1049 diff changeset	985
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986 return 0;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987 }

Mercurial > hg > dmlib

annotate src/dmsimple.c @ 2294:7f6ba3b32f54