dmlib: dmsimple.c annotate

annotate dmsimple.c @ 641:c3852e49a610

Change how audio configuration works.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 15 Apr 2013 09:20:45 +0300
parents	55743025d628
children	0888971cbff8

rev	line source
310 713c8018c3ce Fix includes in the dmsimple engine. Matti Hamalainen <ccr@tnsp.org> parents: 278 diff changeset	1 #include <SDL.h>
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	2 #include "dmengine.h"
310 713c8018c3ce Fix includes in the dmsimple engine. Matti Hamalainen <ccr@tnsp.org> parents: 278 diff changeset	3 #include "dmargs.h"
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	4 #include "dmtext.h"
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	5 #include "dmimage.h"
591 f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	6 #include "setupfont.h"
f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	7 #include "setupimage.h"
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	8 #include "setupmenubar.h"
591 f165883c2ea6 #include the default setup image and font. Matti Hamalainen <ccr@tnsp.org> parents: 578 diff changeset	9
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	10 static const char *engineSetupDataName = "SetupData.txt";
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	11 static const char *engineSetupImageName = "SetupImage.png";
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	12 static const char *engineSetupMenuBarName = "SetupMenuBar.png";
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	13 static const char *engineSetupFontName = "SetupFont.dmf";
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	15 static DMEngineData engine;
38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	16
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	17 static DMOptArg optList[] =
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 { 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	20 { 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	21 };
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	22
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	23 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	24
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 static void argShowHelp()
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 dmPrintBanner(stdout, dmProgName, "[options]");
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	30 dmArgsPrintHelp(stdout, optList, optListN);
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
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 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	35 {
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	36 (void) optArg;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	37
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	38 switch (optN)
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 0:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	41 argShowHelp();
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	42 exit(0);
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	43 break;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	44
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	45 case 1:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	46 dmVerbosity++;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	47 break;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	48
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	49 default:
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	50 dmError("Unknown option '%s'.\n", currArg);
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	51 return FALSE;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	52 }
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	53
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	54 return TRUE;
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	55 }
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	56
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	57
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	58 static void engineAudioCallback(void userdata, Uint8 stream, int len)
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	59 {
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	60 (void) userdata;
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	61
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	62 if (engine.paused)
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	63 {
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	64 memset(stream, 0, len);
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	65 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	66 else
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	67 switch (engine.optAudioSetup)
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	68 {
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	69 #ifdef DM_USE_JSS
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	70 case DM_ASETUP_JSS:
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	71 if (engine.dev != NULL)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	72 jvmRenderAudio(engine.dev, stream, len / jvmGetSampleSize(engine.dev));
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	73 break;
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	74 #endif
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	75 #ifdef DM_USE_TREMOR
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	76 case DM_ASETUP_TREMOR:
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	77 if (engine.audioPos + len >= engine.audioRes->rdataSize)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	78 engine.exitFlag = TRUE;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	79 else
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	80 {
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	81 memcpy(stream, engine.audioRes->rdata + engine.audioPos, len);
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	82 engine.audioPos += len;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	83 }
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	84 break;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	85 #endif
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	86
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	87 default:
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	88 break;
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	89 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	90 }
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	91
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	92
c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	93 static int engineShowProgress(int loaded, int total)
40 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 int dx = 60,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	96 dh = 20,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	97 dw = engine.screen->w - (2 * dx),
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	98 dy = (engine.screen->h - dh) / 2;
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 (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	101 return DMERR_INIT_FAIL;
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	102
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	103 // Draw the progress bar
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	104 dmClearSurface(engine.screen, dmMapRGBA(engine.screen, 0,0,0,0));
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	105 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	106 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	107
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	108 if (total > 0)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	109 {
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	110 dmFillRect(engine.screen,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	111 dx+3, dy+3,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	112 dx + 3 + ((dw - 3) * loaded) / total,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	113 dy + dh - 3,
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	114 dmMapRGB(engine.screen, 200,200,200));
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 // Flip screen
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	118 if (SDL_MUSTLOCK(engine.screen) != 0)
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	119 SDL_UnlockSurface(engine.screen);
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	120
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	121 SDL_Flip(engine.screen);
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	122 return DMERR_OK;
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	123 }
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	124
a239b7d4e13b Modularize progress meter. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	125
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	126 static int engineLoadResources()
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 {
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	128 int err, loaded = 0, total = 0;
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	129 BOOL first = TRUE;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	130
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	131 do
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 // Show a nice progress bar while loading
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	134 if ((err = engineShowProgress(loaded, total)) != DMERR_OK)
35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	135 return err;
35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	136
35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	137 err = dmres_preload(engine.resources, first, &loaded, &total);
35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	138 first = FALSE;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 }
617 35c4fecad3fc Improve resource loading screen. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	140 while (err == DMERR_PROGRESS);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 return err;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	146 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	147 {
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	148 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	149 width, height, depth, flags);
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	150
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	151 SDL_FreeSurface(engine.screen);
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	152
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	153 engine.screen = SDL_SetVideoMode(width, height, depth, flags);
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	154 if (engine.screen == NULL)
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 dmError("Can't SDL_SetVideoMode(): %s\n", SDL_GetError());
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	157 return FALSE;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	158 }
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	159
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	160 SDL_WM_SetCaption(dmProgDesc, dmProgName);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	161
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	162 return TRUE;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	163 }
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	164
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	165
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	166 static BOOL engineInitializeVideo()
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	167 {
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	168 return engineGenInitializeVideo(engine.optVidWidth, engine.optVidHeight,
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	169 engine.optVidDepth, engine.optVFlags);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	170 }
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
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	173 typedef struct
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	174 {
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	175 int w, h, aspect;
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	176 } DMModeEntry;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	177
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	178
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	179 DMModeEntry *engineModeList = NULL;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	180 int nengineModeList = 0, aengineModeList = 0;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	181
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	182
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	183 static int engineModeSort(const void pa, const void pb)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	184 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	185 DMModeEntry
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	186 va = (DMModeEntry ) pa,
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	187 vb = (DMModeEntry ) pb;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	188
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	189 return (va->w - vb->w);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	190 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	191
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	192
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	193 int engineAddModeToList(int w, int h)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	194 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	195 DMModeEntry *mode;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	196 int i;
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	197 int aspect = engineGetVideoAspect(w, h);
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	198
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	199 if (aspect <= 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	200 return DMERR_INVALID_ARGS;
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	201
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	202 // Check if the mode is already in our list
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	203 for (i = 0; i < nengineModeList; i++)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	204 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	205 mode = &engineModeList[i];
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	206 if (mode->w == w && mode->h == h)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	207 return DMERR_OK;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	208 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	209
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	210 // Check if the mode fits our criteria
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	211 switch (engine.optVidSetup)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	212 {
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	213 case DM_VSETUP_ASPECT:
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	214 if (aspect != engine.optVidAspect)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	215 return DMERR_OK;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	216 break;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	217
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	218 case DM_VSETUP_ANY:
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	219 break;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	220 }
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	221
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	222 // Reallocate array if needed
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	223 if (nengineModeList + 1 >= aengineModeList)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	224 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	225 aengineModeList += 16;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	226 engineModeList = dmRealloc(engineModeList, sizeof(DMModeEntry) * aengineModeList);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	227 if (engineModeList == NULL)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	228 return DMERR_MALLOC;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	229 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	230
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	231 // Store
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	232 mode = &engineModeList[nengineModeList];
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	233 mode->w = w;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	234 mode->h = h;
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	235 mode->aspect = engineGetVideoAspect(w, h);
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	236
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	237 nengineModeList++;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	238
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	239 return DMERR_OK;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	240 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	241
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	242
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	243 int engineParseSetupConfig(const char *filename)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	244 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	245 DMResource *file = NULL;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	246 int res = DMERR_OK;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	247 char buf[128];
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	248
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	249 if ((file = dmf_open(engine.resources, filename)) == NULL)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	250 return DMERR_FOPEN;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	251
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	252 while (dmfgets(buf, sizeof(buf), file) != NULL)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	253 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	254 ssize_t pos;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	255 // Trim line ending
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	256 for (pos = strlen(buf) - 1; pos >= 0 && isspace(buf[pos]); pos--)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	257 buf[pos] = 0;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	258
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	259 // Find start of the line
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	260 for (pos = 0; isspace(buf[pos]); pos++);
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	261
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	262 // Skip empty lines and comments
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	263 if (buf[pos] == 0 \|\| buf[pos] == '#')
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	264 continue;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	265
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	266 if (sscanf(buf+pos, "menuPos %f %f",
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	267 &engine.setupMenuPos.x, &engine.setupMenuPos.y) != 2 &&
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	268 sscanf(buf+pos, "menuDim %f %f",
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	269 &engine.setupMenuDim.x, &engine.setupMenuDim.y) != 2 &&
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	270 sscanf(buf+pos, "text1Pos %f %f",
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	271 &engine.setupText1Pos.x, &engine.setupText1Pos.y) != 2 &&
635 7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	272 sscanf(buf+pos, "menuCenter %d", &engine.setupMenuCenter) != 1 &&
7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	273 sscanf(buf+pos, "textCondensed %d", &engine.setupTextCondensed) != 1)
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	274 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	275 dmError("Syntax error in configuration:\n%s\n", buf);
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	276 res = DMERR_INVALID_DATA;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	277 goto out;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	278 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	279 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	280
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	281 out:
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	282 dmf_close(file);
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	283 return res;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	284 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	285
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	286
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	287 static inline DMFloat vsX(DMVector vec)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	288 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	289 return (DMFloat) engine.screen->w * vec.x;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	290 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	291
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	292
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	293 static inline DMFloat vsY(DMVector vec)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	294 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	295 return (DMFloat) engine.screen->h * vec.y;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	296 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	297
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	298
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	299 int engineVideoSetup()
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	300 {
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	301 DMBitmapFont *menuFont = NULL;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	302 DMResource *file = NULL;
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	303 SDL_Surface menuBgImage = NULL, menuBarImage = NULL;
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	304 int result, menuState = -1;
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	305 BOOL menuFullScreen = TRUE;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	306
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	307 // Compute a list of valid modes
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	308 if (!engineGenInitializeVideo(DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT, engine.optVidDepth, engine.optVFlags))
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	309 goto out;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	310
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	311 SDL_Rect **modes = SDL_ListModes(engine.screen->format, engine.screen->flags \| SDL_FULLSCREEN);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	312 if (modes == (SDL_Rect**) 0)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	313 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	314 dmError("No compatible video resolutions/depths available at all. Bailing out.\n");
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	315 goto out;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	316 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	317
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	318 if (modes != (SDL_Rect**) -1)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	319 {
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	320 int i;
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	321 for (i = 0; modes[i] != NULL; i++)
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	322 engineAddModeToList(modes[i]->w, modes[i]->h);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	323 }
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	324
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	325 if (nengineModeList == 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	326 {
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	327 dmError("Umm, no modes found.\n");
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	328 goto out;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	329 }
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	330
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	331 qsort(engineModeList, nengineModeList, sizeof(engineModeList[0]), engineModeSort);
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	332
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	333 // Open video temporarily
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	334 if (!engineGenInitializeVideo(DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT, 32, SDL_SWSURFACE \| SDL_DOUBLEBUF))
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	335 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	336
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	337 // Get setup data
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	338 if (engineParseSetupConfig(engineSetupDataName) != DMERR_OK)
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	339 {
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	340 engine.setupMenuPos.x = 0.18750f;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	341 engine.setupMenuPos.y = 0.41666f;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	342 engine.setupMenuDim.x = 0.625f;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	343 engine.setupMenuDim.y = 0.41666f;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	344
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	345 engine.setupText1Pos.x = 0.3f;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	346 engine.setupText1Pos.y = 0.7f;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	347 }
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	348
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	349 // Fetch and decompress setup image, try regular resources first
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	350 file = dmf_open(engine.resources, engineSetupImageName);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	351 if (file == NULL)
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	352 file = dmf_create_memio(NULL, engineSetupImageName, engineSetupImage, sizeof(engineSetupImage));
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	353
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	354 menuBgImage = dmLoadImage(file);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	355 dmf_close(file);
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	356
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	357 file = dmf_open(engine.resources, engineSetupMenuBarName);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	358 if (file == NULL)
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	359 file = dmf_create_memio(NULL, engineSetupMenuBarName, engineSetupMenuBar, sizeof(engineSetupMenuBar));
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	360
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	361 menuBarImage = dmLoadImage(file);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	362 dmf_close(file);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	363
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	364 if (menuBgImage == NULL \|\| menuBarImage == NULL)
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	365 {
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	366 dmError("Could not instantiate setup screen images, %d: %s\n",
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	367 result, dmErrorStr(result));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	368 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	369 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	370
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	371 if (menuBgImage->w != DM_VSETUP_WIDTH \|\|
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	372 menuBgImage->h != DM_VSETUP_HEIGHT)
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	373 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	374 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	375 "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	376 menuBgImage->w, menuBgImage->h,
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	377 DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	378 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	379 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	380
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	381
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	382 // Load up the bitmap font
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	383 file = dmf_open(engine.resources, engineSetupFontName);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	384 if (file == NULL)
603 36b544eb6f4b Fixes in resource management. Matti Hamalainen <ccr@tnsp.org> parents: 600 diff changeset	385 file = dmf_create_memio(NULL, engineSetupFontName, engineSetupFont, sizeof(engineSetupFont));
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	386
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	387 result = dmLoadBitmapFont(file, &menuFont);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	388 dmf_close(file);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	389 if (result != DMERR_OK)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	390 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	391 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	392 result, dmErrorStr(result));
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	393 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	394 }
614 eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	395
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	396 SDL_Surface *tmp = dmConvertScaledSurface(menuBgImage,
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	397 engine.screen->format, engine.screen->flags,
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	398 engine.screen->w, engine.screen->h);
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	399 if (tmp == NULL)
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	400 {
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	401 dmError("Could not convert setup screen background image.\n");
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	402 goto out;
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	403 }
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	404
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	405 SDL_FreeSurface(menuBgImage);
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	406 menuBgImage = tmp;
eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	407
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	408 SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	409
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	410
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	411 // Enter the main loop of the menu
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	412 char menuStr[64];
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	413 int menuOffset = 0,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	414 menuIndex = 0,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	415 menuEntryHeight = menuFont->height + 2,
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	416 menuHeight = vsY(engine.setupMenuDim) / menuEntryHeight;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	417
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	418 menuState = 0;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	419
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	420 engine.startTime = SDL_GetTicks();
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	421
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	422 while (!menuState)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	423 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	424 while (SDL_PollEvent(&engine.event))
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	425 switch (engine.event.type)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	426 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	427 case SDL_KEYDOWN:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	428 switch (engine.event.key.keysym.sym)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	429 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	430 case SDLK_ESCAPE:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	431 menuState = -1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	432 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	433
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	434 case SDLK_RETURN:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	435 menuState = 1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	436 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	437
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	438 case SDLK_UP:
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	439 if (menuIndex > 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	440 menuIndex--;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	441 else
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	442 if (menuOffset > 0)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	443 menuOffset--;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	444 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	445
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	446 case SDLK_DOWN:
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	447 if (menuIndex < menuHeight - 1 && menuOffset + menuIndex < nengineModeList - 1)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	448 menuIndex++;
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	449 else
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	450 if (menuOffset + menuIndex < nengineModeList - 1)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	451 menuOffset++;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	452 break;
632 78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	453
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	454 case SDLK_LEFT:
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	455 menuFullScreen = FALSE;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	456 break;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	457
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	458 case SDLK_RIGHT:
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	459 menuFullScreen = TRUE;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	460 break;
78cef1000a18 Make left/right arrow keys to set windowed/fullscreen. Matti Hamalainen <ccr@tnsp.org> parents: 631 diff changeset	461
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	462 case SDLK_SPACE:
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	463 menuFullScreen = !menuFullScreen;
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	464 break;
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	465
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	466 default:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	467 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	468 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	469
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	470 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	471
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	472 case SDL_QUIT:
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	473 menuState = -1;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	474 break;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	475 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	476
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	477 // Draw frame
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	478 engine.frameTime = SDL_GetTicks();
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	479 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	480 {
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	481 dmError("Can't lock surface.\n");
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	482 goto out;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	483 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	484
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	485 // Render the menu
614 eed8d6abd89b Pre-convert/scale menu background and use direct blitting. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	486 dmDirectBlitSurface(menuBgImage, engine.screen);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	487
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	488 // XXX/TODO: Some hardcoded bits here ...
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	489 float t = engineGetTimeDT(&engine);
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	490 int index, entry;
615 024bc22c54d7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	491
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	492 for (index = 0, entry = menuOffset; entry < nengineModeList && index < menuHeight; index++, entry++)
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	493 {
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	494 DMModeEntry *mode = &engineModeList[entry];
6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	495
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	496 if (entry == menuOffset + menuIndex)
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	497 {
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	498 dmScaledBlitSurface32to32TransparentGA(menuBarImage,
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	499 vsX(engine.setupMenuPos),
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	500 vsY(engine.setupMenuPos) + (index * menuEntryHeight),
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	501 vsX(engine.setupMenuDim),
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	502 menuEntryHeight + 2,
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	503 engine.screen,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	504 200 + sin(t * 10.0) * 50);
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	505 }
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	506
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	507 snprintf(menuStr, sizeof(menuStr),
620 5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	508 "%4d X %4d [%d:%d]",
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	509 mode->w, mode->h,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	510 mode->aspect / 1000,
5fda51e99fe5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 619 diff changeset	511 mode->aspect % 1000);
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	512
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	513 DMFloat posX = engine.setupMenuCenter ?
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	514 2.0f + (vsX(engine.setupMenuDim) - menuFont->width * strlen(menuStr)) / 2.0f :
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	515 2.0f;
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	516
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	517 dmDrawBMTextConst(
635 7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	518 engine.screen, menuFont,
7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	519 engine.setupTextCondensed, DMD_TRANSPARENT,
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	520 vsX(engine.setupMenuPos) + posX,
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	521 vsY(engine.setupMenuPos) + 2 + (index * menuEntryHeight),
597 8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	522 menuStr);
8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	523 }
8a9361179a1a More work on the video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 595 diff changeset	524
619 6c23042c546f Aaaand some more work on mode selector. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	525 dmDrawBMTextConst(
635 7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	526 engine.screen, menuFont,
7092cd50bc08 Add condensed text configuration option to setup screen config. Matti Hamalainen <ccr@tnsp.org> parents: 632 diff changeset	527 engine.setupTextCondensed, DMD_TRANSPARENT,
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	528 vsX(engine.setupText1Pos),
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	529 vsY(engine.setupText1Pos),
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	530 menuFullScreen ?
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	531 "FULLSCREEN" :
dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	532 " WINDOWED ");
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	533
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	534 // Flip screen
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	535 if (SDL_MUSTLOCK(engine.screen) != 0)
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	536 SDL_UnlockSurface(engine.screen);
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	537
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	538 SDL_Flip(engine.screen);
616 ed4536641796 A bit slower screen update rate. Matti Hamalainen <ccr@tnsp.org> parents: 615 diff changeset	539 SDL_Delay(25);
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	540 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	541
621 3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	542 // Okay, we accepted the selection
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	543 if (menuState == 1)
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	544 {
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	545 DMModeEntry *mode = &engineModeList[menuOffset + menuIndex];
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	546 engine.optVidWidth = mode->w;
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	547 engine.optVidHeight = mode->h;
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	548 engine.optVidAspect = mode->aspect;
623 dfdff30ad363 Some more work. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	549 if (menuFullScreen)
621 3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	550 engine.optVFlags \|= SDL_FULLSCREEN;
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	551 }
3a9d92533312 More work. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	552
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	553 out:
608 9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	554 SDL_FreeSurface(menuBgImage);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	555 SDL_FreeSurface(menuBarImage);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	556 dmFreeBitmapFont(menuFont);
9620208f7ff4 More work on setup. Matti Hamalainen <ccr@tnsp.org> parents: 603 diff changeset	557
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	558 return menuState;
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	559 }
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	560
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	561
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	562 int engineGetVideoAspect(int width, int height)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	563 {
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	564 if (width > 0 && height > 0)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	565 return (width * 1000) / height;
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	566 else
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	567 return 1;
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	568 }
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	569
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	570
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571 int main(int argc, char *argv[])
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 int err;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574 BOOL initSDL = FALSE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 memset(&engine, 0, sizeof(engine));
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 // Pre-initialization
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	579 if ((err = demoPreInit(&engine)) != DMERR_OK)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581
121 16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	582 if (!dmArgsProcess(argc, argv, optList, optListN,
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	583 argHandleOpt, NULL, FALSE))
16fc6e6cf3b5 Move option handling to the simple demo engine. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	584 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	585
6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	586 dmPrint(0,
6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	587 "%s\n"
631 25656351f5f9 Remove the note about TNSP simple demoengine. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	588 "%s\n",
123 6f7356f3b91c Add engine startup messages showing prod name and "TNSP simple demoengine blurb". Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	589 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	590
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	591 dmPrint(0,
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	592 "Using libSDL, "
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	593 #ifdef DM_USE_PACKFS
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	594 "zlib, "
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	595 #endif
125 5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	596 #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	597 "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	598 #endif
5102ec9e9bce Add a blurb about used features/3rd party code (zlib, Tremor, SDL). Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	599 " 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	600 "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	601
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 // Initialize resource subsystem
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 dmPrint(1, "Initializing resources subsystem.\n");
600 663ae037bc00 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 599 diff changeset	604 if ((err = dmres_init(&engine.resources, engine.optPackFilename,
663ae037bc00 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 599 diff changeset	605 engine.optDataPath, engine.optResFlags, engineClassifier)) != DMERR_OK)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	607 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	608 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 // Initialize SDL components
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	612 dmPrint(1, "Initializing libSDL.\n");
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 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	614 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 dmError("Could not initialize SDL: %s\n", SDL_GetError());
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 initSDL = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	620
cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	621 // Present video mode selector
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	622 if (engine.optVidAspect <= 0)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	623 engine.optVidAspect = engineGetVideoAspect(engine.optVidWidth, engine.optVidHeight);
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	624
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	625 if (engine.optVidSetup)
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	626 {
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	627 if ((err = engineVideoSetup()) <= 0)
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	628 goto error_exit;
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	629 }
578 cf5d44b36851 Add some initial code for video setup screen. Matti Hamalainen <ccr@tnsp.org> parents: 574 diff changeset	630
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	631 // Initialize audio parts
126 97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	632 if (engine.optAfmt.freq == 0 && engine.optAfmt.channels == 0)
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	633 {
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	634 engine.optAfmt.freq = 44100;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	635 engine.optAfmt.format = AUDIO_S16SYS;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	636 engine.optAfmt.channels = 2;
97488948215c Allow setting audio format settings. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	637 }
640 55743025d628 Change audio default setup. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	638
55743025d628 Change audio default setup. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	639 if (engine.optAfmt.samples == 0)
55743025d628 Change audio default setup. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	640 engine.optAfmt.samples = engine.optAfmt.freq / 16;
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	641
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	642 switch (engine.optAudioSetup)
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	643 {
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	644 case DM_ASETUP_JSS:
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	645 #ifdef DM_USE_JSS
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	646 jssInit();
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	647
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	648 switch (engine.optAfmt.format)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	649 {
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	650 case AUDIO_S16SYS: engine.jss_format = JSS_AUDIO_S16; break;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	651 case AUDIO_U16SYS: engine.jss_format = JSS_AUDIO_U16; break;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	652 case AUDIO_S8: engine.jss_format = JSS_AUDIO_S8; break;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	653 case AUDIO_U8: engine.jss_format = JSS_AUDIO_U8; break;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	654 }
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	655
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	656 dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n",
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	657 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	658
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	659 if ((engine.dev = jvmInit(engine.jss_format, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	660 {
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	661 dmError("jvmInit() returned NULL, voi perkele.\n");
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	662 goto error_exit;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	663 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	665 if ((engine.plr = jmpInit(engine.dev)) == NULL)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	666 {
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	667 dmError("jmpInit() returned NULL\n");
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	668 goto error_exit;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	669 }
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	670 #else
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	671 dmError("miniJSS support not included.\n");
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	672 #endif
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	673 break;
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	674
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	675 case DM_ASETUP_TREMOR:
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	676 #ifndef DM_USE_TREMOR
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	677 dmError("Tremor support not included.\n");
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	678 #endif
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	679 break;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 // Initialize SDL audio
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	683 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	684 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	685
342 c6ec970dc3cf Separate some demo engine parts to two different modules. Matti Hamalainen <ccr@tnsp.org> parents: 336 diff changeset	686 engine.optAfmt.callback = engineAudioCallback;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	688 if (SDL_OpenAudio(&engine.optAfmt, NULL) < 0)
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 {
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	690 dmError("Couldn't open SDL audio: %s\n", SDL_GetError());
595 695a623eed63 Add a comment about no-sound support to the relevant part in audio setup Matti Hamalainen <ccr@tnsp.org> parents: 593 diff changeset	691 // We'll let this pass, as we want to support no-sound.
695a623eed63 Add a comment about no-sound support to the relevant part in audio setup Matti Hamalainen <ccr@tnsp.org> parents: 593 diff changeset	692 // goto error_exit;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	695 // Initialize SDL video
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	696 if (engine.demoInitPreVideo != NULL &&
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	697 (err = engine.demoInitPreVideo(&engine)) != DMERR_OK)
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	698 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	699 dmError("demoInitPreVideo() failed, #%d: %s\n", err, dmErrorStr(err));
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	700 goto error_exit;
ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	701 }
ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	702
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	703 if (!engineInitializeVideo())
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	706 if (engine.demoInitPostVideo != NULL &&
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	707 (err = engine.demoInitPostVideo(&engine)) != DMERR_OK)
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	708 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	709 dmError("demoInitPostVideo() failed, #%d: %s\n", err, dmErrorStr(err));
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	710 goto error_exit;
ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	711 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	712
593 17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	713 // Hide cursor
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	714 SDL_ShowCursor(SDL_DISABLE);
17bf1704d42e More work on video setup. Matti Hamalainen <ccr@tnsp.org> parents: 591 diff changeset	715
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716 // Load resources
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	717 dmPrint(1, "Loading resources, please wait...\n");
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	718 if ((err = engineLoadResources()) != DMERR_OK)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	719 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	720 dmError("Error loading resources, #%d: %s.\n",
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721 err, dmErrorStr(err));
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	723 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725 // Final initializations
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	726 if ((err = engine.demoInit(&engine)) != DMERR_OK)
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	727 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	728 dmError("Failure in demoInit(), #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	729 err, dmErrorStr(err));
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	730 goto error_exit;
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	731 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	732
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	733 // Initialize effects
369 e1c984404b6b Re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 367 diff changeset	734 if ((err = engineInitializeEffects(&engine)) != DMERR_OK)
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	735 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	736 dmError("Effects initialization failed, #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	737 err, dmErrorStr(err));
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	738 goto error_exit;
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	739 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	740
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	741 // Use a timeline, if set
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	742 #ifdef DM_USE_TIMELINE
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	743 if (engine.timeline != NULL)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	744 {
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	745 if ((err = dmLoadTimeline(engine.timeline, &engine.tl)) != DMERR_OK)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	746 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	747 dmError("Error loading timeline, #%d: %s\n", err,
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	748 dmErrorStr(err));
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	749 goto error_exit;
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	750 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	751
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	752 if ((err = dmPrepareTimeline(engine.tl, engine.ptl)) != DMERR_OK)
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	753 {
574 2c3afff104c6 Fix some error messages. Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	754 dmError("Error creating prepared timeline, #%d: %s\n",
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	755 err, dmErrorStr(err));
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	756 goto error_exit;
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	757 }
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	758 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	759 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760
122 5ba672ebe014 Add some verbose engine startup messages. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	761 dmPrint(1, "Starting up.\n");
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	762
919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	763 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	764 SDL_PauseAudio(0);
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	765 SDL_UnlockAudio();
919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	766
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767 engine.startTime = SDL_GetTicks();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 while (!engine.exitFlag)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771 while (SDL_PollEvent(&engine.event))
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 switch (engine.event.type)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 case SDL_KEYDOWN:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775 switch (engine.event.key.keysym.sym)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 case SDLK_ESCAPE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 engine.exitFlag = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 case SDLK_SPACE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782 engine.pauseFlag = !engine.pauseFlag;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784
336 13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	785 case SDLK_f:
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	786 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	787 if (!engineInitializeVideo())
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	788 goto error_exit;
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	789 break;
13dba73cf28e Add 'F' key to fullscreen toggling, in addition to alt+enter. Matti Hamalainen <ccr@tnsp.org> parents: 335 diff changeset	790
109 3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	791 case SDLK_RETURN:
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	792 if (engine.event.key.keysym.mod & KMOD_ALT)
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	793 {
332 d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	794 engine.optVFlags ^= SDL_FULLSCREEN;
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	795 if (!engineInitializeVideo())
d4802335cbbc Clean up video (re)initialization. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	796 goto error_exit;
109 3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	797 }
3de6301dcfe1 Implement fullscrene toggling via alt+enter Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	798 break;
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	799
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	800 default:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806 case SDL_VIDEOEXPOSE:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 case SDL_QUIT:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810 engine.exitFlag = TRUE;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	811 break;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	813
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	814 // Draw frame
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	815 engine.frameTime = SDL_GetTicks();
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	816 if (engine.pauseFlag != engine.paused)
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	817 {
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	818 engine.paused = engine.pauseFlag;
367 9875c65029af Work towards re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 366 diff changeset	819 engine.pauseTime = engineGetTick(&engine);
93 15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	820 }
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	821
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	822 if (engine.paused)
15fdd5573344 Add simple (and buggy / not really working) debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	823 {
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	824 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	825 }
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827 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	828 {
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829 dmError("Can't lock surface.\n");
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830 goto error_exit;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	831 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	832
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 // Call main tick
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	834 if (engine.demoRender != NULL)
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	835 {
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	836 if ((err = engine.demoRender(&engine)) != DMERR_OK)
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	837 goto error_exit;
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	838 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	839 #ifdef DM_USE_TIMELINE
345 cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	840 else
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	841 {
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	842 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	843 goto error_exit;
cac13f180169 Work towards timeline support. Matti Hamalainen <ccr@tnsp.org> parents: 342 diff changeset	844 }
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	845 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	846
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	847 // Flip screen
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	848 if (SDL_MUSTLOCK(engine.screen) != 0)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	849 SDL_UnlockSurface(engine.screen);
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	850
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	851 SDL_Flip(engine.screen);
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	852 SDL_Delay(engine.paused ? 100 : 20);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853
361 bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	854 engine.frameCount++;
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	855 }
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	856
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	857 // Print benchmark results
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	858 engine.endTime = SDL_GetTicks();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	859 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	860 engine.frameCount, engine.endTime - engine.startTime,
bf60f60cafba Fix engine breakage. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	861 (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	862
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864 error_exit:
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866 dmPrint(1, "Shutting down.\n");
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867 SDL_ShowCursor(SDL_ENABLE);
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	868
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	869 SDL_LockAudio();
919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	870 SDL_PauseAudio(1);
105 d5d27f262227 Beging merging of dmsimple2-fork into the main "engine". Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	871 #ifdef DM_USE_JSS
641 c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	872 if (engine.optAudioSetup == DM_ASETUP_JSS)
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	873 {
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	874 jmpClose(engine.plr);
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	875 jvmClose(engine.dev);
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	876 jssClose();
c3852e49a610 Change how audio configuration works. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	877 }
278 919e7de91758 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	878 #endif
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	879 SDL_UnlockAudio();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	880
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	881 #ifdef DM_USE_TIMELINE
354 ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	882 dmFreeTimeline(engine.tl);
ba284f5e7ea5 More work on editor, etc. Matti Hamalainen <ccr@tnsp.org> parents: 351 diff changeset	883 dmFreePreparedTimelineData(engine.ptl);
573 14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	884 #endif
14640d0688d3 Make timeline stuff optional. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	885
369 e1c984404b6b Re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 367 diff changeset	886 engineShutdownEffects(&engine);
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	887 dmres_close(engine.resources);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	889 if (engine.demoShutdown != NULL)
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	890 engine.demoShutdown(&engine);
94 4bbfc0274b29 Change some function names, etc. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	891
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	892 if (initSDL)
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	893 SDL_Quit();
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894
127 ab4086db7dad Various improvements in modularity. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	895 if (engine.demoQuit != NULL)
366 38e10b5f4e09 Work towards base engine re-entrancy. Matti Hamalainen <ccr@tnsp.org> parents: 361 diff changeset	896 engine.demoQuit(&engine);
32 d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	898 return 0;
d1a6833a5d67 Added a simple demo engine core. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 }

Mercurial > hg > dmlib

annotate dmsimple.c @ 641:c3852e49a610