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