From 1d5f58ddb4458f3e4da98e36dd17857a07569003 Mon Sep 17 00:00:00 2001 From: Nicholas Ramos <111522637+NicholasRamos5@users.noreply.github.com> Date: Tue, 1 Aug 2023 14:13:26 -0700 Subject: [PATCH] collison detection function --- _notebooks/2023-08-01-Mario-Platform.ipynb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/_notebooks/2023-08-01-Mario-Platform.ipynb b/_notebooks/2023-08-01-Mario-Platform.ipynb index 3a01ce9..a4ed033 100644 --- a/_notebooks/2023-08-01-Mario-Platform.ipynb +++ b/_notebooks/2023-08-01-Mario-Platform.ipynb @@ -246,14 +246,6 @@ " pressed: false\n", " }\n", " }\n", - " if (\n", - " player.position.y + player.height <= platform.position.y &&\n", - " player.position.y + player.height + player.velocity.y > platform.position.y &&\n", - " player.position.x + player.width >= platform.position.x &&\n", - " player.position.x <= platform.position.x + platform.width\n", - " ) {\n", - " player.velocity.y = 0;\n", - " }\n", "\n", " function animate() {\n", " requestAnimationFrame(animate);\n", @@ -269,6 +261,16 @@ " } else {\n", " player.velocity.x = 0;\n", " }\n", + "\n", + " if (\n", + " player.position.y + player.height <= platform.position.y &&\n", + " player.position.y + player.height + player.velocity.y > platform.position.y &&\n", + " player.position.x + player.width >= platform.position.x &&\n", + " player.position.x <= platform.position.x + platform.width\n", + " ) \n", + " {\n", + " player.velocity.y = 0;\n", + " }\n", " }\n", "\n", " animate();\n",