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

Unfortunately VS2012 doesn't support 'R' raw string literals . Maybe the shader code should be moved into separate files anyway.

Browse Source
This commit is contained in:
David Williams 2014-03-25 23:00:29 +01:00
parent a78508a79f
commit 7b5e1cd1d5
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
examples/Basic/OpenGLWidget.cpp
View File

@ -68,44 +68,44 @@ void OpenGLWidget::initializeGL()
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
glDepthRange(0.0, 1.0); glDepthRange(0.0, 1.0);
if(!shader.addShaderFromSourceCode(QOpenGLShader::Vertex, R"( if(!shader.addShaderFromSourceCode(QOpenGLShader::Vertex,
#version 140 "#version 140\n"
in vec4 position; //This will be the position of the vertex in model-space "in vec4 position; //This will be the position of the vertex in model-space\n"
uniform mat4 cameraToClipMatrix; "uniform mat4 cameraToClipMatrix;\n"
uniform mat4 worldToCameraMatrix; "uniform mat4 worldToCameraMatrix;\n"
uniform mat4 modelToWorldMatrix; "uniform mat4 modelToWorldMatrix;\n"
out vec4 worldPosition; //This is being passed to the fragment shader to calculate the normals "out vec4 worldPosition; //This is being passed to the fragment shader to calculate the normals\n"
void main() "void main()\n"
{ "{\n"
worldPosition = modelToWorldMatrix * position; " worldPosition = modelToWorldMatrix * position;\n"
vec4 cameraPosition = worldToCameraMatrix * worldPosition; " vec4 cameraPosition = worldToCameraMatrix * worldPosition;\n"
gl_Position = cameraToClipMatrix * cameraPosition; " gl_Position = cameraToClipMatrix * cameraPosition;\n"
} "}\n"
)")) ))
{ {
std::cerr << shader.log().toStdString() << std::endl; std::cerr << shader.log().toStdString() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(!shader.addShaderFromSourceCode(QOpenGLShader::Fragment, R"( if(!shader.addShaderFromSourceCode(QOpenGLShader::Fragment,
#version 130 "#version 130\n"
in vec4 worldPosition; //Passed in from the vertex shader "in vec4 worldPosition; //Passed in from the vertex shader\n"
out vec4 outputColor; "out vec4 outputColor;\n"
void main() "void main()\n"
{ "{\n"
vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz))); " vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz)));\n"
float color = clamp(abs(dot(normalize(normal.xyz), vec3(0.9,0.1,0.5))), 0, 1); " float color = clamp(abs(dot(normalize(normal.xyz), vec3(0.9,0.1,0.5))), 0, 1);\n"
outputColor = vec4(1.0, 0.5, color, 1.0); " outputColor = vec4(1.0, 0.5, color, 1.0);\n"
} "}\n"
)")) ))
{ {
std::cerr << shader.log().toStdString() << std::endl; std::cerr << shader.log().toStdString() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);