Mercurial > hg > forks > gldragon
annotate gldragon.cpp @ 94:5191f8e571d1
Add manual control mode.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 25 May 2021 00:58:02 +0300 |
parents | 9fee97e7c5b6 |
children | 59195e95c080 |
rev | line source |
---|---|
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
1 // |
22
03b86b9c2f29
Add copyright blurbs and licenses.
Matti Hamalainen <ccr@tnsp.org>
parents:
21
diff
changeset
|
2 // GLDragon - OpenGL PLY model viewer / simple benchmark |
03b86b9c2f29
Add copyright blurbs and licenses.
Matti Hamalainen <ccr@tnsp.org>
parents:
21
diff
changeset
|
3 // Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org> |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
4 // (C) Copyright 2019 Tecnic Software productions (TNSP) |
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
5 // |
22
03b86b9c2f29
Add copyright blurbs and licenses.
Matti Hamalainen <ccr@tnsp.org>
parents:
21
diff
changeset
|
6 // See file "COPYING" for license information. |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
7 // |
22
03b86b9c2f29
Add copyright blurbs and licenses.
Matti Hamalainen <ccr@tnsp.org>
parents:
21
diff
changeset
|
8 // Originally based on 'glxdragon' Copyright (c) 2009, Thomas Trummer |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
9 // |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
10 #include <SDL.h> |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
11 #include "dmutil.h" |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
12 #include "dmglrender.h" |
70
03aa729a9e90
Refactor PLY file parsing from dmscene.* to dmply.* and some helper functions into dmutil.h
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
13 #include "dmply.h" |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
14 |
16 | 15 |
11
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
16 /* Default settings etc. constants |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
17 */ |
18
b1e75c65016d
Check for "too large" shader files.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
18 #define SET_DEF_WIDTH 1280 |
b1e75c65016d
Check for "too large" shader files.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
19 #define SET_DEF_HEIGHT 960 |
b1e75c65016d
Check for "too large" shader files.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
20 #define SET_FRAMES (180) |
b1e75c65016d
Check for "too large" shader files.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
21 #define SET_MAX_SHADER_SIZE (128 * 1024) |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
22 |
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
23 |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
24 /* Helpers |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
25 */ |
64
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
26 bool dmInitSDL(DMSimpleRenderer &renderer, |
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
27 const int width, const int height, |
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
28 const int vsyncMode, |
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
29 const char *title) |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
30 { |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
31 int ret; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
32 std::string msg; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
33 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
34 // Attempt to initialize libSDL |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
35 if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_EVENTS) != 0) |
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
36 { |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
37 dmError("Unable to initialize SDL: %s\n", |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
38 SDL_GetError()); |
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
39 return false; |
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
40 } |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
41 |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
42 // Part 1 of initialization |
63
d6ffc59bb84d
Move more of the SDL and GL setup code to the renderer class.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
43 if (!renderer.initRenderer1(title, width, height, |
d6ffc59bb84d
Move more of the SDL and GL setup code to the renderer class.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
44 SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, |
82
91a2868260bf
Disable window resizability for now, as we don't actually support it.
Matti Hamalainen <ccr@tnsp.org>
parents:
81
diff
changeset
|
45 SDL_WINDOW_SHOWN// | SDL_WINDOW_RESIZABLE |
91a2868260bf
Disable window resizability for now, as we don't actually support it.
Matti Hamalainen <ccr@tnsp.org>
parents:
81
diff
changeset
|
46 )) |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
47 return false; |
44
d93b1c2690f8
Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
48 |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
49 // Check if we want to attempt to use vsync |
64
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
50 switch (vsyncMode) |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
51 { |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
52 case 3: |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
53 ret = SDL_GL_SetSwapInterval(-1); |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
54 msg = "adaptive vsync"; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
55 break; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
56 |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
57 case 2: |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
58 ret = SDL_GL_SetSwapInterval(1); |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
59 msg = "synchronized (vsync)"; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
60 break; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
61 |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
62 case 1: |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
63 ret = SDL_GL_SetSwapInterval(0); |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
64 msg = "immediate (no vsync)"; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
65 break; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
66 |
38
372fa249ce26
Add vsync option 0 (disable attempts of setting vsync mode.)
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
67 case 0: |
372fa249ce26
Add vsync option 0 (disable attempts of setting vsync mode.)
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
68 msg = "vsync handling disabled"; |
372fa249ce26
Add vsync option 0 (disable attempts of setting vsync mode.)
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
69 ret = 0; |
372fa249ce26
Add vsync option 0 (disable attempts of setting vsync mode.)
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
70 break; |
372fa249ce26
Add vsync option 0 (disable attempts of setting vsync mode.)
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
71 |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
72 default: |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
73 ret = -1; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
74 msg = "INVALID VSYNC MODE"; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
75 break; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
76 } |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
77 |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
78 if (ret != 0) |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
79 { |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
80 dmError("Could not set vsync mode to %s.\n", |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
81 msg.c_str()); |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
82 return false; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
83 } |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
84 |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
85 // Part 3 of initialization |
63
d6ffc59bb84d
Move more of the SDL and GL setup code to the renderer class.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
86 if (!renderer.initRenderer2()) |
55 | 87 return false; |
88 | |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
89 dmMsg("VSync mode : %s\n", msg.c_str()); |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
90 |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
91 return true; |
25
2403030a0352
"Finish" implementing multiple lights support in scene files.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
92 } |
2403030a0352
"Finish" implementing multiple lights support in scene files.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
93 |
2403030a0352
"Finish" implementing multiple lights support in scene files.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
94 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
95 int main(int argc, char *argv[]) |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
96 { |
89
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
97 int frameDeltas[SET_FRAMES + 1]; |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
98 |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
99 bool |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
100 exitFlag = false, |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
101 pauseFlag = false, |
94 | 102 manualFlag = false, |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
103 optShowHelp = false, |
64
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
104 optSetInputFilename = false, |
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
105 optUseShaders = false; |
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
106 |
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
107 int optWidth = SET_DEF_WIDTH, |
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
108 optHeight = SET_DEF_HEIGHT, |
88
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
109 optVSyncMode = 1, |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
110 optPauseFrame = -1; |
64
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
111 |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
112 std::string optInputFilename = "dragon.scene", basePath; |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
113 DMGLSimpleRenderer renderer; |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
114 DMSimpleScene scene; |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
115 int cycleTime = 0, |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
116 cycleFrames = 0, |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
117 totalTime = 0, |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
118 totalFrames = 0; |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
119 |
89
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
120 memset(&frameDeltas, 0, sizeof(frameDeltas)); |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
121 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
122 // Check commandline argument for enabling shaders |
7 | 123 for (int narg = 1; narg < argc; narg++) |
124 { | |
125 char *arg = argv[narg]; | |
11
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
126 if (arg[0] == '-') |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
127 { |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
128 char *opt = arg + 1; |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
129 |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
130 if ((opt[0] == '-' && opt[1] == 'h' && opt[2] == 'e') || |
12
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
131 opt[0] == '?' || (opt[0] == '-' && opt[1] == '?')) |
11
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
132 { |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
133 optShowHelp = true; |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
134 break; |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
135 } |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
136 else |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
137 if (opt[0] == '-') |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
138 opt++; |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
139 |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
140 switch (opt[0]) |
12
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
141 { |
55 | 142 case 'g': |
143 optUseShaders = true; | |
144 break; | |
145 | |
67
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
146 case 's': |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
147 case 'm': |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
148 case 'v': |
88
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
149 case 'p': |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
150 { |
67
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
151 std::string marg; |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
152 if (opt[1] == 0) |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
153 { |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
154 if (narg < argc) |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
155 marg = std::string(argv[++narg]); |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
156 else |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
157 { |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
158 printf("Option '%s' requires an argument.\n", opt); |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
159 goto exit; |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
160 } |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
161 } |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
162 else |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
163 marg = std::string(opt + 1); |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
164 |
67
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
165 switch (opt[0]) |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
166 { |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
167 case 's': |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
168 { |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
169 std::vector<std::string> mtokens = dmStrSplit(marg, "xX:"); |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
170 if (mtokens.size() != 2) |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
171 { |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
172 printf("Option expects argument of format <width>x<height> in pixels.\n" |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
173 "For example: -s 640x480\n"); |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
174 goto exit; |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
175 } |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
176 |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
177 optWidth = std::stoi(mtokens[0], 0, 0); |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
178 optHeight = std::stoi(mtokens[1], 0, 0); |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
179 } |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
180 break; |
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
181 |
88
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
182 case 'v': |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
183 optVSyncMode = std::stoi(marg, 0, 0); |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
184 break; |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
185 |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
186 case 'p': |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
187 optPauseFrame = std::stoi(marg, 0, 0); |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
188 break; |
67
1327ef5dc9fb
Remove -w and -h options and replace them with -s <width>x<height>.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
189 } |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
190 } |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
191 break; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
192 |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
193 default: |
58
801d4c5c0f23
Print out the full argument, not trimmed option when complaining about an unknown option argument.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
194 printf("Unknown option '%s'.\n", arg); |
12
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
195 goto exit; |
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
196 } |
11
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
197 } |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
198 else |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
199 { |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
200 if (optSetInputFilename) |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
201 { |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
202 dmError("Please specify only one scene file.\n"); |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
203 goto exit; |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
204 } |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
205 |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
206 optSetInputFilename = true; |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
207 optInputFilename = std::string(arg); |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
208 if (optInputFilename.empty()) |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
209 { |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
210 dmError("Invalid input filename.\n"); |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
211 goto exit; |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
212 } |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
213 |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
214 } |
7 | 215 } |
216 | |
8 | 217 if (optShowHelp) |
7 | 218 { |
219 printf( | |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
220 "Usage: %s [options] [<scenefile.scene>]\n" |
87 | 221 "\n" |
222 " -? Show this help\n" | |
223 " -g Use GLSL shader instead of basic OpenGL lighting\n" | |
224 " -s<w>x<h> Set window dimensions (default %d x %d)\n" | |
225 " -v<0-3> Set vsync mode: 0 = do not attempt to set vsync mode\n" | |
226 " (may be required for software rendering backends),\n" | |
227 " 1 = no vsync, 2 = vsync, 3 = adaptive.\n" | |
228 " Using vsync (2) will result in FPS being approximately\n" | |
229 " whatever your monitor refresh rate is. The default\n" | |
230 " value is 1 (no vsync).\n" | |
88
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
231 " -p<frameN> Pause at cycle frame (max %d).\n" |
80
98e077d9d361
List the keyboard controls in --help.
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
232 "\n" |
98e077d9d361
List the keyboard controls in --help.
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
233 "Keyboard controls during runtime:\n" |
98e077d9d361
List the keyboard controls in --help.
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
234 " p / space Toggle pause (does not/should not affect fps measurement)\n" |
98e077d9d361
List the keyboard controls in --help.
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
235 " q / esc Quit\n" |
11
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
236 "\n", |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
237 argv[0], |
88
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
238 SET_DEF_WIDTH, SET_DEF_HEIGHT, |
8b34eab13549
Add -p -option for pausing at specific cycle frame.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
239 SET_FRAMES |
11
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
240 ); |
89dc8caeff41
Improve option handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
241 |
7 | 242 goto exit; |
243 } | |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
244 |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
245 if (optWidth < 100 || optWidth > 8192 || optHeight < 100 || optHeight > 8192) |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
246 { |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
247 dmError("Invalid window width or height (%d x %d).\n", |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
248 optWidth, optHeight); |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
249 goto exit; |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
250 } |
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
251 |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
252 // Load the scene |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
253 if (!scene.loadInfo(optInputFilename)) |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
254 goto exit; |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
255 |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
256 if (scene.models.size() == 0) |
12
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
257 { |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
258 dmError("Scenefile '%s' contains no models.\n", |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
259 optInputFilename.c_str()); |
12
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
260 goto exit; |
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
261 } |
52a586c344f4
Add option -m<filename prefix> to specify mesh/shader filename prefix.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
262 |
31
6847715b46cd
Move piece of code a bit as a cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
263 // Define a default light if none defined in scene file |
6847715b46cd
Move piece of code a bit as a cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
264 if (scene.lights.size() == 0) |
6847715b46cd
Move piece of code a bit as a cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
265 { |
6847715b46cd
Move piece of code a bit as a cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
266 DMLight light; // Default light |
6847715b46cd
Move piece of code a bit as a cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
267 scene.lights.push_back(light); |
6847715b46cd
Move piece of code a bit as a cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
268 } |
6847715b46cd
Move piece of code a bit as a cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
269 |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
270 dmMsg("Loading %ld model(s) ..\n", |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
271 scene.models.size()); |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
272 |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
273 basePath = dmGetPath(optInputFilename); |
47
9909014498f0
Add helper functions dmError() and dmMsg() and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
274 dmMsg("Scene base path '%s'\n", basePath.c_str()); |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
275 |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
276 for (DMModel &model : scene.models) |
2 | 277 { |
70
03aa729a9e90
Refactor PLY file parsing from dmscene.* to dmply.* and some helper functions into dmutil.h
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
278 if (!dmLoadFromPLY(model, basePath + model.modelFile)) |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
279 goto exit; |
21
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
280 |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
281 if (optUseShaders) |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
282 { |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
283 std::string |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
284 fragFile = model.fragShaderFile.empty() ? "shader.frag" : basePath + model.fragShaderFile, |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
285 vertFile = model.vertShaderFile.empty() ? "shader.vert" : basePath + model.vertShaderFile; |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
286 |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
287 if (!dmReadText(fragFile, model.fragShaderStr, SET_MAX_SHADER_SIZE) || |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
288 !dmReadText(vertFile, model.vertShaderStr, SET_MAX_SHADER_SIZE)) |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
289 goto exit; |
1404dfcee7b8
More work on scenefile and model loading support.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
290 } |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
291 } |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
292 |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
293 // Set shader usage |
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
294 renderer.useShaders = optUseShaders; |
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
295 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
296 // Initialize SDL + OpenGL |
64
e8100c1c5d99
Move option settings from globals to main().
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
297 if (!dmInitSDL(renderer, optWidth, optHeight, optVSyncMode, "GLDragon")) |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
298 goto exit; |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
299 |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
300 // Compile shaders for scene |
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
301 if (!renderer.compileSceneShaders(scene)) |
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
302 goto exit; |
24
c1897cfc8463
Add shader compilation error handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
303 |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
304 // Setup lights and camera |
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
305 renderer.setupLights(scene); |
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
306 renderer.setupCamera(scene.camera); |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
307 |
93
9fee97e7c5b6
Handle pauseframe differently: skip straight to it.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
308 // Check for pause frame |
9fee97e7c5b6
Handle pauseframe differently: skip straight to it.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
309 if (optPauseFrame >= 0) |
9fee97e7c5b6
Handle pauseframe differently: skip straight to it.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
310 { |
9fee97e7c5b6
Handle pauseframe differently: skip straight to it.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
311 cycleFrames = optPauseFrame; |
9fee97e7c5b6
Handle pauseframe differently: skip straight to it.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
312 pauseFlag = true; |
9fee97e7c5b6
Handle pauseframe differently: skip straight to it.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
313 } |
9fee97e7c5b6
Handle pauseframe differently: skip straight to it.
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
314 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
315 // Main loop starts |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
316 while (!exitFlag) |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
317 { |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
318 SDL_Event event; |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
319 int frameStart, frameEnd, frameDelta; |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
320 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
321 // Check for quit events |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
322 while (SDL_PollEvent(&event)) |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
323 switch (event.type) |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
324 { |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
325 case SDL_QUIT: |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
326 exitFlag = true; |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
327 break; |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
328 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
329 case SDL_KEYDOWN: |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
330 switch (event.key.keysym.sym) |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
331 { |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
332 case SDLK_SPACE: |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
333 case SDLK_p: |
94 | 334 if (manualFlag) |
335 pauseFlag = manualFlag = false; | |
336 else | |
337 pauseFlag = !pauseFlag; | |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
338 break; |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
339 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
340 case SDLK_ESCAPE: |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
341 case SDLK_q: |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
342 exitFlag = true; |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
343 break; |
94 | 344 |
345 case SDLK_RIGHT: | |
346 manualFlag = true; | |
347 cycleFrames++; | |
348 break; | |
349 | |
350 case SDLK_LEFT: | |
351 manualFlag = true; | |
352 cycleFrames--; | |
353 break; | |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
354 } |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
355 } |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
356 |
92
28dd29f3a65f
Remove DMSimpleRenderer::animate() and use direct time value in drawScene() etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
89
diff
changeset
|
357 // Render the frame |
28dd29f3a65f
Remove DMSimpleRenderer::animate() and use direct time value in drawScene() etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
89
diff
changeset
|
358 frameStart = SDL_GetTicks(); |
28dd29f3a65f
Remove DMSimpleRenderer::animate() and use direct time value in drawScene() etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
89
diff
changeset
|
359 renderer.drawScene(scene, fmodf((float) cycleFrames, SET_FRAMES) / SET_FRAMES); |
28dd29f3a65f
Remove DMSimpleRenderer::animate() and use direct time value in drawScene() etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
89
diff
changeset
|
360 renderer.swapWindow(); |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
361 frameEnd = SDL_GetTicks(); |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
362 |
55 | 363 // Check for errors |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
364 renderer.checkErrors(); |
55 | 365 |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
366 frameDelta = frameEnd - frameStart; |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
367 |
94 | 368 // Handle automatic mode |
369 if (!pauseFlag && !manualFlag) | |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
370 { |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
371 totalFrames++; |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
372 cycleFrames++; |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
373 |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
374 cycleTime += frameDelta; |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
375 totalTime += frameDelta; |
10
c6c419861101
Use SDL_GetTicks() instead of std::clock().
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
376 |
89
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
377 memmove(&frameDeltas[0], &frameDeltas[1], sizeof(frameDeltas[0]) * (SET_FRAMES - 1)); |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
378 frameDeltas[SET_FRAMES - 1] = frameDelta; |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
379 |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
380 if (cycleFrames >= SET_FRAMES) |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
381 { |
89
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
382 float avgCycleFrame = cycleTime / SET_FRAMES; |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
383 float maxJitter = 0, avgJitter = 0; |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
384 |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
385 for (int n = 0; n < SET_FRAMES; n++) |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
386 { |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
387 float mjitter = fabs(avgCycleFrame - frameDeltas[n]); |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
388 if (mjitter > maxJitter) |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
389 maxJitter = mjitter; |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
390 avgJitter += mjitter; |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
391 } |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
392 |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
393 avgJitter /= SET_FRAMES; |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
394 |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
395 // Print the current frames per second |
89
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
396 printf("%d ms for %d frames = %.1lf FPS [framejitter %.1lf ms avg, %.1lf ms max]\n", |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
397 cycleTime, cycleFrames, |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
398 (cycleFrames * 1000.0f) / cycleTime, |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
399 avgJitter, maxJitter |
ff739727dfec
Compute and display frametime jitter values.
Matti Hamalainen <ccr@tnsp.org>
parents:
88
diff
changeset
|
400 ); |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
401 |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
402 // Reset cycleFrames |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
403 cycleFrames = 0; |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
404 cycleTime = 0; |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
405 } |
3
be31ff9e5f58
Port to libSDL2, clean up the code and some de-C++-ifications.
Matti Hamalainen <ccr@tnsp.org>
parents:
2
diff
changeset
|
406 } |
81
5372b7795426
Use SDL_Delay(100) when in pause state to not consume CPU unnecessarily.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
407 else |
5372b7795426
Use SDL_Delay(100) when in pause state to not consume CPU unnecessarily.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
408 { |
94 | 409 SDL_Delay(manualFlag ? 25 : 100); |
81
5372b7795426
Use SDL_Delay(100) when in pause state to not consume CPU unnecessarily.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
410 } |
2 | 411 } |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
412 |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
413 // Show totals |
73
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
414 printf("%d ms total for %d total frames = %.2lf FPS average\n", |
3383e402817b
Implement pause mode and adjust the frame/FPS calculations accordingly.
Matti Hamalainen <ccr@tnsp.org>
parents:
70
diff
changeset
|
415 totalTime, totalFrames, ((double) totalFrames * 1000.0f) / (double) totalTime); |
13
c1e8057cc4d0
Improvements to option handling, add option for setting preferred vsync
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
416 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
417 exit: |
62
baccf2044289
Move the OpenGL rendering, setup etc. into a separate module/class, perhaps
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
418 renderer.shutdownRenderer(); |
5 | 419 |
6
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
420 SDL_Quit(); |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
421 |
4d6fec8f0c64
Implement optional support for vertex/fragment shaders. Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
422 return 0; |
0
3d74a9dd96e4
Initial import of Thomas Trummer's original code.
Thomas Trummer
parents:
diff
changeset
|
423 } |