dmlib: src/dmsimple.c annotate

annotate src/dmsimple.c @ 1055:2858b56bdbe5

Improve error handling.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 01 Mar 2015 22:44:02 +0200
parents	d98fcb10df6a
children	eb2d14546a0e

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

Mercurial > hg > dmlib

annotate src/dmsimple.c @ 1055:2858b56bdbe5