Global

- remove some useless console.log
    - remove useless files

docker-compose/requirements/nginx/static/javascript/home3D/Screen.js

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 23:13:53 by edbernar          #+#    #+#             */
-/*   Updated: 2024/10/06 16:47:57 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

docker-compose/requirements/nginx/static/javascript/home3D/home3D.js

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:19:17 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/15 13:56:00 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

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

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/13 13:59:46 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/15 15:26:47 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

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

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:08:46 by madegryc          #+#    #+#             */
-/*   Updated: 2024/11/18 15:05:34 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 16:34:25 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -49,6 +49,7 @@ class LobbyPage
 		const	nbBot				= document.getElementById('nbBot');
 		const	checkBoxBot			= document.getElementById('checkBoxBot');
 
+		document.body.style = null;
 		withBot = false;
 		document.body.style.opacity = 1;
 		if (userMeInfo.id == -1)

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

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

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

@@ -3,14 +3,13 @@
 /*                                                        :::      ::::::::   */
 /*   Map.js                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/28 12:23:48 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/14 15:33:50 by hubourge         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import * as CANNON from '/static/javascript/cannon-es/dist/cannon-es.js'
 import * as THREE from '/static/javascript/three/build/three.module.js'
 import { ball } from '/static/javascript/multiLocalGame/Ball.js'
 import { player1, player2 } from '/static/javascript/multiLocalGame/Players.js';

docker-compose/requirements/nginx/static/javascript/multiLocalGame/Players.js

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/28 15:12:25 by edbernar          #+#    #+#             */
-/*   Updated: 2024/10/03 01:09:53 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/28 12:07:39 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/15 16:36:53 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Ball.js

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/20 17:02:47 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/15 15:41:01 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Map.js                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/20 14:52:55 by hubourge          #+#    #+#             */
-/*   Updated: 2024/11/11 18:13:57 by hubourge         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:45 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,7 +15,6 @@ import { files } from '/static/javascript/filesLoader.js';
 import * as THREE from '/static/javascript/three/build/three.module.js'
 import { Video } from '/static/javascript/multiOnlineGame/Video.js';
 import { player, ball} from '/static/javascript/multiOnlineGame/multiOnlineGamePage.js';
-// import { Ball } from '/static/javascript/multiOnlineGame/Ball.js'
 
 let loader						= null;
 let	scene						= null;

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

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Player.js                                          :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/18 00:30:31 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/14 15:31:28 by hubourge         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:02:43 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -86,7 +86,6 @@ class Player
 		playerExist = true;
 		isOnPointAnim = false;
 		pressedButton = [];
-		console.log(layoutSelected);
 		key			= {up: layoutSelected.US ? "w" : "z", down: "s", left: layoutSelected.US ? "a" : "q", right: "d"};
 		this.opponentGoal = availableGoals[goalIdOppenent];
 		this.object = object;
@@ -568,7 +567,6 @@ function addKeyTouch(event)
 	const	keyAction	=	[key.left, key.right, key.up, key.down];
 	const	keyList		=	['padLeft', 'padRight', 'padTop', 'padBottom'];
 
-	console.log(key);
 	for (let i = 0; i < keyList.length; i++)
 	{
 		if (keyList[i] == keyId)

docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js

@@ -6,11 +6,10 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/18 00:53:53 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/15 17:07:44 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 17:04:49 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { OrbitControls } from '/static/javascript/three/examples/jsm/controls/OrbitControls.js'
 import { availableSkins, lastSelectedGoal } from '/static/javascript/lobbyPage/3d.js';
 import { VRButton } from "/static/javascript/three/examples/jsm/webxr/VRButton.js"
 import { Opponent } from '/static/javascript/multiOnlineGame/Opponent.js'
@@ -22,35 +21,6 @@ import { Map } from '/static/javascript/multiOnlineGame/Map.js'
 import { sendRequest } from "/static/javascript/websocket.js";
 import { files } from '/static/javascript/filesLoader.js';
 
-/*
-Controls :
-	- w : monter
-	- s : descendre
-	- a : gauche
-	- d : droite
-
-	- g : animation de point
-	- h : animation de point pour l'adversaire
-	- c : switch entre la vue du joueur et la vue de la caméra
-	- q : lancer animation sur les jumpers
-
-	- 8 : avance la balle
-	- 2 : recule la balle
-	- 4 : balle vers la gauche
-	- 6 : balle vers ladroite
-	- 9 : inversion gravite
-
-	- p : clear video
-	- o : goal video
-	- i : outstanding video
-	- u : 16 video
-	- y : 8 video
-	- t : 4 video
-
-	- l : recreate et augmente le score de player
-	- k : recreate et augmente le score de opponent
-*/
-
 let 	scene				= null;
 let 	map					= null;
 let 	ball				= null;
@@ -78,11 +48,6 @@ const	observer = new MutationObserver((mutationsList) => {
 	});
 });
 
-// ------------------- (need to be remove) -------------------- //
-const cameraTmp = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight);
-let controls = null;
-// ------------------------------------------------------------ //
-
 class MultiOnlineGamePage
 {
 	static create(skin)
@@ -128,24 +93,16 @@ class MultiOnlineGamePage
 		map.ballObject = ball.object;
 		if (isMobile)
 			player.mobileMode();
-		//////////////////////////
-		controls = new OrbitControls(cameraTmp, renderer.domElement)
-		cameraTmp.position.set(5, 3, 5);
-		controls.target = new THREE.Vector3(map.centerPos.x, 0, map.centerPos.z);
-		//////////////////////////
-
 		document.addEventListener('keypress', (e) => {
 			if (e.key == 'g')
 			{
 				player.pointAnimation(map);
 				map.animationGoal(ball.object.position.x, ball.object.position.y, ball.object.position.z, player.playerGoalAnimation);
-				console.log('player.playerGoalAnimation', player.playerGoalAnimation);
 			}
 			if (e.key == 'h')
 			{
 				player.pointOpponentAnimation(map, opponent.object);
 				map.animationGoal(ball.object.position.x, ball.object.position.y, ball.object.position.z, opponent.playerGoalAnimation);
-				console.log('player.playerGoalAnimation', opponent.playerGoalAnimation);
 			}
 			if (e.key == 'c')
 				debug = !debug;
@@ -320,13 +277,7 @@ function loop()
 	opponent.update();
 	ball.update();
 	map.update(ball);
-	if (debug)
+	renderer.render(scene, player.camera);
-	{
-		controls.update();
-		renderer.render(scene, cameraTmp);
-	}
-	else
-		renderer.render(scene, player.camera);
 }
 
 

docker-compose/requirements/nginx/static/javascript/notification/main.js

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   main.js                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: madegryc <madegryc@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 23:32:52 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/30 19:07:35 by madegryc         ###   ########.fr       */
+/*   Updated: 2024/11/18 16:35:40 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -123,7 +123,6 @@ function	newNotification(title, message, img, action, timer, actionText)
 	let		intervalLoadBar	= null;
 	let		timeoutInTimout	= null;
 
-	console.log("New notification: " + message);
 	if (divNotification == null)
 	{
 		console.warn("No div for display notification here. Add div in html template for display it.");

docker-compose/requirements/nginx/static/javascript/profilPage/main.js

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/19 23:08:31 by edbernar          #+#    #+#             */
-/*   Updated: 2024/11/18 15:26:23 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/18 16:35:44 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -240,7 +240,6 @@ function buttonDashboard(userInfo)
 	const	contentStats	=	document.getElementsByClassName('contentStats')[0];
 	let		actualPage		=	0;
 
-	console.log(userInfo);
 	function changeDashboard()
 	{
 		contentStats.innerHTML = '';

docker-compose/requirements/nginx/static/javascript/taaaa/AfterimagePass.js

@@ -6,8 +6,8 @@ import {
 	UniformsUtils,
 	WebGLRenderTarget
 } from '/static/javascript/three/build/three.module.js';
-import { Pass, FullScreenQuad } from './Pass.js';
+import { Pass, FullScreenQuad } from'/static/javascript/three/examples/jsm/postprocessing/Pass.js';
-import { AfterimageShader } from '../shaders/AfterimageShader.js';
+import { AfterimageShader } from'/static/javascript/three/examples/jsm/shaders/AfterimageShader.js';
 
 class AfterimagePass extends Pass {
 

docker-compose/requirements/nginx/static/javascript/taaaa/BloomPass.js

@@ -6,8 +6,8 @@ import {
 	Vector2,
 	WebGLRenderTarget
 } from '/static/javascript/three/build/three.module.js';
-import { Pass, FullScreenQuad } from './Pass.js';
+import { Pass, FullScreenQuad } from'/static/javascript/three/examples/jsm/postprocessing/Pass.js';
-import { ConvolutionShader } from '../shaders/ConvolutionShader.js';
+import { ConvolutionShader } from'/static/javascript/three/examples/jsm/shaders/ConvolutionShader.js';
 
 class BloomPass extends Pass {
 

docker-compose/requirements/nginx/static/javascript/taaaa/ClearPass.js

@@ -1,7 +1,7 @@
 import {
 	Color
 } from '/static/javascript/three/build/three.module.js';
-import { Pass } from './Pass.js';
+import { Pass } from'/static/javascript/three/examples/jsm/postprocessing/Pass.js';
 
 class ClearPass extends Pass {
 

docker-compose/requirements/nginx/static/javascript/taaaa/ColladaLoader.js

@@ -38,7 +38,7 @@ import {
 	VectorKeyframeTrack,
 	SRGBColorSpace
 } from '/static/javascript/three/build/three.module.js';
-import { TGALoader } from '../loaders/TGALoader.js';
+import { TGALoader } from './TGALoader.js';
 
 class ColladaLoader extends Loader {
 

docker-compose/requirements/nginx/static/javascript/taaaa/CubeTexturePass.js

@@ -8,7 +8,7 @@ import {
 	ShaderMaterial,
 	UniformsUtils
 } from '/static/javascript/three/build/three.module.js';
-import { Pass } from './Pass.js';
+import { Pass } from'/static/javascript/three/examples/jsm/postprocessing/Pass.js';
 
 class CubeTexturePass extends Pass {
 

docker-compose/requirements/nginx/static/javascript/taaaa/DotScreenPass.js

@@ -2,8 +2,8 @@ import {
 	ShaderMaterial,
 	UniformsUtils
 } from '/static/javascript/three/build/three.module.js';
-import { Pass, FullScreenQuad } from './Pass.js';
+import { Pass, FullScreenQuad } from'/static/javascript/three/examples/jsm/postprocessing/Pass.js';
-import { DotScreenShader } from '../shaders/DotScreenShader.js';
+import { DotScreenShader } from'/static/javascript/three/examples/jsm/shaders/DotScreenShader.js';
 
 class DotScreenPass extends Pass {
 

docker-compose/requirements/nginx/static/javascript/taaaa/KTX2Loader.js

@@ -43,7 +43,7 @@ import {
 	SRGBColorSpace,
 	UnsignedByteType,
 } from '/static/javascript/three/build/three.module.js';
-import { WorkerPool } from '../utils/WorkerPool.js';
+import { WorkerPool } from'/static/javascript/three/examples/jsm/utils/WorkerPool.js';
 import {
 	read,
 	KHR_DF_FLAG_ALPHA_PREMULTIPLIED,

docker-compose/requirements/nginx/static/javascript/taaaa/MMDLoader.js

@@ -38,7 +38,7 @@ import {
 	RGB_ETC1_Format,
 	RGB_ETC2_Format
 } from '/static/javascript/three/build/three.module.js';
-import { MMDToonShader } from '../shaders/MMDToonShader.js';
+import { MMDToonShader } from'/static/javascript/three/examples/jsm/shaders/MMDToonShader.js';
 import { TGALoader } from '../loaders/TGALoader.js';
 import { MMDParser } from '../libs/mmdparser.module.js';