From c2d4820b95c825ffa813ee60a85caee1c4b351d5 Mon Sep 17 00:00:00 2001
From: antoinemeyer5 <antoine.meyer54@gmail.com>
Date: Thu, 30 Jun 2022 09:42:30 +0200
Subject: [PATCH] suppression d'un affichage de taha
---
travail_de_groupe/jeu_appren_par_renfo/src/player.c | 12 ------------
travail_de_groupe/jeu_appren_par_renfo/src/render.c | 10 +++++-----
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/travail_de_groupe/jeu_appren_par_renfo/src/player.c b/travail_de_groupe/jeu_appren_par_renfo/src/player.c
index 6cc8467..c4a3727 100644
--- a/travail_de_groupe/jeu_appren_par_renfo/src/player.c
+++ b/travail_de_groupe/jeu_appren_par_renfo/src/player.c
@@ -114,18 +114,6 @@ void updateBall()
{
// landingPoint est déjà / BLOCK_SIZE de base
ball.z = lagrangeInterpolation(ball.x / BLOCK_SIZE, lastHitPoint[0] / BLOCK_SIZE, lastHitPoint[1] / BLOCK_SIZE, 15, 2 * player.h / BLOCK_SIZE, landingPoint[0], 0);
- if (ball.z > 0)
- {
- /*printf("param. lagrange : xp=%f, xd=%d, yd=%d, xf=%d, yf=%d, xt=%d, yt=%d\n",
- ball.x / BLOCK_SIZE,
- lastHitPoint[0] / BLOCK_SIZE,
- lastHitPoint[1] / BLOCK_SIZE,
- 15,
- 2 * player.h / BLOCK_SIZE,
- landingPoint[0],
- 0);
- printf("ballZ: %f\n", ball.z);*/
- }
}
if ((int)ball.z == 0)
diff --git a/travail_de_groupe/jeu_appren_par_renfo/src/render.c b/travail_de_groupe/jeu_appren_par_renfo/src/render.c
index 2dda659..d4abc0e 100644
--- a/travail_de_groupe/jeu_appren_par_renfo/src/render.c
+++ b/travail_de_groupe/jeu_appren_par_renfo/src/render.c
@@ -861,10 +861,10 @@ void drawBall()
ballAngle += 2 * pi;
}
- char str[10];
- int drawBallY = (3 * screenDimension.h / 4 + player.viewAngle) - rect.h / 5 + player.h / BLOCK_SIZE - tan(ballViewAngle) * ballDistance;
- sprintf(str, "%d", drawBallY);
- drawString(str, screenDimension.w - 300, 100, 100, 50, 255, 255, 255, 255);
+ //char str[10];
+ //int drawBallY = (3 * screenDimension.h / 4 + player.viewAngle) - rect.h / 5 + player.h / BLOCK_SIZE - tan(ballViewAngle) * ballDistance;
+ //sprintf(str, "%d", drawBallY);
+ //drawString(str, screenDimension.w - 300, 100, 100, 50, 255, 255, 255, 255);
// if (angleMax > 2*pi) angleMax -= 2*pi;
// printf("is playing in range %d\n", isAngleInRange(ballAngle, angleMin, angleMax));
@@ -1019,7 +1019,6 @@ void drawInfosBall()
}
void drawHub(){
- drawFPS();
drawInfosPlayer();
drawInfosBall();
}
@@ -1046,6 +1045,7 @@ void drawGame()
}
drawMap2D(map);
drawRacket();
+ drawFPS();
//affiche le hub
if(showHub){
drawHub();
--
GitLab