forks/gldragon: gldragon.cpp annotate

annotate gldragon.cpp @ 51:9c6654647608

Cleanup.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 06 Dec 2019 01:30:51 +0200
parents	d4232c89145f
children	6343c3392a95

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>
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	11 #include <SDL_opengl.h>
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	12 #include <GL/glu.h>
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	13
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	14 #include "dmutil.h"
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	15 #include "dmmodel.h"
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	16
16 c134a186912f Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	17
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	18 /* Default settings etc. constants
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	19 */
18 b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	20 #define SET_DEF_WIDTH 1280
b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	21 #define SET_DEF_HEIGHT 960
b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	22 #define SET_FRAMES (180)
b1e75c65016d Check for "too large" shader files. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	23 #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	24
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	25
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	26 /* Options
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	27 */
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	28 bool optUseShaders = false;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	29 int optWidth = SET_DEF_WIDTH,
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	30 optHeight = SET_DEF_HEIGHT,
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	31 optVSyncMode = 1;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	32
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	33
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	34 /* Globals
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	35 */
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	36 SDL_Window *dmWindow = NULL;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	37 SDL_GLContext dmGLContext = NULL;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	38
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	39
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	40 /* Helpers
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	41 */
42 3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	42 #ifdef GL_GLEXT_PROTOTYPES
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	43 #define DM_GLEXT_INIT(extproctype, extprocname) /* stub */
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	44 #else
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	45 #define DM_GLEXT_INIT(extproctype, extprocname) extproctype extprocname = NULL;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	46 #include "dmglexts.h"
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	47 #undef DM_GLEXT_INIT
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	48
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	49
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	50 void * dmGLExtTry(const std::string &name)
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	51 {
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	52 bool res = SDL_GL_ExtensionSupported(name.c_str());
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	53 void *ptr = SDL_GL_GetProcAddress(name.c_str());
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	54
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	55 dmMsg(" - Checking '%s' : %s : %p\n",
42 3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	56 name.c_str(),
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	57 res ? "YES" : "no",
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	58 ptr);
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	59
45 534eccdd33d4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	60 res = true;
534eccdd33d4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	61
42 3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	62 if (res && ptr != NULL)
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	63 return ptr;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	64 else
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	65 return NULL;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	66 }
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	67
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	68 void * dmGLExtInit(const std::string &name, bool &status)
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	69 {
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	70 void *ptr;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	71
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	72 if ((ptr = dmGLExtTry(name)) != NULL)
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	73 return ptr;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	74 else
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	75 if ((ptr = dmGLExtTry(name + "EXT")) != NULL)
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	76 return ptr;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	77 else
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	78 if ((ptr = dmGLExtTry(name + "ARB")) != NULL)
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	79 return ptr;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	80
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	81 status = false;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	82 return NULL;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	83 }
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	84 #endif
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	85
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	86
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	87 bool dmInitGLExtensions(void)
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	88 {
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	89 #ifdef GL_GLEXT_PROTOTYPES
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	90 return true;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	91 #else
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	92 bool status = true;
51 9c6654647608 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	93 #define DM_GLEXT_INIT(extproctype, extprocname) \
9c6654647608 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	94 extprocname = (extproctype) dmGLExtInit(#extprocname, status);
42 3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	95 #include "dmglexts.h"
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	96 return status;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	97 #endif
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	98 }
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	99
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	100
5 5dcae4dddcd9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 3 diff changeset	101 bool dmInitSDLGL(const int width, const int height, 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	102 {
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	103 int ret;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	104 std::string msg;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	105
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	106 // 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	107 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	108 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	109 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	110 SDL_GetError());
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	111 return false;
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	112 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	113
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	114 // Set GL attributes
46 0c75c5f5c6b6 Downgrade GL version to 2.1. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	115 SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
0c75c5f5c6b6 Downgrade GL version to 2.1. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	116 SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
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	117 SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	118
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	119 SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	120 SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	121 SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	122 SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	123
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	124 SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	125 //SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 32);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	126 SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
d93b1c2690f8 Set SDL_GL_* attributes after initializing SDL, but before creating window or OpenGL context. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	127
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	128 // Attempt to create a window
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	129 if ((dmWindow = SDL_CreateWindow(title,
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	130 SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	131 width, height,
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	132 SDL_WINDOW_OPENGL \| SDL_WINDOW_SHOWN \| SDL_WINDOW_RESIZABLE)) == NULL)
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	133 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	134 dmError("Could not create SDL window: %s",
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	135 SDL_GetError());
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	136 return false;
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	137 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	138
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	139 if ((dmGLContext = SDL_GL_CreateContext(dmWindow)) == NULL)
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	140 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	141 dmError("Unable to create SDL OpenGL context: %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	142 SDL_GetError());
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	143 return false;
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	144 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	145
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	146 // Check if we want to attempt to use vsync
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	147 switch (optVSyncMode)
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	148 {
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	149 case 3:
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	150 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	151 msg = "adaptive vsync";
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	152 break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	153
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	154 case 2:
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	155 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	156 msg = "synchronized (vsync)";
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	157 break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	158
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	159 case 1:
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	160 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	161 msg = "immediate (no vsync)";
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	162 break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	163
38 372fa249ce26 Add vsync option 0 (disable attempts of setting vsync mode.) Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	164 case 0:
372fa249ce26 Add vsync option 0 (disable attempts of setting vsync mode.) Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	165 msg = "vsync handling disabled";
372fa249ce26 Add vsync option 0 (disable attempts of setting vsync mode.) Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	166 ret = 0;
372fa249ce26 Add vsync option 0 (disable attempts of setting vsync mode.) Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	167 break;
372fa249ce26 Add vsync option 0 (disable attempts of setting vsync mode.) Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	168
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	169 default:
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	170 ret = -1;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	171 msg = "INVALID VSYNC MODE";
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	172 break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	173 }
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 if (ret != 0)
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	176 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	177 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	178 msg.c_str());
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	179 return false;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	180 }
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	181
42 3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	182 // Get/initialize OpenGL extension function pointers
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	183 if (optUseShaders && !dmInitGLExtensions())
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	184 return false;
3c7e1d3fa5a2 Implement OpengL extension handling through new header file dmglexts.h to Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	185
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	186 // Dump some information
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	187 dmMsg("GL_VENDOR : %s\n", glGetString(GL_VENDOR));
9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	188 dmMsg("GL_RENDERER : %s\n", glGetString(GL_RENDERER));
9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	189 dmMsg("GL_VERSION : %s\n", glGetString(GL_VERSION));
9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	190 dmMsg("VSync mode : %s\n", msg.c_str());
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	191
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	192 // Setup the window and view port
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	193 glViewport(0, 0, width, height);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	194
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	195 glMatrixMode(GL_PROJECTION);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	196 glLoadIdentity();
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	197
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	198 gluPerspective(45.0f, GLfloat(width) / GLfloat(height), 0.1f, 1000.0f);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	199
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	200 glMatrixMode(GL_MODELVIEW);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	201 glLoadIdentity();
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	202
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	203 // Enable back face culling
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	204 glEnable(GL_CULL_FACE);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	205
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	206 // Enable smooth shading
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	207 glShadeModel(GL_SMOOTH);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	208
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	209 // Enable the depth buffer
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	210 glEnable(GL_DEPTH_TEST);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	211
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	212 // Enable normal rescaling
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	213 glEnable(GL_RESCALE_NORMAL);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	214
49 2e2c3fe311da Just glEnable(GL_COLOR_MATERIAL) globally. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	215 glEnable(GL_COLOR_MATERIAL);
2e2c3fe311da Just glEnable(GL_COLOR_MATERIAL) globally. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	216
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	217 // Setup depth buffer
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	218 glClearDepth(1.0f);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	219
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	220 // Set the depth buffer function
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	221 glDepthFunc(GL_LEQUAL);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	222
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	223 // Enable vertex and and normal arrays
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	224 glEnableClientState(GL_VERTEX_ARRAY);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	225 glEnableClientState(GL_NORMAL_ARRAY);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	226
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	227 // Set correct perspective correction
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	228 glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	229
be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	230 return true;
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	231 }
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	232
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	233
37 73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	234 void dmDrawModel(const DMSimpleScene &scene, const DMModel &model)
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	235 {
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	236 int maxIndices;
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	237
37 73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	238 if (optUseShaders)
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	239 {
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	240 // Enable shader program
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	241 glUseProgram(model.id_prog);
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	242 glUniform1i(glGetUniformLocation(model.id_prog, "nlights"), scene.lights.size());
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	243 }
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	244
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	245 // Set the material of the model
32 1215fdd0a8ab Add support for specifying specular and shininess values per model. Matti Hamalainen <ccr@tnsp.org> parents: 31 diff changeset	246 glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
48 0ae1ff609626 Implement diffuse setting for models in scenefile. Also refactor Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	247 glMateriali(GL_FRONT, GL_SHININESS, model.material.shininess);
0ae1ff609626 Implement diffuse setting for models in scenefile. Also refactor Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	248 glMaterialfv(GL_FRONT, GL_SPECULAR, model.material.specular.values);
0ae1ff609626 Implement diffuse setting for models in scenefile. Also refactor Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	249 glColor4fv(model.material.diffuse.values);
32 1215fdd0a8ab Add support for specifying specular and shininess values per model. Matti Hamalainen <ccr@tnsp.org> parents: 31 diff changeset	250
17 0fa9302e324d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	251 // Render the model
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	252 glGetIntegerv(GL_MAX_ELEMENTS_INDICES, &maxIndices);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	253
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	254 // Add transforms
36 d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	255 if (model.scaleSet)
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	256 glScalef(model.scale.x, model.scale.y, model.scale.z);
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	257
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	258 if (model.translateSet)
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	259 glTranslatef(model.translate.x, model.translate.y, model.translate.z);
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	260
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	261 if (model.rotateSet)
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	262 {
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	263 glRotatef(model.rotate.x, 1.0f, 0.0f, 0.0f);
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	264 glRotatef(model.rotate.y, 0.0f, 1.0f, 0.0f);
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	265 glRotatef(model.rotate.z, 0.0f, 0.0f, 1.0f);
d640f2a34031 Only scale/translate/rotate the model if those attributes have been set in the scenefile. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	266 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	267
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	268 glVertexPointer(3, GL_FLOAT, 0, &model.vertices[0]);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	269 glNormalPointer( GL_FLOAT, 0, &model.normals[0]);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	270
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	271 for (int n = 0; n < model.nfaces; n += maxIndices)
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	272 {
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	273 const int count = std::min(maxIndices, model.nfaces - n);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	274 glDrawElements(GL_TRIANGLES, count * 3, GL_UNSIGNED_INT, &model.faces[n * 3]);
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	275 }
37 73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	276
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	277 // Restore
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	278 if (optUseShaders)
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	279 {
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	280 glUseProgram(0);
73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	281 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	282 }
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	283
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	284
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	285 void dmDrawScene(const DMSimpleScene &scene)
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	286 {
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	287 glClear(GL_DEPTH_BUFFER_BIT);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	288
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	289 glMatrixMode(GL_PROJECTION);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	290 glPushMatrix();
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	291 glLoadIdentity();
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	292
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	293 glOrtho(0.0, 1.0, 0.0, 1.0, -1, 1);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	294
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	295 glMatrixMode(GL_MODELVIEW);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	296 glPushMatrix();
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	297 glLoadIdentity();
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	298
17 0fa9302e324d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	299 // Draw the background gradient
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	300 glDisable(GL_DEPTH_TEST);
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	301 glDisable(GL_LIGHTING);
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	302 glBegin(GL_QUADS);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	303 {
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	304 glColor3ub(0x3B, 0x3B, 0x75);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	305 glVertex2f(0.0f, 0.0f);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	306 glVertex2f(1.0f, 0.0f);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	307
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	308 glColor3ub(0x00, 0x00, 0x00);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	309 glVertex2f(1.0f, 1.0f);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	310 glVertex2f(0.0f, 1.0f);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	311 }
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	312 glEnd();
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	313
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	314 // Restore the 3D projection
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	315 glMatrixMode(GL_PROJECTION);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	316 glPopMatrix();
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	317
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	318 glMatrixMode(GL_MODELVIEW);
b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	319 glPopMatrix();
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	320
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	321 glEnable(GL_DEPTH_TEST);
37 73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	322 glEnable(GL_LIGHTING);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	323
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	324 // Draw models
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	325 for (const DMModel &model : scene.models)
27 097184bd34a8 Implement number of lights uniform for the shaders, clean up light setup and Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	326 {
097184bd34a8 Implement number of lights uniform for the shaders, clean up light setup and Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	327 glPushMatrix();
37 73a785323e8a Rendering cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	328 dmDrawModel(scene, model);
27 097184bd34a8 Implement number of lights uniform for the shaders, clean up light setup and Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	329 glPopMatrix();
097184bd34a8 Implement number of lights uniform for the shaders, clean up light setup and Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	330 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	331 }
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	332
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	333
24 c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	334 bool dmCompileShader(const GLenum stype, const std::string &src, GLuint &shader)
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	335 {
24 c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	336 GLint status;
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	337 const char *tmp = src.c_str();
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	338
24 c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	339 shader = glCreateShader(stype);
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	340 glShaderSource(shader, 1, &tmp, 0);
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	341 glCompileShader(shader);
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	342
24 c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	343 glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	344 if (status == GL_TRUE)
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	345 return true;
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	346 else
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	347 {
26 67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	348 GLint bufLen = 0;
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	349 glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &bufLen);
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	350
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	351 if (bufLen > 0)
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	352 {
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	353 char *buf = new char[bufLen];
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	354 glGetShaderInfoLog(shader, bufLen, NULL, buf);
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	355 dmError("Shader compliation error:\n%s\n",
26 67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	356 buf);
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	357 delete buf;
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	358 }
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	359 else
67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	360 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	361 dmError("Shader compilation error occured, but no error information got.\n");
26 67647ed860f0 Improve shader compilation error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	362 }
24 c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	363 return false;
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	364 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	365 }
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	366
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	367
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	368 void dmLinkModelShaders(DMModel &model)
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	369 {
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	370 model.id_prog = glCreateProgram();
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	371 glAttachShader(model.id_prog, model.id_fs);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	372 glAttachShader(model.id_prog, model.id_vs);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	373 glLinkProgram(model.id_prog);
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	374 }
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	375
3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	376
25 2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	377 void dmSetupLight(const int n, const DMLight &light)
2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	378 {
2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	379 glEnable(GL_LIGHT0 + n);
48 0ae1ff609626 Implement diffuse setting for models in scenefile. Also refactor Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	380 glLightfv(GL_LIGHT0 + n, GL_AMBIENT, light.color.ambient.values);
0ae1ff609626 Implement diffuse setting for models in scenefile. Also refactor Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	381 glLightfv(GL_LIGHT0 + n, GL_DIFFUSE, light.color.diffuse.values);
0ae1ff609626 Implement diffuse setting for models in scenefile. Also refactor Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	382 glLightfv(GL_LIGHT0 + n, GL_SPECULAR, light.color.specular.values);
25 2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	383 glLightfv(GL_LIGHT0 + n, GL_POSITION, light.position.values);
2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	384 }
2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	385
2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	386
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	387 int main(int argc, char *argv[])
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	388 {
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	389 int startTime, cycleStart, cycleFrames = 0, totalFrames = 0;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	390 double totalTime;
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	391 bool
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	392 exitFlag = false,
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	393 optShowHelp = false,
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	394 optSetInputFilename = false;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	395 std::string optInputFilename = "dragon.scene", basePath;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	396 DMSimpleScene scene;
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	397
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	398 // Check commandline argument for enabling shaders
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	399 for (int narg = 1; narg < argc; narg++)
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	400 {
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	401 char *arg = argv[narg];
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	402 if (arg[0] == '-')
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	403 {
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	404 char *opt = arg + 1;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	405
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	406 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	407 opt[0] == '?' \|\| (opt[0] == '-' && opt[1] == '?'))
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	408 {
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	409 optShowHelp = true;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	410 break;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	411 }
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	412 else
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	413 if (opt[0] == '-')
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	414 opt++;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	415
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	416 if (opt[0] == 'g')
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	417 optUseShaders = true;
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	418 else
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	419 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	420 {
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	421 case 'w':
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	422 case 'h':
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	423 case 'm':
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	424 case 'v':
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	425 if (opt[1] == 0)
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	426 {
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	427 printf("Option '%s' requires an argument.\n", opt);
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	428 goto exit;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	429 }
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	430
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	431 switch (opt[0])
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	432 {
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	433 case 'w': optWidth = atoi(opt + 1); break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	434 case 'h': optHeight = atoi(opt + 1); break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	435 case 'v': optVSyncMode = atoi(opt + 1); break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	436 }
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	437 break;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	438
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	439 default:
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	440 printf("Unknown option '%s'.\n", opt);
12 52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	441 goto exit;
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	442 }
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	443 }
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	444 else
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	445 {
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	446 if (optSetInputFilename)
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	447 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	448 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	449 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	450 }
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	451
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	452 optSetInputFilename = true;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	453 optInputFilename = std::string(arg);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	454 if (optInputFilename.empty())
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	455 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	456 dmError("Invalid input filename.\n");
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	457 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	458 }
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	459
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	460 }
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	461 }
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	462
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	463 if (optShowHelp)
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	464 {
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	465 printf(
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	466 "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	467 "-? 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	468 "-g Use GLSL shader instead of basic OpenGL lighting\n"
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	469 "-w<width> Window width (default %d)\n"
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	470 "-h<height> Window height (default %d)\n"
38 372fa249ce26 Add vsync option 0 (disable attempts of setting vsync mode.) Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	471 "-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	472 " (may be required for software rendering backends),\n"
d4232c89145f Clarify the help for -v option. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	473 " 1 = no vsync, 2 = vsync, 3 = adaptive.\n"
d4232c89145f Clarify the help for -v option. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	474 " 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	475 " 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	476 " value is 1 (no vsync).\n"
11 89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	477 "\n",
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	478 argv[0],
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	479 SET_DEF_WIDTH, SET_DEF_HEIGHT
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	480 );
89dc8caeff41 Improve option handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	481
7 95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	482 goto exit;
95dd5417e7de Add simple help. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	483 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	484
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	485 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	486 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	487 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	488 optWidth, optHeight);
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	489 goto exit;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	490 }
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	491
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	492 // Load the scene
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	493 if (!scene.loadInfo(optInputFilename))
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	494 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	495
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	496 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	497 {
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	498 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	499 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	500 goto exit;
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	501 }
52a586c344f4 Add option -m<filename prefix> to specify mesh/shader filename prefix. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	502
31 6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	503 // 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	504 if (scene.lights.size() == 0)
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	505 {
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	506 DMLight light; // Default light
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	507 scene.lights.push_back(light);
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	508 }
6847715b46cd Move piece of code a bit as a cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	509
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	510 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	511 scene.models.size());
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	512
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	513 basePath = dmGetPath(optInputFilename);
47 9909014498f0 Add helper functions dmError() and dmMsg() and use them. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	514 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	515
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	516 for (DMModel &model : scene.models)
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	517 {
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	518 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	519 goto exit;
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	520
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	521 if (optUseShaders)
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	522 {
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	523 std::string
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	524 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	525 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	526
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	527 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	528 !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	529 goto exit;
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	530 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	531 }
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	532
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	533 // Initialize SDL + OpenGL
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	534 if (!dmInitSDLGL(optWidth, optHeight, "GLDragon"))
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	535 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	536
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	537 // According to our mode ..
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	538 if (optUseShaders)
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	539 {
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	540 for (DMModel &model : scene.models)
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	541 {
24 c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	542 if (!dmCompileShader(GL_FRAGMENT_SHADER, model.fragShaderStr, model.id_fs) \|\|
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	543 !dmCompileShader(GL_VERTEX_SHADER, model.vertShaderStr, model.id_vs))
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	544 goto exit;
c1897cfc8463 Add shader compilation error handling. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	545
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	546 dmLinkModelShaders(model);
1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	547 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	548 }
25 2403030a0352 "Finish" implementing multiple lights support in scene files. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	549
27 097184bd34a8 Implement number of lights uniform for the shaders, clean up light setup and Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	550 // Setup lights
097184bd34a8 Implement number of lights uniform for the shaders, clean up light setup and Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	551 for (size_t n = 0; n < scene.lights.size(); n++)
097184bd34a8 Implement number of lights uniform for the shaders, clean up light setup and Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	552 dmSetupLight(n, scene.lights[n]);
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	553
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	554 // Define the camera
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	555 gluLookAt(0, 0.12, 0.24, 0, 0.12, 0, 0, 1, 0);
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	556
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	557
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	558 // Main loop starts
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	559 startTime = cycleStart = SDL_GetTicks();
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	560
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	561 while (!exitFlag)
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	562 {
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	563 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	564
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	565 // Check for quit events
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	566 while (SDL_PollEvent(&event))
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	567 switch (event.type)
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	568 {
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	569 case SDL_QUIT:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	570 exitFlag = true;
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	571 break;
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	572
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	573 case SDL_KEYDOWN:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	574 switch (event.key.keysym.sym)
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	575 {
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	576 case SDLK_ESCAPE:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	577 case SDLK_q:
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	578 exitFlag = true;
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	579 break;
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	580 }
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	581 }
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	582
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	583 // Render the next frame
21 1404dfcee7b8 More work on scenefile and model loading support. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	584 dmDrawScene(scene);
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	585
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	586 // Draw the current frame
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	587 SDL_GL_SwapWindow(dmWindow);
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	588
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	589 // Rotate for 2 degrees
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	590 glRotatef(2.0f, 0, 1, 0);
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	591
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	592 // Return true if a full rotation was done
15 2d2aadfa3df3 Fix calculation of totalFrames. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	593 totalFrames++;
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	594 if (cycleFrames++ == SET_FRAMES)
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	595 {
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	596 // Reset cycleFrames
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	597 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	598
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	599 // 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	600 int cycleEnd = SDL_GetTicks();
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	601 double cycleTime = cycleEnd - cycleStart;
10 c6c419861101 Use SDL_GetTicks() instead of std::clock(). Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	602
c6c419861101 Use SDL_GetTicks() instead of std::clock(). Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	603 // Restart the timer
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	604 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	605
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	606 // Print the current frames per second
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	607 printf("%.1lf ms for %d frames = %.1lf FPS\n",
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	608 cycleTime, SET_FRAMES, (SET_FRAMES * 1000.0f) / cycleTime);
3 be31ff9e5f58 Port to libSDL2, clean up the code and some de-C++-ifications. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	609 }
2 b45d8958e5a6 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	610 }
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	611
13 c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	612 // Show totals
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	613 totalTime = SDL_GetTicks() - startTime;
c1e8057cc4d0 Improvements to option handling, add option for setting preferred vsync Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	614 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	615 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	616
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	617 exit:
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	618 if (dmGLContext != NULL)
628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	619 SDL_GL_DeleteContext(dmGLContext);
5 5dcae4dddcd9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 3 diff changeset	620
8 628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	621 if (dmWindow != NULL)
628c42e94149 Clean up variable names. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	622 SDL_DestroyWindow(dmWindow);
6 4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	623
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	624 SDL_Quit();
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	625
4d6fec8f0c64 Implement optional support for vertex/fragment shaders. Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	626 return 0;
0 3d74a9dd96e4 Initial import of Thomas Trummer's original code. Thomas Trummer parents: diff changeset	627 }

Mercurial > hg > forks > gldragon

annotate gldragon.cpp @ 51:9c6654647608