dmlib: dmsimple.c annotate

annotate dmsimple.c @ 591:f165883c2ea6

#include the default setup image and font.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 12 Apr 2013 05:26:42 +0300
parents	cf5d44b36851
children	17bf1704d42e

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

Mercurial > hg > dmlib

annotate dmsimple.c @ 591:f165883c2ea6