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

Site

Browse Source 
- add bar/goal selector on all gamemode in lobby page
    - fix three js warn on lobby page
    - fix history on profil page
This commit is contained in:
Kum1ta
2024-10-01 00:46:41 +02:00
parent 3ed6224d5c
commit 54da3fb923
9 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/13 13:59:46 by edbernar #+# #+# */
/* Updated: 2024/09/29 23:24:39 by edbernar ### ########.fr */
/* Updated: 2024/09/30 23:53:04 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -131,7 +131,10 @@ class barSelecter
dispose()
{
if (this.renderer)
{
this.renderer.dispose();
this.renderer.forceContextLoss();
}
this.renderer = null;
if (this.scene)
{
@ -197,7 +200,10 @@ class goalSelecter
dispose()
{
if (this.renderer)
{
this.renderer.dispose();
this.renderer.forceContextLoss();
}
this.renderer = null;
if (this.scene)
{

28
docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/22 17:08:46 by madegryc #+# #+# */
/* Updated: 2024/09/29 01:34:41 by edbernar ### ########.fr */
/* Updated: 2024/09/30 23:46:19 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -208,6 +208,13 @@ function selectGameModeTwo()
goalSelector.dispose();
document.getElementById('bar').innerHTML = '';
document.getElementById('goal').innerHTML = '';
if (barSelector)
barSelector.dispose();
if (goalSelector)
goalSelector.dispose();
barSelector = null;
goalSelector = null;
window.gc();
barSelector = new barSelecter(document.getElementById('bar'));
goalSelector = new goalSelecter(document.getElementById('goal'));
gameMode = 1;
@ -222,7 +229,18 @@ function selectGameModeThree()
{
menuList[i].style.display = 'none';
}
document.getElementById('bar1').innerHTML = '';
document.getElementById('goal1').innerHTML = '';
document.getElementsByClassName('menuSelected')[2].style.display = 'flex';
if (barSelector)
barSelector.dispose();
if (goalSelector)
goalSelector.dispose();
barSelector = null;
goalSelector = null;
window.gc();
barSelector = new barSelecter(document.getElementById('bar1'));
goalSelector = new goalSelecter(document.getElementById('goal1'));
gameMode = 2;
}
@ -235,7 +253,15 @@ function selectGameModeFour()
{
menuList[i].style.display = 'none';
}
document.getElementById('bar2').innerHTML = '';
document.getElementById('goal2').innerHTML = '';
document.getElementsByClassName('menuSelected')[3].style.display = 'flex';
if (barSelector)
barSelector.dispose();
if (goalSelector)
goalSelector.dispose();
barSelector = new barSelecter(document.getElementById('bar2'));
goalSelector = new goalSelecter(document.getElementById('goal2'));
gameMode = 3;
}