Merge branch 'render' of github.com:maberet/ProjetZZ1 into render

travail_de_groupe/jeu_appren_par_renfo/src/player.c

@@ -88,7 +88,7 @@ void hitBall()
                 ball.y = player.y;
                 ball.z = player.h;*/
                 ball.angle = player.angle;
-                ball.speed = HIT_FORCE;
+                ball.speed = 2 * HIT_FORCE;
                 ball.z = player.h;
                 ball.isHit = 1;
             }

travail_de_groupe/jeu_appren_par_renfo/src/render.c

@@ -746,7 +746,7 @@ void drawBall()
         rect.x = screenDimension.w / 2 + (screenDimension.w * tan(ballAngle - player.angle)) * sqrt(3) * 0.5;
         rect.w = (ballWidth * screenDimension.w) / (ballDistance / BLOCK_SIZE);
         rect.h = (ballHeight * screenDimension.h) / (ballDistance / BLOCK_SIZE);
-        rect.y = (3 * screenDimension.h / 4 + player.viewAngle) - rect.h / 5 - 1.5 * tan(ballViewAngle) * ballDistance;
+        rect.y = (3 * screenDimension.h / 4 + player.viewAngle) - sqrt(3) * tan(ballViewAngle) * ballDistance;
         //printf("%d %d %d %d\n", rect.x, rect.y, rect.w, rect.h);
 
         destRect.x = 0;