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

This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.

Browse Source 
For more details see here: https://bitbucket.org/volumesoffun/polyvox/issue/41/upgrade-to-qt-5
This commit is contained in:
David Williams
2014-05-05 20:29:52 +02:00
parent fe3f2d589e
commit 2da902d5f9
8 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/Basic/OpenGLWidget.cpp
View File

@ -2,7 +2,7 @@
#include <QMouseEvent>
#include <QMatrix4x4>
#include <QtMath>
//#include <QtMath>
using namespace PolyVox;
using namespace std;
@ -73,7 +73,7 @@ void OpenGLWidget::initializeGL()
glDepthFunc(GL_LEQUAL);
glDepthRange(0.0, 1.0);
if(!shader.addShaderFromSourceCode(QOpenGLShader::Vertex, R"(
if (!shader.addShaderFromSourceCode(QGLShader::Vertex, R"(
#version 140
in vec4 position; //This will be the position of the vertex in model-space
@ -96,7 +96,7 @@ void OpenGLWidget::initializeGL()
exit(EXIT_FAILURE);
}
if(!shader.addShaderFromSourceCode(QOpenGLShader::Fragment, R"(
if (!shader.addShaderFromSourceCode(QGLShader::Fragment, R"(
#version 130
in vec4 worldPosition; //Passed in from the vertex shader