forks/gldragon: gldragon.cpp annotate

annotate gldragon.cpp @ 69:267b3fd2c98c

Cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 16 Dec 2019 06:51:40 +0200
parents	1327ef5dc9fb
children	03aa729a9e90

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"
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	13
16 c134a186912f Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	14
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	15 /* Default settings etc. constants
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	16 */
18 b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	17 #define SET_DEF_WIDTH 1280
b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	18 #define SET_DEF_HEIGHT 960
b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	19 #define SET_FRAMES (180)
b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	20 #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	21
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	22
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	23
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	24
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	25 /* Helpers
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	26 */
64 e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	27 bool dmInitSDL(DMSimpleRenderer &renderer,
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	28 const int width, const int height,
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	29 const int vsyncMode,
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	30 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	31 {
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	32 int ret;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	33 std::string msg;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	34
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	35 // 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	36 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	37 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	38 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	39 SDL_GetError());
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	40 return false;
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	41 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	42
62 baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	43 // 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	44 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	45 SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
d6ffc59bb84d Move more of the SDL and GL setup code to the renderer class. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	46 SDL_WINDOW_SHOWN \| SDL_WINDOW_RESIZABLE))
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 bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	87 return false;
bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	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 {
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	97 bool
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	98 exitFlag = false,
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	99 optShowHelp = false,
64 e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	100 optSetInputFilename = false,
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	101 optUseShaders = false;
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	102
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	103 int optWidth = SET_DEF_WIDTH,
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	104 optHeight = SET_DEF_HEIGHT,
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	105 optVSyncMode = 1;
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	106
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	107 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	108 DMGLSimpleRenderer renderer;
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	109 DMSimpleScene scene;
64 e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	110 int startTime, cycleStart, cycleFrames = 0, totalFrames = 0;
e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	111 double totalTime;
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	112
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	113 // Check commandline argument for enabling shaders
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	114 for (int narg = 1; narg < argc; narg++)
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	115 {
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	116 char *arg = argv[narg];
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	117 if (arg[0] == '-')
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	118 {
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	119 char *opt = arg + 1;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	120
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	121 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	122 opt[0] == '?' \|\| (opt[0] == '-' && opt[1] == '?'))
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	123 {
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	124 optShowHelp = true;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	125 break;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	126 }
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	127 else
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	128 if (opt[0] == '-')
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	129 opt++;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	130
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	131 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	132 {
55 bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	133 case 'g':
bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	134 optUseShaders = true;
bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	135 break;
bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	136
67 1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	137 case 's':
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	138 case 'm':
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	139 case 'v':
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	140 {
67 1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	141 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	142 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	143 {
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	144 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	145 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	146 else
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	147 {
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	148 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	149 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	150 }
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	151 }
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	152 else
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	153 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	154
67 1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	155 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	156 {
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	157 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	158 {
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	159 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	160 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	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 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	163 "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	164 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	165 }
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 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	168 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	169 }
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	170 break;
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 case 'v': optVSyncMode = std::stoi(marg, 0, 0); break;
1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	173 }
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	174 }
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	175 break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	176
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	177 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	178 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	179 goto exit;
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	180 }
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	181 }
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	182 else
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	183 {
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	184 if (optSetInputFilename)
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	185 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	186 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	187 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	188 }
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	189
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	190 optSetInputFilename = true;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	191 optInputFilename = std::string(arg);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	192 if (optInputFilename.empty())
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	193 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	194 dmError("Invalid input filename.\n");
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	195 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	196 }
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	197
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	198 }
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	199 }
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	200
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	201 if (optShowHelp)
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	202 {
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	203 printf(
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	204 "Usage: %s [options] [<scenefile.scene>]\n"
12 52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	205 "-? Show this help\n"
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	206 "-g Use GLSL shader instead of basic OpenGL lighting\n"
67 1327ef5dc9fb Remove -w and -h options and replace them with -s <width>x<height>. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	207 "-s<w>x<h> Set window dimensions (default %d x %d)\n"
38 372fa249ce26 Add vsync option 0 (disable attempts of setting vsync mode.) Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	208 "-v<0-3> Set vsync mode: 0 = do not attempt to set vsync mode\n"
50 d4232c89145f Clarify the help for -v option. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	209 " (may be required for software rendering backends),\n"
d4232c89145f Clarify the help for -v option. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	210 " 1 = no vsync, 2 = vsync, 3 = adaptive.\n"
d4232c89145f Clarify the help for -v option. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	211 " Using vsync (2) will result in FPS being approximately\n"
d4232c89145f Clarify the help for -v option. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	212 " whatever your monitor refresh rate is. The default\n"
d4232c89145f Clarify the help for -v option. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	213 " value is 1 (no vsync).\n"
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	214 "\n",
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	215 argv[0],
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	216 SET_DEF_WIDTH, SET_DEF_HEIGHT
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	217 );
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	218
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	219 goto exit;
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	220 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	221
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	222 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	223 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	224 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	225 optWidth, optHeight);
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	226 goto exit;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	227 }
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	228
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	229 // Load the scene
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	230 if (!scene.loadInfo(optInputFilename))
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	231 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	232
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	233 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	234 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	235 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	236 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	237 goto exit;
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	238 }
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	239
31 6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	240 // 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	241 if (scene.lights.size() == 0)
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	242 {
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	243 DMLight light; // Default light
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	244 scene.lights.push_back(light);
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	245 }
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	246
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	247 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	248 scene.models.size());
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	249
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	250 basePath = dmGetPath(optInputFilename);
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	251 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	252
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	253 for (DMModel &model : scene.models)
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	254 {
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	255 if (!model.loadFromPLY(basePath + model.modelFile))
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	256 goto exit;
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	257
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	258 if (optUseShaders)
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	259 {
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	260 std::string
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	261 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	262 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	263
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	264 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	265 !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	266 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	267 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	268 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	269
62 baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	270 // 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	271 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	272
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	273 // Initialize SDL + OpenGL
64 e8100c1c5d99 Move option settings from globals to main(). Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	274 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	275 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	276
62 baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	277 // 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	278 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	279 goto exit;
24 c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	280
62 baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	281 // 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	282 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	283 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	284
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	285 // Main loop starts
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	286 startTime = cycleStart = SDL_GetTicks();
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	287
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	288 while (!exitFlag)
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	289 {
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	290 SDL_Event event;
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	291
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	292 // Check for quit events
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	293 while (SDL_PollEvent(&event))
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	294 switch (event.type)
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	295 {
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	296 case SDL_QUIT:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	297 exitFlag = true;
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	298 break;
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	299
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	300 case SDL_KEYDOWN:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	301 switch (event.key.keysym.sym)
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	302 {
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	303 case SDLK_ESCAPE:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	304 case SDLK_q:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	305 exitFlag = true;
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	306 break;
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	307 }
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	308 }
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	309
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	310 // Render the next frame
62 baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	311 totalTime = SDL_GetTicks() - startTime;
baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	312 renderer.drawScene(scene, totalTime);
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	313
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	314 // Draw the current frame
63 d6ffc59bb84d Move more of the SDL and GL setup code to the renderer class. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	315 renderer.swapWindow();
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	316
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	317 // Rotate for 2 degrees
62 baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	318 renderer.animate(scene, totalTime);
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	319
55 bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	320 // 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	321 renderer.checkErrors();
55 bf73a2a70ec7 Add OpenGL error checking. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	322
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	323 // Return true if a full rotation was done
15 2d2aadfa3df3 Fix calculation of totalFrames. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	324 totalFrames++;
69 267b3fd2c98c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	325 cycleFrames++;
267b3fd2c98c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	326 if (cycleFrames >= SET_FRAMES)
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	327 {
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	328 // Get the time it took to render a full turn
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	329 int cycleEnd = SDL_GetTicks();
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	330 double cycleTime = cycleEnd - cycleStart;
10 c6c419861101 Use SDL_GetTicks() instead of std::clock(). Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	331
c6c419861101 Use SDL_GetTicks() instead of std::clock(). Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	332 // Restart the timer
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	333 cycleStart = SDL_GetTicks();
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	334
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	335 // Print the current frames per second
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	336 printf("%.1lf ms for %d frames = %.1lf FPS\n",
69 267b3fd2c98c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	337 cycleTime, cycleFrames, (cycleFrames * 1000.0f) / cycleTime);
267b3fd2c98c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	338
267b3fd2c98c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	339 // Reset cycleFrames
267b3fd2c98c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	340 cycleFrames = 0;
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	341 }
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	342 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	343
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	344 // Show totals
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	345 totalTime = SDL_GetTicks() - startTime;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	346 printf("%.1lf ms total for %d total frames = %.2lf FPS average\n",
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	347 totalTime, totalFrames, (totalFrames * 1000.0f) / totalTime);
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	348
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	349 exit:
62 baccf2044289 Move the OpenGL rendering, setup etc. into a separate module/class, perhaps Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	350 renderer.shutdownRenderer();
5 5dcae4dddcd9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 3 diff changeset	351
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	352 SDL_Quit();
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	353
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	354 return 0;
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	355 }

Mercurial > hg > forks > gldragon

annotate gldragon.cpp @ 69:267b3fd2c98c