Merge branch 'main' of https://gitlab.binets.fr/noe.artru/projet-inf443-mae

projet-code/scenes_inf443/base/shaders/mesh_transparency/frag.glsl

-#version 300 es // Compatible with OpenGL ES
-precision mediump float;
+#version 330 core
 
 // Fragment shader - this code is executed for every pixel/fragment that belongs to a displayed shape
 //

projet-code/scenes_inf443/base/shaders/mesh_transparency/vert.glsl

-#version 300 es // Compatible with OpenGL ES
-precision mediump float;
+#version 330 core
 
 // Vertex shader - this code is executed for every vertex of the shape
 

projet-code/scenes_inf443/base/src/scene.cpp

@@ -359,7 +359,7 @@ void scene_structure::display_gui()
 
 void scene_structure::display_ball() {
 
-	bouncing.simulate(timer_chain.scale * 0.01f, terrain_length);
+	bouncing.simulate(timer.scale * 0.01f, terrain_length);
 	for (int i = 0; i < bouncing.N; i++) {	
 		bouncing.mesh.model.translation = bouncing.pos[i];
 		bouncing.mesh.material.color = bouncing.color[i];
@@ -369,7 +369,7 @@ void scene_structure::display_ball() {
 
 void scene_structure::display_projectiles() {
 
-	projectiles.simulate(timer_chain.scale * 0.01f, terrain_length);
+	projectiles.simulate(timer.scale * 0.03f, terrain_length);
 	for (int i = 0; i < projectiles.N; i++) {
 		projectiles.mesh.model.translation = projectiles.pos[i];
 		projectiles.mesh.material.color = projectiles.color[i];

projet-code/scenes_inf443/base/src/scene.hpp

@@ -47,10 +47,10 @@ struct scene_structure : cgp::scene_inputs_generic {
 	// ****************************** //
 	// Elements and shapes of the scene
 	// ****************************** //
-
-	// Timer used for the animation
+	
 	cgp::skybox_drawable skybox;
 
+	// Timer used for the animation
 	timer_basic timer;
 
 	cgp::mesh_drawable terrain;