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

Game solo - Add game start timer during launch

Browse Source
This commit is contained in:
hubourge
2024-09-11 17:22:57 +02:00
parent 6ad400b70c
commit b5ec0fc786
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site/real_game/class/SoloGame.js
View File

@ -6,7 +6,7 @@
/* By: hubourge <hubourge@student.42.fr> +#+ +:+ +#+ */ /* By: hubourge <hubourge@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/28 12:07:39 by edbernar #+# #+# */ /* Created: 2024/08/28 12:07:39 by edbernar #+# #+# */
/* Updated: 2024/09/11 16:12:16 by hubourge ### ########.fr */ /* Updated: 2024/09/11 17:14:19 by hubourge ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -57,8 +57,7 @@ class SoloGame
Players.create(scene); Players.create(scene);
controls = new OrbitControls(camera, renderer.domElement); controls = new OrbitControls(camera, renderer.domElement);
camera.position.set(0, 30, 0); camera.position.set(0, 22, 0);
// camera.position.set(20, 5, 25);
document.addEventListener('keypress', (e) => { document.addEventListener('keypress', (e) => {
if (e.key == 'a') if (e.key == 'a')
@ -89,6 +88,7 @@ class SoloGame
} }
scene = null; scene = null;
} }
}; };
function loop() function loop()

26
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 16:10:26 by hubourge ### ########.fr */ /* Updated: 2024/09/11 17:19:26 by hubourge ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -128,9 +128,24 @@ class Map
initialZ = vec3.z;vec3.x = 3; initialZ = vec3.z;vec3.x = 3;
ballBody.velocity.set(vec3.x, vec3.y, vec3.z); ballBody.velocity.set(vec3.x, vec3.y, vec3.z);
onUpdate = true; onUpdate = true;
setTimeout(() => {
scoreElement.innerHTML = '3';
}, 1000);
setTimeout(() => {
scoreElement.innerHTML = '2';
}, 1750);
setTimeout(() => {
scoreElement.innerHTML = '1';
}, 2500);
setTimeout(() => {
scoreElement.innerHTML = score.player1 + '-' +score.player2;
}, 3250);
setTimeout(() => { setTimeout(() => {
onUpdate = false; onUpdate = false;
}, 900); }, 4000);
} }
static #collision() static #collision()
@ -244,9 +259,6 @@ class Map
if (speed < 7) if (speed < 7)
speed += 0.003; speed += 0.003;
// let velocity = Math.sqrt(vec3.x * speed, vec3.y * speed, vec3.z * speed);
// console.log("Vitesse du vecteur:", velocity);
ballBody.velocity.set(vec3.x * speed, vec3.y * speed, vec3.z * speed); ballBody.velocity.set(vec3.x * speed, vec3.y * speed, vec3.z * speed);
} }
@ -262,8 +274,8 @@ class Map
if (player1Lose) if (player1Lose)
score.player2++; score.player2++;
else else
score.player1++; score.player1++;
scoreElement.innerHTML = score.player1 + '-' +score.player2; scoreElement.innerHTML = score.player1 + '-' +score.player2;
}, 500); }, 500);
if ((player1Lose && score.player2 >= 2) || (!player1Lose && score.player1 >= 2)) if ((player1Lose && score.player2 >= 2) || (!player1Lose && score.player1 >= 2))

2
site/real_game/index.html
View File

@ -9,6 +9,6 @@
<script src="./main.js" type="module"></script> <script src="./main.js" type="module"></script>
</head> </head>
<body> <body>
<p id="score">0 - 0</p> <p id="score"></p>
</body> </body>
</html> </html>