dmlib: src/dmsimple.c annotate

annotate src/dmsimple.c @ 845:1d3d220fb5cc

Fix audio playback.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 21 Oct 2014 10:31:03 +0300
parents	1e5cf1144f36
children	05a3ee1ca964

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

Mercurial > hg > dmlib

annotate src/dmsimple.c @ 845:1d3d220fb5cc