Merge remote-tracking branch 'origin/master'

Author: Akynna

Project/icg17/Sans titre.png

@@ -20,7 +20,6 @@ file(GLOB SHADERS
     cube/*.glsl
     water/*.glsl
     noise/*.glsl
-    displaytexture/*.glsl
     grid/*.glsl
         )
 deploy_shaders_to_build_dir(${SHADERS})

Project/icg17/Sans titre_1.png

@@ -142,8 +142,6 @@ void main() {
     chooseColorOnHeight(height, normal);
 
     // PHONG SHADING
-    //raw_color=vec3(0);
-
     vec3 light_dir = light_pos - vpoint_mv.xyz;
     vec3 view_dir = -vpoint_mv.xyz;
 

Project/icg17/Sans titre_2.png

@@ -412,7 +412,6 @@ void KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods
             // variation of speed
             float v1 = 0.72f;
             float v2 = 1-v1;
-            //if(action == GLFW_REPEAT) {
             switch(key){
 
             case GLFW_KEY_LEFT:
@@ -452,7 +451,6 @@ void KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods
                 speedBezierFPS += 0.05f;
                 break;
             }
-            //}
         }
     }
 }

Project/icg17/Sans titre_3.png

@@ -228,10 +228,7 @@ class Sky {
         glDeleteTextures(1, &texture_id_sky);
     }
 
-    void Draw(float time,
-              const glm::mat4& model,
-              const glm::mat4& view,
-              const glm::mat4& projection) {
+    void Draw(float time, const glm::mat4& model, const glm::mat4& view, const glm::mat4& projection) {
         glUseProgram(program_id_);
         glBindVertexArray(vertex_array_id_sky);
         glDisable(GL_DEPTH_TEST); // sky always in background

Project/icg17/Sans titre_4.png

@@ -140,7 +140,7 @@ class Water : public Material, public Light{
             glActiveTexture(GL_TEXTURE20);
             glBindTexture(GL_TEXTURE_2D, reflection_texture_id_);
             GLuint tex_id = glGetUniformLocation(program_id_, "tex_water");
-            glUniform1i(tex_id, 20 /*GL_TEXTURE0*/);
+            glUniform1i(tex_id, 20);
 
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -199,7 +199,7 @@ class Water : public Material, public Light{
         glActiveTexture(GL_TEXTURE18);
         glBindTexture(GL_TEXTURE_2D, tex_dudv_);
         GLuint tex_dudv_id = glGetUniformLocation(program_id_, "tex_dudv");
-        glUniform1i(tex_dudv_id, 18 /*GL_TEXTURE3*/);
+        glUniform1i(tex_dudv_id, 18);
 
         // setup matrix stack - model, view, projection
         GLint model_id = glGetUniformLocation(program_id_, "model");

Project/icg17/Sans titre_5.png

@@ -43,11 +43,9 @@ void main() {
     vec4 water_blue_color = mix(color1, reflect_color, reflect_intensity);
 
 
-
     // little adjustments
     water_blue_color -= 0.20;
     water_blue_color.b += 15/255.;
-    //water_blue_color.g += 35/255.;
     vec3 final_color = mix(wave_color, water_blue_color, vec4(0.9)).rgb;
 
     // mix hardcoded with skybox color to et smoother fade away

Project/icg17/Sans titre_6.png

@@ -16,7 +16,6 @@ out vec2 textureCoords;
 
 out float transparency;
 
-
 void main() {
     uv = (position + vec2(1.0, 1.0)) * 0.5;