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

Remove usage of QOpenGLFunctions and use GLEW instead.

Browse Source 
Qt's OpenGL interface was causing problems on Windows since it doesn't mix
well with ANGLE.

Relates to issue #50.
This commit is contained in:
Matt Williams 2014-03-23 12:16:02 +00:00
parent ac16dfd325
commit 464d713c2a
3 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/Basic/CMakeLists.txt
View File

@ -32,13 +32,17 @@ SET(INC_FILES
OpenGLWidget.h OpenGLWidget.h
) )
add_definitions(-DGLEW_STATIC)
#"Sources" and "Headers" are the group names in Visual Studio. #"Sources" and "Headers" are the group names in Visual Studio.
#They may have other uses too... #They may have other uses too...
SOURCE_GROUP("Sources" FILES ${SRC_FILES}) SOURCE_GROUP("Sources" FILES ${SRC_FILES})
SOURCE_GROUP("Headers" FILES ${INC_FILES}) SOURCE_GROUP("Headers" FILES ${INC_FILES})
FIND_PACKAGE(OpenGL REQUIRED)
#Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
INCLUDE_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR})
LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR})
#Build #Build
@ -46,7 +50,7 @@ ADD_EXECUTABLE(BasicExample ${SRC_FILES})
IF(MSVC) IF(MSVC)
SET_TARGET_PROPERTIES(BasicExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") SET_TARGET_PROPERTIES(BasicExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127")
ENDIF(MSVC) ENDIF(MSVC)
TARGET_LINK_LIBRARIES(BasicExample Qt5::OpenGL PolyVoxCore) TARGET_LINK_LIBRARIES(BasicExample glew Qt5::OpenGL ${OPENGL_gl_LIBRARY} PolyVoxCore)
SET_PROPERTY(TARGET BasicExample PROPERTY FOLDER "Examples") SET_PROPERTY(TARGET BasicExample PROPERTY FOLDER "Examples")
#Install - Only install the example in Windows #Install - Only install the example in Windows

79
examples/Basic/OpenGLWidget.cpp
View File

@ -11,7 +11,6 @@ OpenGLWidget::OpenGLWidget(QWidget *parent)
:QGLWidget(parent) :QGLWidget(parent)
,m_xRotation(0) ,m_xRotation(0)
,m_yRotation(0) ,m_yRotation(0)
,gl(nullptr)
{ {
} }
@ -22,63 +21,57 @@ void OpenGLWidget::setSurfaceMeshToRender(const PolyVox::SurfaceMesh<PositionMat
const auto& vecVertices = surfaceMesh.getVertices(); const auto& vecVertices = surfaceMesh.getVertices();
//Create the VAO for the mesh //Create the VAO for the mesh
gl->glGenVertexArrays(1, &vertexArrayObject); glGenVertexArrays(1, &vertexArrayObject);
gl->glBindVertexArray(vertexArrayObject); glBindVertexArray(vertexArrayObject);
//The GL_ARRAY_BUFFER will contain the list of vertex positions //The GL_ARRAY_BUFFER will contain the list of vertex positions
gl->glGenBuffers(1, &vertexBuffer); glGenBuffers(1, &vertexBuffer);
gl->glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer); glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
gl->glBufferData(GL_ARRAY_BUFFER, vecVertices.size() * sizeof(PositionMaterial), vecVertices.data(), GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, vecVertices.size() * sizeof(PositionMaterial), vecVertices.data(), GL_STATIC_DRAW);
//and GL_ELEMENT_ARRAY_BUFFER will contain the indices //and GL_ELEMENT_ARRAY_BUFFER will contain the indices
gl->glGenBuffers(1, &indexBuffer); glGenBuffers(1, &indexBuffer);
gl->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
gl->glBufferData(GL_ELEMENT_ARRAY_BUFFER, vecIndices.size() * sizeof(uint32_t), vecIndices.data(), GL_STATIC_DRAW); glBufferData(GL_ELEMENT_ARRAY_BUFFER, vecIndices.size() * sizeof(uint32_t), vecIndices.data(), GL_STATIC_DRAW);
//We need to tell OpenGL how to understand the format of the vertex data //We need to tell OpenGL how to understand the format of the vertex data
gl->glEnableVertexAttribArray(0); //We're talking about shader attribute '0' glEnableVertexAttribArray(0); //We're talking about shader attribute '0'
gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(PositionMaterial), 0); //take the first 3 floats from every sizeof(decltype(vecVertices)::value_type) glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(PositionMaterial), 0); //take the first 3 floats from every sizeof(decltype(vecVertices)::value_type)
gl->glBindVertexArray(0); glBindVertexArray(0);
noOfIndices = vecIndices.size(); //Save this for the call to glDrawElements later noOfIndices = vecIndices.size(); //Save this for the call to glDrawElements later
} }
void OpenGLWidget::initializeGL() void OpenGLWidget::initializeGL()
{ {
//'gl' will give us access to all the OpenGL functions GLenum err = glewInit();
gl = context()->contextHandle()->versionFunctions<QOpenGLFunctions_3_1>(); if (GLEW_OK != err)
if(!gl)
{ {
std::cerr << "Could not obtain required OpenGL context version" << std::endl; /* Problem: glewInit failed, something is seriously wrong. */
exit(EXIT_FAILURE); std::cout << "GLEW Error: " << glewGetErrorString(err) << std::endl;
}
if(!gl->initializeOpenGLFunctions())
{
std::cerr << "Could not initialise OpenGL functions" << std::endl;
exit(EXIT_FAILURE);
} }
//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(gl->glGetString(GL_VENDOR)) if(glGetString(GL_VENDOR))
std::cout << "\tGL_VENDOR: " << gl->glGetString(GL_VENDOR) << std::endl; std::cout << "\tGL_VENDOR: " << glGetString(GL_VENDOR) << std::endl;
if(gl->glGetString(GL_RENDERER)) if(glGetString(GL_RENDERER))
std::cout << "\tGL_RENDERER: " << gl->glGetString(GL_RENDERER) << std::endl; std::cout << "\tGL_RENDERER: " << glGetString(GL_RENDERER) << std::endl;
if(gl->glGetString(GL_VERSION)) if(glGetString(GL_VERSION))
std::cout << "\tGL_VERSION: " << gl->glGetString(GL_VERSION) << std::endl; std::cout << "\tGL_VERSION: " << glGetString(GL_VERSION) << std::endl;
if(gl->glGetString(GL_SHADING_LANGUAGE_VERSION)) if(glGetString(GL_SHADING_LANGUAGE_VERSION))
std::cout << "\tGL_SHADING_LANGUAGE_VERSION: " << gl->glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl; std::cout << "\tGL_SHADING_LANGUAGE_VERSION: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
//Set up the clear colour //Set up the clear colour
gl->glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
gl->glClearDepth(1.0f); glClearDepth(1.0f);
gl->glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
gl->glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
gl->glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);
gl->glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
gl->glDepthRange(0.0, 1.0); glDepthRange(0.0, 1.0);
if(!shader.addShaderFromSourceCode(QOpenGLShader::Vertex, R"( if(!shader.addShaderFromSourceCode(QOpenGLShader::Vertex, R"(
#version 140 #version 140
@ -144,7 +137,7 @@ void OpenGLWidget::initializeGL()
void OpenGLWidget::resizeGL(int w, int h) void OpenGLWidget::resizeGL(int w, int h)
{ {
//Setup the viewport //Setup the viewport
gl->glViewport(0, 0, w, h); glViewport(0, 0, w, h);
auto aspectRatio = w / (float)h; auto aspectRatio = w / (float)h;
float zNear = 1.0; float zNear = 1.0;
@ -161,7 +154,7 @@ void OpenGLWidget::resizeGL(int w, int h)
void OpenGLWidget::paintGL() void OpenGLWidget::paintGL()
{ {
//Clear the screen //Clear the screen
gl->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
QMatrix4x4 modelToWorldMatrix{}; QMatrix4x4 modelToWorldMatrix{};
modelToWorldMatrix.rotate(m_xRotation, 0, 1, 0); //rotate around y-axis modelToWorldMatrix.rotate(m_xRotation, 0, 1, 0); //rotate around y-axis
@ -172,15 +165,15 @@ void OpenGLWidget::paintGL()
shader.setUniformValue("modelToWorldMatrix", modelToWorldMatrix); //Update to the latest camera matrix shader.setUniformValue("modelToWorldMatrix", modelToWorldMatrix); //Update to the latest camera matrix
gl->glBindVertexArray(vertexArrayObject); glBindVertexArray(vertexArrayObject);
gl->glDrawElements(GL_TRIANGLES, noOfIndices, GL_UNSIGNED_INT, 0); glDrawElements(GL_TRIANGLES, noOfIndices, GL_UNSIGNED_INT, 0);
gl->glBindVertexArray(0); glBindVertexArray(0);
shader.release(); shader.release();
GLenum errCode = gl->glGetError(); GLenum errCode = 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;

5
examples/Basic/OpenGLWidget.h
View File

@ -26,12 +26,10 @@ distribution.
#include "PolyVoxCore/SurfaceMesh.h" #include "PolyVoxCore/SurfaceMesh.h"
#include <QOpenGLFunctions_3_1> #include "glew/glew.h"
#include <QGLWidget> #include <QGLWidget>
#include <QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <QOpenGLVertexArrayObject>
#include <QOpenGLBuffer>
class OpenGLWidget : public QGLWidget class OpenGLWidget : public QGLWidget
{ {
@ -60,7 +58,6 @@ private:
GLuint vertexArrayObject; GLuint vertexArrayObject;
QOpenGLShaderProgram shader; QOpenGLShaderProgram shader;
QOpenGLFunctions_3_1* gl;
//Mouse data //Mouse data
QPoint m_LastFrameMousePos; QPoint m_LastFrameMousePos;