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

Game solo/multi - Fix player scale

Browse Source
This commit is contained in:
hubourge
2024-11-15 17:44:22 +01:00
parent 11e445003c
commit 78fe6a24f4
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose/requirements/nginx/static/javascript/multiLocalGame/Ball.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* Ball.js :+: :+: :+: */ /* Ball.js :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: hubourge <hubourge@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/28 15:58:03 by edbernar #+# #+# */ /* Created: 2024/08/28 15:58:03 by edbernar #+# #+# */
/* Updated: 2024/09/14 00:19:46 by edbernar ### ########.fr */ /* Updated: 2024/11/14 15:34:44 by hubourge ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

25
docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* Map.js :+: :+: :+: */ /* Map.js :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* 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/11/13 14:54:17 by edbernar ### ########.fr */ /* Updated: 2024/11/14 15:33:50 by hubourge ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -59,16 +59,17 @@ class Map
initialSpeed = 0.15; initialSpeed = 0.15;
speed = 1; speed = 1;
if (Math.random() > 0.5) vec2.z = 0 * initialSpeed;
{ // if (Math.random() > 0.5)
vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed; // {
// vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed;
vec2.x = Math.sqrt(initialSpeed * initialSpeed - vec2.z * vec2.z); vec2.x = Math.sqrt(initialSpeed * initialSpeed - vec2.z * vec2.z);
} // }
else // else
{ // {
vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed; // vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed;
vec2.x = Math.sqrt(initialSpeed * initialSpeed - vec2.z * vec2.z); // vec2.x = Math.sqrt(initialSpeed * initialSpeed - vec2.z * vec2.z);
} // }
setTimeout(() => { setTimeout(() => {
scoreElement.innerHTML = '3'; scoreElement.innerHTML = '3';
@ -182,7 +183,7 @@ class Map
{ {
const value = 0.01; const value = 0.01;
for (let i = 1; i < 10; i++) for (let i = 0; i < 10; i++)
{ {
setTimeout(() => { setTimeout(() => {
player.scale.z += value; player.scale.z += value;

6
docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* Player.js :+: :+: :+: */ /* Player.js :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: hubourge <hubourge@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/18 00:30:31 by edbernar #+# #+# */ /* Created: 2024/08/18 00:30:31 by edbernar #+# #+# */
/* Updated: 2024/11/13 15:23:47 by edbernar ### ########.fr */ /* Updated: 2024/11/14 15:31:28 by hubourge ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -436,7 +436,7 @@ class Player
const value = 0.004; const value = 0.004;
for (let i = 1; i < 10; i++) for (let i = 0; i < 10; i++)
{ {
setTimeout(() => { setTimeout(() => {
object.scale.z += value; object.scale.z += value;