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