From e6edad24c9fa56538d66067dcff6bde39f746239 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Wed, 15 May 2024 14:04:28 +0200
Subject: Add gravity and jumping

---
 src/collision.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/collision.c')

diff --git a/src/collision.c b/src/collision.c
index d21e321..5c16130 100644
--- a/src/collision.c
+++ b/src/collision.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/14 11:48:59 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/15 12:06:55 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/15 13:20:29 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -84,11 +84,11 @@ static int	check_wall_collision_with_cell(t_vector a_pos, t_ivector a_size,
 	return (0);
 }
 
-void move_and_slide(t_player *player, t_tilemap *map)
+void move_and_slide(t_player *player, t_tilemap *map, double delta_time)
 {
 	t_vector move_pos;
 
-	move_pos.x = player->position.x + player->velocity.x;
+	move_pos.x = player->position.x + (player->velocity.x * delta_time);
 	move_pos.y = player->position.y;
 
 	if ((check_wall_collision(move_pos, player->size, map) & (RIGHT | LEFT)) == 0)
@@ -97,9 +97,17 @@ void move_and_slide(t_player *player, t_tilemap *map)
 		player->velocity.x = 0;
 
 	move_pos.x = player->position.x;
-	move_pos.y = player->position.y + player->velocity.y;
+	move_pos.y = player->position.y + (player->velocity.y * delta_time);
 	if ((check_wall_collision(move_pos, player->size, map) & (UP | DOWN)) == 0)
 		player->position.y = move_pos.y;
 	else
 		player->velocity.y = 0;
 }
+
+int is_on_floor(t_vector pos, t_ivector size, t_tilemap *map)
+{
+	pos.y += 5;
+	if (check_wall_collision(pos, size, map))
+		return (1);
+	return (0);
+}
-- 
cgit v1.2.3