dmlib: dmsimple.c annotate

annotate dmsimple.c @ 593:17bf1704d42e

More work on video setup.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 12 Apr 2013 05:56:56 +0300
parents	f165883c2ea6
children	695a623eed63

rev	line source
310 713c8018c3ce Fix includes in the dmsimple engine. Matti Hamalainen <ccr@tnsp.org> parents: 278 diff changeset	1 #include <SDL.h>
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	2 #include "dmengine.h"
310 713c8018c3ce Fix includes in the dmsimple engine. Matti Hamalainen <ccr@tnsp.org> parents: 278 diff changeset	3 #include "dmargs.h"
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	4 #include "dmtext.h"
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	5 #include "dmimage.h"
591 f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	6 #include "setupfont.h"
f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	7 #include "setupimage.h"
f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	8
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	10 static DMEngineData engine;
38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	11
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	12 static DMOptArg optList[] =
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	13 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	14 { 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	15 { 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	16 { 2, 'f', "fs", "Fullscreen", OPT_NONE },
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	17 };
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	18
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	19 const int optListN = sizeof(optList) / sizeof(optList[0]);
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	20
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	21
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	22
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	23 static void argShowHelp()
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	24 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	25 dmPrintBanner(stdout, dmProgName, "[options]");
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	26 dmArgsPrintHelp(stdout, optList, optListN);
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	27 }
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	28
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	29
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	30 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	31 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	32 (void) optArg;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	33
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	34 switch (optN)
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	35 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	36 case 0:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	37 argShowHelp();
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	38 exit(0);
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	39 break;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	40
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	41 case 1:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	42 dmVerbosity++;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	43 break;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	44
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	45 case 2:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	46 engine.optVFlags \|= SDL_FULLSCREEN;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	47 break;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	48
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	49 default:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	50 dmError("Unknown option '%s'.\n", currArg);
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	51 return FALSE;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	52 }
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 return TRUE;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	55 }
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
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	58 static void engineAudioCallback(void userdata, Uint8 stream, int len)
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	59 {
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	60 (void) userdata;
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	61
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	62 if (engine.paused)
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	63 {
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	64 memset(stream, 0, len);
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	65 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	66 else
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	67 #ifdef DM_USE_JSS
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	68 {
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	69 if (engine.dev != NULL)
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	70 jvmRenderAudio(engine.dev, stream, len / jvmGetSampleSize(engine.dev));
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	71 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	72 #endif
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	73 #ifdef DM_USE_TREMOR
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	74 if (engine.audioPos + len >= engine.audioRes->rdataSize)
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	75 {
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	76 engine.exitFlag = TRUE;
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	77 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	78 else
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	79 {
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	80 memcpy(stream, engine.audioRes->rdata + engine.audioPos, len);
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	81 engine.audioPos += len;
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	82 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	83 #endif
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	84 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	85
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	86
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	87 static int engineShowProgress(int loaded, int total)
40 a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	88 {
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	89 int dx = 60,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	90 dh = 20,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	91 dw = engine.screen->w - (2 * dx),
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	92 dy = (engine.screen->h - dh) / 2;
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	93
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	94 if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	95 return DMERR_INIT_FAIL;
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	96
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	97 // Draw the progress bar
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	98 dmClearSurface(engine.screen, dmMapRGBA(engine.screen, 0,0,0,0));
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	99 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	100 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	101
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	102 if (total > 0)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	103 {
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	104 dmFillRect(engine.screen,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	105 dx+3, dy+3,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	106 dx + 3 + ((dw - 3) * loaded) / total,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	107 dy + dh - 3,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	108 dmMapRGB(engine.screen, 200,200,200));
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
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	111 // Flip screen
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	112 if (SDL_MUSTLOCK(engine.screen) != 0)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	113 SDL_UnlockSurface(engine.screen);
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	114
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	115 SDL_Flip(engine.screen);
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	116 return DMERR_OK;
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
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	120 static int engineLoadResources()
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 {
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	122 int err, loaded = 0, total = 0;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	123
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	124 // First preload outside of the loop
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	125 err = dmres_preload(engine.resources, TRUE, &loaded, &total);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	127 while ((err = dmres_preload(engine.resources, FALSE, &loaded, &total)) == DMERR_PROGRESS)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 // Show a nice progress bar while loading
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 if (total > 0 && (loaded % 2) == 0)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 {
40 a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	132 if ((err = engineShowProgress(loaded, total)) != DMERR_OK)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	133 return err;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137 return err;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	141 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	142 {
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	143 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	144 width, height, depth, flags);
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	145
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	146 SDL_FreeSurface(engine.screen);
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	147
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	148 engine.screen = SDL_SetVideoMode(width, height, depth, flags);
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	149 if (engine.screen == NULL)
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	150 {
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	151 dmError("Can't SDL_SetVideoMode(): %s\n", SDL_GetError());
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	152 return FALSE;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	153 }
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	154
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	155 SDL_WM_SetCaption(dmProgDesc, dmProgName);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	156
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	157 return TRUE;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	158 }
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	159
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	160
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	161 static BOOL engineInitializeVideo()
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	162 {
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	163 return engineGenInitializeVideo(engine.optVidWidth, engine.optVidHeight,
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	164 engine.optVidDepth, engine.optVFlags);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	165 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	166
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	167
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	168 int engineVideoSetup()
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	169 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	170 DMBitmapFont *font = NULL;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	171 DMResource *file = NULL;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	172 SDL_Surface *menuBgImage = NULL;
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	173 int result, menuState = -1, nmenuList, menuChoice = 0;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	174 DMScaledBlitFunc menuBgBlit;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	175
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	176 // Compute a list of valid modes
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
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	179 // Open video temporarily
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	180 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	181 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	182
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	183 // Fetch and decompress setup image, try regular resources first
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	184 file = dmf_open(engine.resources, "SetupImage.png");
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	185 if (file == NULL)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	186 file = dmf_create_memio(NULL, "SetupImage", engineSetupImage, sizeof(engineSetupImage));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	187
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	188 menuBgImage = dmLoadImage(file);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	189 dmf_close(file);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	190 if (menuBgImage == NULL)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	191 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	192 dmError("Could not instantiate setup screen image, %d: %s\n",
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	193 result, dmErrorStr(result));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	194 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	195 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	196
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	197 if (menuBgImage->w != DM_VSETUP_WIDTH \|\|
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	198 menuBgImage->h != DM_VSETUP_HEIGHT)
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	199 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	200 dmError("Setup screen background image does not match "
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	201 "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	202 menuBgImage->w, menuBgImage->h,
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	203 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	204 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	205 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	206
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	207
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	208 // Load up the bitmap font
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	209 file = dmf_open(engine.resources, "SetupFont.fnt");
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	210 if (file == NULL)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	211 file = dmf_create_memio(NULL, "SetupFont", engineSetupFont, sizeof(engineSetupFont));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	212
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	213 result = dmLoadBitmapFont(file, &font);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	214 dmf_close(file);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	215 if (result != DMERR_OK)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	216 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	217 dmError("Could not instantiate setup screen font, %d: %s\n",
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	218 result, dmErrorStr(result));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	219 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	220 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	221
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	222 menuBgBlit = dmGetScaledBlitFunc(menuBgImage->format, engine.screen->format, DMD_NONE);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	223
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	224 // Enter the main loop of the menu
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	225 menuState = 0;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	226 while (!menuState)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	227 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	228 while (SDL_PollEvent(&engine.event))
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	229 switch (engine.event.type)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	230 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	231 case SDL_KEYDOWN:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	232 switch (engine.event.key.keysym.sym)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	233 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	234 case SDLK_ESCAPE:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	235 menuState = -1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	236 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	237
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	238 case SDLK_SPACE:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	239 case SDLK_RETURN:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	240 menuState = 1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	241 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	242
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	243 case SDLK_UP:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	244 if (menuChoice > 0)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	245 menuChoice--;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	246 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	247
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	248 case SDLK_DOWN:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	249 if (menuChoice < nmenuList - 1)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	250 menuChoice++;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	251 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	252
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	253 default:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	254 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	255 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	256
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	257 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	258
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	259 case SDL_QUIT:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	260 menuState = -1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	261 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	262 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	263
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	264 // Draw frame
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	265 if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	266 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	267 dmError("Can't lock surface.\n");
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	268 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	269 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	270
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	271 // Render the menu
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	272 dmClearSurface(engine.screen, dmMapRGB(engine.screen, 0,0,0));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	273 menuBgBlit(menuBgImage, 0, 0, engine.screen->w, engine.screen->h, engine.screen);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	274
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	275
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	276 // Flip screen
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	277 if (SDL_MUSTLOCK(engine.screen) != 0)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	278 SDL_UnlockSurface(engine.screen);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	279
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	280 SDL_Flip(engine.screen);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	281 SDL_Delay(20);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	282 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	283
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	284 out:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	285 return menuState;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	286 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	287
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	288
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	289 int engineGetVideoAspect(int width, int height)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	290 {
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	291 if (width > 0 && height > 0)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	292 return (width * 1000) / height;
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	293 else
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	294 return 1;
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	295 }
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	296
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	297
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298 int main(int argc, char *argv[])
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 int err;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 BOOL initSDL = FALSE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 memset(&engine, 0, sizeof(engine));
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 // Pre-initialization
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	306 if ((err = demoPreInit(&engine)) != DMERR_OK)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	309 if (!dmArgsProcess(argc, argv, optList, optListN,
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	310 argHandleOpt, NULL, FALSE))
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	311 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	312
6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	313 dmPrint(0,
6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	314 "%s\n"
312 99dc5d012081 Change startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	315 "%s\n"
99dc5d012081 Change startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	316 "TNSP simple demoengine initializing.\n",
123 6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	317 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	318
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	319 dmPrint(0,
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	320 "Using libSDL, "
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	321 #ifdef DM_USE_PACKFS
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	322 "zlib, "
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	323 #endif
125 5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	324 #ifdef DM_USE_TREMOR
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	325 "Tremor Vorbis codec"
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	326 #endif
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	327 " 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	328 "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	329
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 // Initialize resource subsystem
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 dmPrint(1, "Initializing resources subsystem.\n");
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	332 if ((err = dmres_init(&engine.resources, engine.optPackFilename, engine.optDataPath, engine.optResFlags, engineClassifier)) != DMERR_OK)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	334 dmError("Could not initialize resource manager, #%d: %s.\n", err, dmErrorStr(err));
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 // Initialize SDL components
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	339 dmPrint(1, "Initializing libSDL.\n");
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 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	341 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342 dmError("Could not initialize SDL: %s\n", SDL_GetError());
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 initSDL = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	347
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	348 // Present video mode selector
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	349 if (engine.optVidAspect <= 0)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	350 engine.optVidAspect = engineGetVideoAspect(engine.optVidWidth, engine.optVidHeight);
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	351
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	352 if (engine.optVidSetup)
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	353 {
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	354 if ((err = engineVideoSetup()) <= 0)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	355 goto error_exit;
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	356 }
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	357
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	358 // Initialize audio parts
126 97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	359 if (engine.optAfmt.freq == 0 && engine.optAfmt.channels == 0)
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	360 {
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	361 // Defaults, if none seem to be set
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	362 engine.optAfmt.freq = 44100;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	363 engine.optAfmt.format = AUDIO_S16SYS;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	364 engine.optAfmt.channels = 2;
316 a03e604f4e75 Adjust audio buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	365 engine.optAfmt.samples = engine.optAfmt.freq / 16;
126 97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	366 }
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	367
d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	368 #ifdef DM_USE_JSS
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 jssInit();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	371 switch (engine.optAfmt.format)
d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	372 {
110 8db49a23b393 Fixes to make the JSS audio subsystem support work again in the engine framework. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	373 case AUDIO_S16SYS: engine.jss_format = JSS_AUDIO_S16; break;
8db49a23b393 Fixes to make the JSS audio subsystem support work again in the engine framework. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	374 case AUDIO_U16SYS: engine.jss_format = JSS_AUDIO_U16; break;
8db49a23b393 Fixes to make the JSS audio subsystem support work again in the engine framework. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	375 case AUDIO_S8: engine.jss_format = JSS_AUDIO_S8; break;
8db49a23b393 Fixes to make the JSS audio subsystem support work again in the engine framework. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	376 case AUDIO_U8: engine.jss_format = JSS_AUDIO_U8; break;
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	377 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	379 dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n",
110 8db49a23b393 Fixes to make the JSS audio subsystem support work again in the engine framework. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	380 engine.jss_format, engine.optAfmt.channels, engine.optAfmt.freq);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381
110 8db49a23b393 Fixes to make the JSS audio subsystem support work again in the engine framework. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	382 if ((engine.dev = jvmInit(engine.jss_format, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 dmError("jvmInit() returned NULL, voi perkele.\n");
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388 if ((engine.plr = jmpInit(engine.dev)) == NULL)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 dmError("jmpInit() returned NULL\n");
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392 }
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	393 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 // Initialize SDL audio
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	396 dmPrint(1, "Trying to init SDL audio with: fmt=%d, chn=%d, freq=%d\n",
d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	397 engine.optAfmt.format, engine.optAfmt.channels, engine.optAfmt.freq);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	399 engine.optAfmt.callback = engineAudioCallback;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	401 if (SDL_OpenAudio(&engine.optAfmt, NULL) < 0)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 {
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	403 dmError("Couldn't open SDL audio: %s\n", SDL_GetError());
571 8a98037c5cf7 Work with no sound as well. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	404 // goto error_exit;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 // Initialize SDL video
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	408 if (engine.demoInitPreVideo != NULL &&
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	409 (err = engine.demoInitPreVideo(&engine)) != DMERR_OK)
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	410 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	411 dmError("demoInitPreVideo() failed, #%d: %s\n", err, dmErrorStr(err));
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	412 goto error_exit;
ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	413 }
ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	414
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	415 if (!engineInitializeVideo())
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	418 if (engine.demoInitPostVideo != NULL &&
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	419 (err = engine.demoInitPostVideo(&engine)) != DMERR_OK)
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	420 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	421 dmError("demoInitPostVideo() failed, #%d: %s\n", err, dmErrorStr(err));
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	422 goto error_exit;
ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	423 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	425 // Hide cursor
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	426 SDL_ShowCursor(SDL_DISABLE);
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	427
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 // Load resources
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	429 dmPrint(1, "Loading resources, please wait...\n");
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 if ((err = engineLoadResources()) != DMERR_OK)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	432 dmError("Error loading resources, #%d: %s.\n",
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	433 err, dmErrorStr(err));
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 // Final initializations
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	438 if ((err = engine.demoInit(&engine)) != DMERR_OK)
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	439 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	440 dmError("Failure in demoInit(), #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	441 err, dmErrorStr(err));
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	442 goto error_exit;
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	443 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	444
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	445 // Initialize effects
369 e1c984404b6b Re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 367 diff changeset	446 if ((err = engineInitializeEffects(&engine)) != DMERR_OK)
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	447 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	448 dmError("Effects initialization failed, #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	449 err, dmErrorStr(err));
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	450 goto error_exit;
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	451 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	452
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	453 // Use a timeline, if set
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	454 #ifdef DM_USE_TIMELINE
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	455 if (engine.timeline != NULL)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	456 {
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	457 if ((err = dmLoadTimeline(engine.timeline, &engine.tl)) != DMERR_OK)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	458 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	459 dmError("Error loading timeline, #%d: %s\n", err,
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	460 dmErrorStr(err));
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	461 goto error_exit;
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	462 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	463
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	464 if ((err = dmPrepareTimeline(engine.tl, engine.ptl)) != DMERR_OK)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	465 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	466 dmError("Error creating prepared timeline, #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	467 err, dmErrorStr(err));
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	468 goto error_exit;
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	469 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	470 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	471 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	473 dmPrint(1, "Starting up.\n");
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	474
919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	475 SDL_LockAudio();
41 780300a8d322 Move SDL_PauseAudio(0) to the "engine" instead of the demo code. Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	476 SDL_PauseAudio(0);
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	477 SDL_UnlockAudio();
919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	478
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479 engine.startTime = SDL_GetTicks();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 while (!engine.exitFlag)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483 while (SDL_PollEvent(&engine.event))
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 switch (engine.event.type)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486 case SDL_KEYDOWN:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 switch (engine.event.key.keysym.sym)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489 case SDLK_ESCAPE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490 engine.exitFlag = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 case SDLK_SPACE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 engine.pauseFlag = !engine.pauseFlag;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496
336 13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	497 case SDLK_f:
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	498 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	499 if (!engineInitializeVideo())
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	500 goto error_exit;
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	501 break;
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	502
109 3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	503 case SDLK_RETURN:
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	504 if (engine.event.key.keysym.mod & KMOD_ALT)
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	505 {
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	506 engine.optVFlags ^= SDL_FULLSCREEN;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	507 if (!engineInitializeVideo())
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	508 goto error_exit;
109 3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	509 }
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	510 break;
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	511
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 default:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 case SDL_VIDEOEXPOSE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 case SDL_QUIT:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 engine.exitFlag = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 // Draw frame
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	527 engine.frameTime = SDL_GetTicks();
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	528 if (engine.pauseFlag != engine.paused)
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	529 {
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	530 engine.paused = engine.pauseFlag;
367 9875c65029af Work towards re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 366 diff changeset	531 engine.pauseTime = engineGetTick(&engine);
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	532 }
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	533
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	534 if (engine.paused)
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	535 {
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	536 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	537 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539 if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 dmError("Can't lock surface.\n");
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 // Call main tick
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	546 if (engine.demoRender != NULL)
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	547 {
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	548 if ((err = engine.demoRender(&engine)) != DMERR_OK)
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	549 goto error_exit;
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	550 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	551 #ifdef DM_USE_TIMELINE
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	552 else
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	553 {
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	554 if ((err = dmExecuteTimeline(engine.ptl, engine.screen, engineGetTick(&engine))) != DMERR_OK)
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	555 goto error_exit;
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	556 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	557 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 // Flip screen
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 if (SDL_MUSTLOCK(engine.screen) != 0)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 SDL_UnlockSurface(engine.screen);
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 SDL_Flip(engine.screen);
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	564 SDL_Delay(engine.paused ? 100 : 20);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	566 engine.frameCount++;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 // Print benchmark results
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 engine.endTime = SDL_GetTicks();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571 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	572 engine.frameCount, engine.endTime - engine.startTime,
bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	573 (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	574
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 error_exit:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 dmPrint(1, "Shutting down.\n");
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 SDL_ShowCursor(SDL_ENABLE);
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	581 SDL_LockAudio();
919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	582 SDL_PauseAudio(1);
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	583 #ifdef DM_USE_JSS
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 jmpClose(engine.plr);
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 jvmClose(engine.dev);
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 jssClose();
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	587 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588 SDL_UnlockAudio();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	590 #ifdef DM_USE_TIMELINE
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	591 dmFreeTimeline(engine.tl);
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	592 dmFreePreparedTimelineData(engine.ptl);
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	593 #endif
14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	594
369 e1c984404b6b Re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 367 diff changeset	595 engineShutdownEffects(&engine);
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	596 dmres_close(engine.resources);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	598 if (engine.demoShutdown != NULL)
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	599 engine.demoShutdown(&engine);
94 4bbfc0274b29 Change some function names, etc. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	600
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 if (initSDL)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 SDL_Quit();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	604 if (engine.demoQuit != NULL)
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	605 engine.demoQuit(&engine);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 return 0;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 }

Mercurial > hg > dmlib

annotate dmsimple.c @ 593:17bf1704d42e