tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Game solo - Re-organize player colisions

Browse Source
This commit is contained in:
hubourge
2024-09-13 17:04:59 +02:00
parent 15de6df24e
commit e00471653b
1 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
site/real_game/class/soloClass/Map.js
View File

@ -6,7 +6,7 @@
/* By: hubourge <hubourge@student.42.fr> +#+ +:+ +#+ */ /* By: hubourge <hubourge@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/28 12:23:48 by edbernar #+# #+# */ /* Created: 2024/08/28 12:23:48 by edbernar #+# #+# */
/* Updated: 2024/09/11 18:09:58 by hubourge ### ########.fr */ /* Updated: 2024/09/13 17:03:55 by hubourge ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -125,7 +125,7 @@ class Map
vec3.x = Math.sqrt(initialSpeed * initialSpeed - vec3.z * vec3.z); vec3.x = Math.sqrt(initialSpeed * initialSpeed - vec3.z * vec3.z);
} }
initialZ = vec3.z;vec3.x = 3; initialZ = vec3.z;
ballBody.velocity.set(vec3.x, vec3.y, vec3.z); ballBody.velocity.set(vec3.x, vec3.y, vec3.z);
onUpdate = true; onUpdate = true;
@ -183,17 +183,14 @@ class Map
static #collision() static #collision()
{ {
let ballPosition;
let playerPosition; let playerPosition;
let relativePosition; let relativePosition;
let playerHalfExtents; let playerHalfExtents;
let sideTouched; let sideTouched;
let random; let ballPosition;
let step = 1; let step = 0.75;
ballBody.addEventListener("collide", function(e) { ballBody.addEventListener("collide", function(e) {
let relativeVelocity = e.contact.getImpactVelocityAlongNormal();
let bodyA = e.contact.bi; let bodyA = e.contact.bi;
let bodyB = e.contact.bj; let bodyB = e.contact.bj;
let collided = (bodyA === ballBody) ? bodyB : bodyA; let collided = (bodyA === ballBody) ? bodyB : bodyA;
@ -203,6 +200,16 @@ class Map
vec3.z = -vec3.z; vec3.z = -vec3.z;
return; return;
case "player1": case "player1":
collidedPlayer1(collided, e);
return;
case "player2":
collidedPlayer2(collided, e);
return;
}
});
function collidedPlayer1(collided, e)
{
scalePlayer(player1); scalePlayer(player1);
ballPosition = ballBody.position; ballPosition = ballBody.position;
playerPosition = collided.position; playerPosition = collided.position;
@ -219,7 +226,7 @@ class Map
} }
initialSpeed = Math.sqrt(vec3.x * vec3.x + vec3.z * vec3.z); initialSpeed = Math.sqrt(vec3.x * vec3.x + vec3.z * vec3.z);
random = Math.random(); let random = Math.random();
if (random > 0.5) if (random > 0.5)
{ {
vec3.z -= step; vec3.z -= step;
@ -230,8 +237,10 @@ class Map
vec3.z += step; vec3.z += step;
vec3.x = Math.sqrt(initialSpeed * initialSpeed - vec3.z * vec3.z); vec3.x = Math.sqrt(initialSpeed * initialSpeed - vec3.z * vec3.z);
} }
return; }
case "player2":
function collidedPlayer2(collided, e)
{
scalePlayer(player2); scalePlayer(player2);
ballPosition = ballBody.position; ballPosition = ballBody.position;
playerPosition = collided.position; playerPosition = collided.position;
@ -248,7 +257,7 @@ class Map
} }
initialSpeed = Math.sqrt(vec3.x * vec3.x + vec3.z * vec3.z); initialSpeed = Math.sqrt(vec3.x * vec3.x + vec3.z * vec3.z);
random = Math.random(); let random = Math.random();
if (random > 0.5) if (random > 0.5)
{ {
vec3.z -= step; vec3.z -= step;
@ -259,9 +268,7 @@ class Map
vec3.z += step; vec3.z += step;
vec3.x = -Math.sqrt(initialSpeed * initialSpeed - vec3.z * vec3.z); vec3.x = -Math.sqrt(initialSpeed * initialSpeed - vec3.z * vec3.z);
} }
return;
} }
});
function scalePlayer(player) function scalePlayer(player)
{ {