lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from zwookie/master

Browse Source 
fixed Linux error with the gamma variable already being defined in mathcalls.h
This commit is contained in:
JoeyDeVries
2015-05-23 09:49:39 +02:00
parent 349a95b997 4018e023de
commit e1e307f3de
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/5.advanced_lighting/2.gamma_correction/gamma_correction.cpp
View File

@@ -35,7 +35,7 @@ GLfloat deltaTime = 0.0f;
GLfloat lastFrame = 0.0f;
// Options
GLboolean gamma = false;
GLboolean gammaEnabled = false;
// The MAIN function, from here we start our application and run our Game loop
int main()
@@ -141,14 +141,14 @@ int main()
glUniform3fv(glGetUniformLocation(shader.Program, "lightPositions"), 4, &lightPositions[0][0]);
glUniform3fv(glGetUniformLocation(shader.Program, "lightColors"), 4, &lightColors[0][0]);
glUniform3fv(glGetUniformLocation(shader.Program, "viewPos"), 1, &camera.Position[0]);
glUniform1i(glGetUniformLocation(shader.Program, "gamma"), gamma);
glUniform1i(glGetUniformLocation(shader.Program, "gamma"), gammaEnabled);
// Floor
glBindVertexArray(planeVAO);
glBindTexture(GL_TEXTURE_2D, gamma ? floorTextureGammaCorrected : floorTexture);
glBindTexture(GL_TEXTURE_2D, gammaEnabled ? floorTextureGammaCorrected : floorTexture);
glDrawArrays(GL_TRIANGLES, 0, 6);
glBindVertexArray(0);
std::cout << (gamma ? "Gamma enabled" : "Gamma disabled") << std::endl;
std::cout << (gammaEnabled ? "Gamma enabled" : "Gamma disabled") << std::endl;
// Swap the buffers
glfwSwapBuffers(window);
@@ -201,7 +201,7 @@ void Do_Movement()
if (keys[GLFW_KEY_SPACE] && !keysPressed[GLFW_KEY_SPACE])
{
gamma = !gamma;
gammaEnabled = !gammaEnabled;
keysPressed[GLFW_KEY_SPACE] = true;
}
}
@@ -247,4 +247,4 @@ void mouse_callback(GLFWwindow* window, double xpos, double ypos)
void scroll_callback(GLFWwindow* window, double xoffset, double yoffset)
{
camera.ProcessMouseScroll(yoffset);
}
}