dmlib: dmsimple.c annotate

annotate dmsimple.c @ 578:cf5d44b36851

Add some initial code for video setup screen.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 12 Apr 2013 04:44:25 +0300
parents	2c3afff104c6
children	f165883c2ea6

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

Mercurial > hg > dmlib

annotate dmsimple.c @ 578:cf5d44b36851