annotate dmsimple.c @ 787:e8153e8a948e

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