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

Removed use of 'R' raw string literals as CS 2012 doesn't support them.

Browse Source
This commit is contained in:
David Williams
2014-05-26 22:51:09 +02:00
parent 5a23299634
commit ba58cff815
2 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
examples/common/OpenGLWidget.cpp
View File

@ -91,28 +91,28 @@ void OpenGLWidget::initializeGL()
// This is basically a simple fallback vertex shader which does the most basic rendering possible.
// PolyVox examples are able to provide their own shaders to demonstrate certain effects if desired.
if (!mShader->addShaderFromSourceCode(QGLShader::Vertex, R"(
#version 140
if (!mShader->addShaderFromSourceCode(QGLShader::Vertex,
"#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"
// The usual matrices are provided
uniform mat4 cameraToClipMatrix;
uniform mat4 worldToCameraMatrix;
uniform mat4 modelToWorldMatrix;
"// The usual matrices are provided\n"
"uniform mat4 cameraToClipMatrix;\n"
"uniform mat4 worldToCameraMatrix;\n"
"uniform mat4 modelToWorldMatrix;\n"
// This will be used by the fragment shader to calculate flat-shaded normals. This is an unconventional approach
// but we use it in this example framework because not all surface extractor generate surface normals.
out vec4 worldPosition;
"// This will be used by the fragment shader to calculate flat-shaded normals. This is an unconventional approach\n"
"// but we use it in this example framework because not all surface extractor generate surface normals.\n"
"out vec4 worldPosition;\n"
void main()
{
// Standard sequence of OpenGL transformations.
worldPosition = modelToWorldMatrix * position;
vec4 cameraPosition = worldToCameraMatrix * worldPosition;
gl_Position = cameraToClipMatrix * cameraPosition;
}
)"))
"void main()\n"
"{\n"
" // Standard sequence of OpenGL transformations.\n"
" worldPosition = modelToWorldMatrix * position;\n"
" vec4 cameraPosition = worldToCameraMatrix * worldPosition;\n"
" gl_Position = cameraToClipMatrix * cameraPosition;\n"
"}\n"
))
{
std::cerr << mShader->log().toStdString() << std::endl;
exit(EXIT_FAILURE);
@ -120,27 +120,27 @@ void OpenGLWidget::initializeGL()
// This is basically a simple fallback fragment shader which does the most basic rendering possible.
// PolyVox examples are able to provide their own shaders to demonstrate certain effects if desired.
if (!mShader->addShaderFromSourceCode(QGLShader::Fragment, R"(
#version 130
if (!mShader->addShaderFromSourceCode(QGLShader::Fragment,
"#version 130\n"
// Passed in from the vertex shader
in vec4 worldPosition;
in vec4 worldNormal;
"// Passed in from the vertex shader\n"
"in vec4 worldPosition;\n"
"in vec4 worldNormal;\n"
// the color that gets written to the display
out vec4 outputColor;
"// the color that gets written to the display\n"
"out vec4 outputColor;\n"
void main()
{
// Again, for the purposes of these examples we cannot be sure that per-vertex normals are provided. A sensible fallback
// is to use this little trick to compute per-fragment flat-shaded normals from the world positions using derivative operations.
vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz)));
"void main()\n"
"{\n"
" // Again, for the purposes of these examples we cannot be sure that per-vertex normals are provided. A sensible fallback \n"
" // is to use this little trick to compute per-fragment flat-shaded normals from the world positions using derivative operations.\n"
" vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz)));\n"
// We are just using the normal as the output color, and making it lighter so it looks a bit nicer.
// Obviously a real shader would also do texuring, lighting, or whatever is required for the application.
outputColor = vec4(abs(normal) * 0.5 + vec3(0.5, 0.5, 0.5), 1.0);
}
)"))
" // We are just using the normal as the output color, and making it lighter so it looks a bit nicer. \n"
" // Obviously a real shader would also do texuring, lighting, or whatever is required for the application.\n"
" outputColor = vec4(abs(normal) * 0.5 + vec3(0.5, 0.5, 0.5), 1.0);\n"
"}\n"
))
{
std::cerr << mShader->log().toStdString() << std::endl;
exit(EXIT_FAILURE);