AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

More compile fixes for GCC. Because our openGLWidget is now templatized we need to explicitly use 'this->' to access base members (and the gl...() functions are provided by the base class in Qt). See http://stackoverflow.com/a/15505043

Browse Source
This commit is contained in:
David Williams 2015-02-25 16:11:22 +01:00
parent f7af804ccf
commit 7ac652e92b
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
examples/common/OpenGLWidget.inl
View File

@ -48,23 +48,23 @@ void OpenGLWidget<QOpenGLFunctionsType>::initializeGL()
//Print out some information about the OpenGL implementation. //Print out some information about the OpenGL implementation.
std::cout << "OpenGL Implementation Details:" << std::endl; std::cout << "OpenGL Implementation Details:" << std::endl;
if(glGetString(GL_VENDOR)) if(this->glGetString(GL_VENDOR))
std::cout << "\tGL_VENDOR: " << glGetString(GL_VENDOR) << std::endl; std::cout << "\tGL_VENDOR: " << this->glGetString(GL_VENDOR) << std::endl;
if(glGetString(GL_RENDERER)) if(this->glGetString(GL_RENDERER))
std::cout << "\tGL_RENDERER: " << glGetString(GL_RENDERER) << std::endl; std::cout << "\tGL_RENDERER: " << this->glGetString(GL_RENDERER) << std::endl;
if(glGetString(GL_VERSION)) if(this->glGetString(GL_VERSION))
std::cout << "\tGL_VERSION: " << glGetString(GL_VERSION) << std::endl; std::cout << "\tGL_VERSION: " << this->glGetString(GL_VERSION) << std::endl;
if(glGetString(GL_SHADING_LANGUAGE_VERSION)) if(this->glGetString(GL_SHADING_LANGUAGE_VERSION))
std::cout << "\tGL_SHADING_LANGUAGE_VERSION: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl; std::cout << "\tGL_SHADING_LANGUAGE_VERSION: " << this->glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
//Set up the clear colour //Set up the clear colour
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); this->glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glClearDepth(1.0f); this->glClearDepth(1.0f);
glEnable(GL_DEPTH_TEST); this->glEnable(GL_DEPTH_TEST);
glDepthMask(GL_TRUE); this->glDepthMask(GL_TRUE);
glDepthFunc(GL_LEQUAL); this->glDepthFunc(GL_LEQUAL);
glDepthRange(0.0, 1.0); this->glDepthRange(0.0, 1.0);
initialize(); initialize();
@ -80,7 +80,7 @@ template <typename QOpenGLFunctionsType>
void OpenGLWidget<QOpenGLFunctionsType>::resizeGL(int w, int h) void OpenGLWidget<QOpenGLFunctionsType>::resizeGL(int w, int h)
{ {
//Setup the viewport //Setup the viewport
glViewport(0, 0, w, h); this->glViewport(0, 0, w, h);
auto aspectRatio = w / (float)h; auto aspectRatio = w / (float)h;
float zNear = 1.0; float zNear = 1.0;
@ -142,12 +142,12 @@ void OpenGLWidget<QOpenGLFunctionsType>::paintGL()
); );
//Clear the screen //Clear the screen
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); this->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
renderOneFrame(); renderOneFrame();
// Check for errors. // Check for errors.
GLenum errCode = glGetError(); GLenum errCode = this->glGetError();
if(errCode != GL_NO_ERROR) if(errCode != GL_NO_ERROR)
{ {
std::cerr << "OpenGL Error: " << errCode << std::endl; std::cerr << "OpenGL Error: " << errCode << std::endl;