From 53441d47858ac5bb27153ba1f5969fbb6af419a5 Mon Sep 17 00:00:00 2001
From: hubourge <hulo1920@gmail.com>
Date: Tue, 17 Sep 2024 18:02:35 +0200
Subject: [PATCH] merge

---
 .../static/javascript/multiOnlineGame/Map.js  |  30 ++++++++++++-
 .../multiOnlineGame/multiOnlineGamePage.js    |  40 ++++++++++++++++--
 .../models3D/multiOnlineGame/fireworkv1.glb   | Bin 0 -> 11552 bytes
 3 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 docker-compose/requirements/nginx/static/models3D/multiOnlineGame/fireworkv1.glb

diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js
index a1b99df..1b86832 100644
--- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js
+++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Map.js                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
+/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/20 14:52:55 by hubourge          #+#    #+#             */
-/*   Updated: 2024/09/17 13:59:13 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/17 17:23:53 by hubourge         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -55,6 +55,9 @@ class Map
 	ballObject = null;
 	mapLength = 0;
 	banner = null;
+	firework = null;
+	fireworkMixer = null;
+	fireworkAnimations = null;
 	centerPos = {
 		x: -1,
 		y: -1,
@@ -474,6 +477,26 @@ class Map
 		scene.remove(this.banner);
 	}
 
+	animationGoal()
+	{
+		loader.load('/static/models3D/multiOnlineGame/fireworkv1.glb', (gltf) => {
+			this.firework = gltf.scene.children[0];
+			this.fireworkAnimations = gltf.animations; // Récupérez les animations du modèle
+			gltf = null;
+			this.firework.material = new THREE.MeshPhysicalMaterial({color: 0xff0000});
+			scene.add(this.firework);
+
+			this.fireworkMixer = new THREE.AnimationMixer(this.firework);
+			this.fireworkAnimations.forEach((clip) => {
+				this.fireworkMixer.clipAction(clip).play(); // Joue toutes les animations
+			});
+
+			console.log(this.firework);
+		}, undefined, function (error) {
+			console.error(error);
+		});
+	}
+
 	#animationGravityChanger(group, onTop)
 	{
 		let geometryGC			= new THREE.TorusGeometry(1.5, 0.05, 12, 24);
@@ -541,6 +564,9 @@ class Map
 
 	update(ball)
 	{
+		if (this.mixer) {
+			this.mixer.update(0.016); // Le deltaTime, ajustez selon le temps entre les frames
+		}
 		for (let i = 0; this.arrObject && i < this.arrObject.length; i++)
 		{
 			if (this.arrObject[i].name == "wallLeft")
diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js
index 33e58de..6316da8 100644
--- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js
+++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js
@@ -3,15 +3,17 @@
 /*                                                        :::      ::::::::   */
 /*   multiOnlineGamePage.js                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
+/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/18 00:53:53 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/17 15:38:02 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/17 18:02:20 by hubourge         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 import { createNotification as CN } from "/static/javascript/notification/main.js";
 import * as THREE from '/static/javascript/three/build/three.module.js'
+import Stats from '/static/javascript/three/examples/jsm/libs/stats.module.js'
+import { OrbitControls } from '/static/javascript/three/examples/jsm/Addons.js';
 import { sendRequest } from "/static/javascript/websocket.js";
 import { Player } from '/static/javascript/multiOnlineGame/Player.js'
 import { Map } from '/static/javascript/multiOnlineGame/Map.js'
@@ -55,6 +57,15 @@ let ambiantLight		= null;
 let opponent			= null;
 let	interval			= null;
 
+// ------------------- (need to be remove) -------------------- //
+const stats = new Stats();
+stats.showPanel(0);
+document.body.appendChild(stats.dom);
+
+const cameraTmp = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight);
+let controls = null;
+// ------------------------------------------------------------ //
+
 class MultiOnlineGamePage
 {
 	static create()
@@ -88,6 +99,12 @@ class MultiOnlineGamePage
 		ball.initMoveBallTmp();
 		map.ballObject = ball.object;
 
+		//////////////////////////
+		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')
@@ -99,7 +116,10 @@ class MultiOnlineGamePage
 			if (e.key == 'p')
 				map.putVideoOnCanvas(0, null);
 			if (e.key == 'o')
+			{
 				map.putVideoOnCanvas(3, 'goal');
+				map.animationGoal();
+			}
 			if (e.key == 'i')
 				map.putVideoOnCanvas(3, 'outstanding');
 			if (e.key == 'u')
@@ -182,11 +202,25 @@ function changeBarColor(bar, color)
 
 function loop()
 {
+	/////////////
+	stats.begin();
+	/////////////
+
 	player.update();
 	opponent.update();
 	ball.update();
 	map.update(ball);
-	renderer.render(scene, player.camera);
+	if (debug)
+	{
+		controls.update();
+		renderer.render(scene, cameraTmp);
+	}
+	else
+		renderer.render(scene, player.camera);
+
+	/////////////
+	stats.end();
+	////////////
 }
 
 export { MultiOnlineGamePage, opponent, ball };
diff --git a/docker-compose/requirements/nginx/static/models3D/multiOnlineGame/fireworkv1.glb b/docker-compose/requirements/nginx/static/models3D/multiOnlineGame/fireworkv1.glb
new file mode 100644
index 0000000000000000000000000000000000000000..8bdff7655d8b8a9dddb0fd504af5ee74b25f0ecb
GIT binary patch
literal 11552
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

literal 0
HcmV?d00001