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

Revert "Compile fixes for VS2012"

Browse Source 
This reverts commit e8313a683bd748ab36b2aff42ebdd16d28bd5320.
This commit is contained in:
David Williams 2014-05-23 16:11:53 +02:00
parent e8313a683b
commit 79acf814db
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
examples/Basic/OpenGLWidget.cpp
View File

@ -86,44 +86,44 @@ void OpenGLWidget::initializeGL()
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
glDepthRange(0.0, 1.0); glDepthRange(0.0, 1.0);
if (!shader.addShaderFromSourceCode(QGLShader::Vertex, if (!shader.addShaderFromSourceCode(QGLShader::Vertex, R"(
"#version 140\n" #version 140
"in vec4 position; //This will be the position of the vertex in model-space\n" in vec4 position; //This will be the position of the vertex in model-space
"uniform mat4 cameraToClipMatrix;\n" uniform mat4 cameraToClipMatrix;
"uniform mat4 worldToCameraMatrix;\n" uniform mat4 worldToCameraMatrix;
"uniform mat4 modelToWorldMatrix;\n" uniform mat4 modelToWorldMatrix;
"out vec4 worldPosition; //This is being passed to the fragment shader to calculate the normals\n" out vec4 worldPosition; //This is being passed to the fragment shader to calculate the normals
"void main()\n" void main()
"{\n" {
" worldPosition = modelToWorldMatrix * position;\n" worldPosition = modelToWorldMatrix * position;
" vec4 cameraPosition = worldToCameraMatrix * worldPosition;\n" vec4 cameraPosition = worldToCameraMatrix * worldPosition;
" gl_Position = cameraToClipMatrix * cameraPosition;\n" gl_Position = cameraToClipMatrix * cameraPosition;
"}\n" }
)) )"))
{ {
std::cerr << shader.log().toStdString() << std::endl; std::cerr << shader.log().toStdString() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!shader.addShaderFromSourceCode(QGLShader::Fragment, if (!shader.addShaderFromSourceCode(QGLShader::Fragment, R"(
"#version 130\n" #version 130
"in vec4 worldPosition; //Passed in from the vertex shader\n" in vec4 worldPosition; //Passed in from the vertex shader
"out vec4 outputColor;\n" out vec4 outputColor;
"void main()\n" void main()
"{\n" {
" vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz)));\n" vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz)));
" float color = clamp(abs(dot(normalize(normal.xyz), vec3(0.9,0.1,0.5))), 0, 1);\n" float color = clamp(abs(dot(normalize(normal.xyz), vec3(0.9,0.1,0.5))), 0, 1);
" outputColor = vec4(1.0, 0.5, color, 1.0);\n" outputColor = vec4(1.0, 0.5, color, 1.0);
"}" }
)) )"))
{ {
std::cerr << shader.log().toStdString() << std::endl; std::cerr << shader.log().toStdString() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -149,7 +149,7 @@ void OpenGLWidget::resizeGL(int w, int h)
float zNear = 1.0; float zNear = 1.0;
float zFar = 1000.0; float zFar = 1000.0;
QMatrix4x4 cameraToClipMatrix; QMatrix4x4 cameraToClipMatrix{};
cameraToClipMatrix.frustum(-aspectRatio, aspectRatio, -1, 1, zNear, zFar); cameraToClipMatrix.frustum(-aspectRatio, aspectRatio, -1, 1, zNear, zFar);
shader.bind(); shader.bind();
@ -162,7 +162,7 @@ void OpenGLWidget::paintGL()
//Clear the screen //Clear the screen
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
//modelToWorldMatrix.rotate(m_yRotation, 1, 0, 0); //rotate around x-axis //modelToWorldMatrix.rotate(m_yRotation, 1, 0, 0); //rotate around x-axis
//modelToWorldMatrix.translate(-32, -32, -32); //centre the model on the origin //modelToWorldMatrix.translate(-32, -32, -32); //centre the model on the origin
@ -220,7 +220,7 @@ void OpenGLWidget::setupWorldToCameraMatrix()
QVector3D centerPoint = (lowerCorner + upperCorner) * 0.5; QVector3D centerPoint = (lowerCorner + upperCorner) * 0.5;
float fDiagonalLength = (upperCorner - lowerCorner).length(); float fDiagonalLength = (upperCorner - lowerCorner).length();
QMatrix4x4 worldToCameraMatrix; QMatrix4x4 worldToCameraMatrix{};
worldToCameraMatrix.translate(0, 0, -fDiagonalLength / 2.0f); //Move the camera back by the required amount worldToCameraMatrix.translate(0, 0, -fDiagonalLength / 2.0f); //Move the camera back by the required amount
worldToCameraMatrix.rotate(m_xRotation, 0, 1, 0); //rotate around y-axis worldToCameraMatrix.rotate(m_xRotation, 0, 1, 0); //rotate around y-axis
worldToCameraMatrix.rotate(m_yRotation, 1, 0, 0); //rotate around x-axis worldToCameraMatrix.rotate(m_yRotation, 1, 0, 0); //rotate around x-axis