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