From bcea894e9f19fa043984117a74725f8182c874fc Mon Sep 17 00:00:00 2001 From: hubourge Date: Mon, 11 Nov 2024 18:14:27 +0100 Subject: [PATCH] Minor fix --- .../nginx/static/javascript/multiLocalGame/Map.js | 11 ++++++----- .../javascript/multiLocalGame/multiLocalGamePage.js | 9 ++------- .../nginx/static/javascript/multiOnlineGame/Map.js | 12 ++++++------ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js index d50f043..c5665f1 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js +++ b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* Map.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/28 12:23:48 by edbernar #+# #+# */ -/* Updated: 2024/11/11 10:26:38 by edbernar ### ########.fr */ +/* Updated: 2024/11/11 18:02:49 by hubourge ### ########.fr */ /* */ /* ************************************************************************** */ @@ -27,7 +27,7 @@ let score = {player1: 0, player2: 0}; let onUpdate = false; let scoreElement = null; let initialSpeed = 0; -let speed = 1; +let speed = 0; let gameEndStatus = false; const scoreToWin = 2; //+1 for real score to win @@ -54,7 +54,8 @@ class Map wallTop = createWall(true); scene.add(wallTop); - initialSpeed = 0.2; + initialSpeed = 0.15; + speed = 1; if (Math.random() > 0.5) { vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed; @@ -146,7 +147,7 @@ class Map ball.position.x += vec2.x * speed; ball.position.z += vec2.z * speed; if (speed < 3) - speed += 0.005; + speed += 0.0025; // ball opacity if (ball.position.x > 12.3) diff --git a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js index 23d20b6..de71be8 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js +++ b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* multiLocalGamePage.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/28 12:07:39 by edbernar #+# #+# */ -/* Updated: 2024/10/03 00:48:19 by edbernar ### ########.fr */ +/* Updated: 2024/11/11 15:42:23 by hubourge ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,11 +53,6 @@ class multiLocalGamePage camera.position.set(0, 22, 0); - document.addEventListener('keypress', (e) => { - if (e.key == 'a') - Map.reCreate(true); - }) - renderer.setAnimationLoop(loop); document.body.style.opacity = 1; } diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js index 79d71dc..3a5a391 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 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/20 14:52:55 by hubourge #+# #+# */ -/* Updated: 2024/10/08 20:06:46 by edbernar ### ########.fr */ +/* Updated: 2024/11/11 18:13:57 by hubourge ### ########.fr */ /* */ /* ************************************************************************** */ @@ -489,8 +489,8 @@ class Map canvasImageLeft = document.createElement('canvas'); contextImageLeft = canvasImageLeft.getContext('2d'); - canvasImageLeft.width = 960; - canvasImageLeft.height = 960; + canvasImageLeft.width = 960 * 0.5; + canvasImageLeft.height = 960 * 0.5; textureImageLeft = new THREE.CanvasTexture(canvasImageLeft); textureImageLeft.imageSmoothingEnabled = false; contextImageLeft.clearRect(0, 0, canvasImageLeft.width, canvasImageLeft.height); @@ -501,8 +501,8 @@ class Map canvasImageRight = document.createElement('canvas'); contextImageRight = canvasImageRight.getContext('2d'); - canvasImageRight.width = 960; - canvasImageRight.height = 960; + canvasImageRight.width = 960 * 0.5; + canvasImageRight.height = 960 * 0.5; textureImageRight = new THREE.CanvasTexture(canvasImageRight); contextImageLeft.clearRect(0, 0, canvasImageLeft.width, canvasImageLeft.height);